Merge pull request #2098 from virtuald/cdll-none

Fix: First argument to ctypes.CDLL can be None.

PyInstaller/loader/pyiboot01_bootstrap.py

@@ -123,21 +123,24 @@ def isatty(self):
     import os
     from ctypes import LibraryLoader, DEFAULT_MODE
 
-    class PyInstallerCDLL(ctypes.CDLL):
-        def __init__(self, name, *args, **kwargs):
+    def _frozen_name(name):
+        if name:
             frozen_name = os.path.join(sys._MEIPASS, os.path.basename(name))
             if os.path.exists(frozen_name):
                 name = frozen_name
+        return name
+
+    class PyInstallerCDLL(ctypes.CDLL):
+        def __init__(self, name, *args, **kwargs):
+            name = _frozen_name(name)
             super(PyInstallerCDLL, self).__init__(name, *args, **kwargs)
 
     ctypes.CDLL = PyInstallerCDLL
     ctypes.cdll = LibraryLoader(PyInstallerCDLL)
 
     class PyInstallerPyDLL(ctypes.PyDLL):
         def __init__(self, name, *args, **kwargs):
-            frozen_name = os.path.join(sys._MEIPASS, os.path.basename(name))
-            if os.path.exists(frozen_name):
-                name = frozen_name
+            name = _frozen_name(name)
             super(PyInstallerPyDLL, self).__init__(name, *args, **kwargs)
 
     ctypes.PyDLL = PyInstallerPyDLL
@@ -146,19 +149,15 @@ def __init__(self, name, *args, **kwargs):
     if sys.platform.startswith('win'):
         class PyInstallerWinDLL(ctypes.WinDLL):
             def __init__(self, name,*args, **kwargs):
-                frozen_name = os.path.join(sys._MEIPASS, os.path.basename(name))
-                if os.path.exists(frozen_name):
-                    name = frozen_name
+                name = _frozen_name(name)
                 super(PyInstallerWinDLL, self).__init__(name, *args, **kwargs)
 
         ctypes.WinDLL = PyInstallerWinDLL
         ctypes.windll = LibraryLoader(PyInstallerWinDLL)
 
         class PyInstallerOleDLL(ctypes.OleDLL):
             def __init__(self, name,*args, **kwargs):
-                frozen_name = os.path.join(sys._MEIPASS, os.path.basename(name))
-                if os.path.exists(frozen_name):
-                    name = frozen_name
+                name = _frozen_name(name)
                 super(PyInstallerOleDLL, self).__init__(name, *args, **kwargs)
 
         ctypes.OleDLL = PyInstallerOleDLL

tests/functional/test_import.py

@@ -191,6 +191,17 @@ def test_ctypes_CDLL_c(pyi_builder):
         assert lib is not None
         """)
 
+@skipif_no_compiler
+def test_ctypes_CDLL_None(pyi_builder):
+    # Make sure we are able to load CDLL(None)
+    # -> pip does this for some reason
+    pyi_builder.test_source(
+        """
+        import ctypes, ctypes.util
+        lib = ctypes.CDLL(None)
+        assert lib is not None
+        """)
+
 import PyInstaller.depend.utils
 __orig_resolveCtypesImports = PyInstaller.depend.utils._resolveCtypesImports