Avoid the need for an internal patch.

portserver isn't really a module so how its test finds and imports it
varies based on situation (see also the existing win32 special code).

src/tests/portserver_test.py

diff --git a/src/tests/portserver_test.py b/src/tests/portserver_test.py
index b7de094..f0dec17 100644
--- a/src/tests/portserver_test.py
+++ b/src/tests/portserver_test.py
@@ -34,7 +34,12 @@
 if sys.platform == 'win32':
     sys.path.append(os.path.join(os.path.split(sys.executable)[0]))
 
-import portserver
+try:
+    import portserver
+except ImportError:
+    # Or if testing from a third_party/py/portpicker/ style installed
+    # package tree find it this way.
+    from portpicker import portserver
 
 
 def setUpModule():