Merge pull request #67 from justinfx/66_module_path

Fixes #66 - Also copy binding module to __name__ in sys.modules

Author: mottosso

Qt.py

@@ -180,7 +180,7 @@ def _init():
     this has executed.
 
     """
-
+    
     preferred = os.getenv("QT_PREFERRED_BINDING")
     verbose = os.getenv("QT_VERBOSE") is not None
 
@@ -202,7 +202,8 @@ def _init():
             raise ImportError("Preferred Qt binding \"%s\" "
                               "not available" % preferred)
 
-        sys.modules["Qt"] = available[preferred]()
+        binding = available[preferred]
+        sys.modules[__name__] = binding()
         return
 
     else:
@@ -215,7 +216,7 @@ def _init():
                 sys.stdout.write("Trying %s" % binding.__name__[1:])
 
             try:
-                sys.modules["Qt"] = binding()
+                sys.modules[__name__] = binding()
                 return
 
             except ImportError as e:

tests.py

@@ -8,6 +8,9 @@
 import os
 import sys
 import imp
+import shutil
+import tempfile
+import subprocess
 import contextlib
 
 from nose.tools import (
@@ -92,6 +95,66 @@ def test_sip_api_qtpy():
                                             "instead is %s"
                                             % sip.getapi("QString"))
 
+
+def test_vendoring():
+    """Qt.py may be bundled along with another library/project
+    
+    Create toy project
+    
+    from project.vendor import Qt  # Absolute
+    from .vendor import Qt         # Relative
+    
+    project/
+        vendor/
+        __init__.py
+            __init__.py
+
+    """
+    
+    dirname = os.path.dirname(__file__)
+    tempdir = tempfile.mkdtemp()
+
+    try:
+        project = os.path.join(tempdir, "myproject")
+        vendor = os.path.join(tempdir, "myproject", "vendor")
+
+        os.makedirs(vendor)
+
+        # Make packages out of folders
+        with open(os.path.join(project, "__init__.py"), "w") as f:
+            f.write("from .vendor.Qt import QtWidgets")
+
+        with open(os.path.join(vendor, "__init__.py"), "w") as f:
+            pass
+
+        shutil.copy(os.path.join(dirname, "Qt.py"),
+                    os.path.join(vendor, "Qt.py"))
+
+        print("Testing relative import..")
+        assert subprocess.call(
+            ["python", "-c", "import myproject"],
+            cwd=tempdir,
+            env={}
+        ) == 0
+
+        print("Testing absolute import..")
+        assert subprocess.call(
+            ["python", "-c", "from myproject.vendor.Qt import QtWidgets"],
+            cwd=tempdir,
+            env={}
+        ) == 0
+
+        print("Testing direct import..")
+        assert subprocess.call(
+            ["python", "-c", "import myproject.vendor.Qt"],
+            cwd=tempdir,
+            env={}
+        ) == 0
+
+    finally:
+        shutil.rmtree(tempdir)
+
+
 if PYTHON == 2:
     def test_sip_api_already_set():
         """Raise ImportError if sip API v1 was already set (Python 2.x only)"""