From 63e47e3b7708c8e11f8103c1986b348a820a7888 Mon Sep 17 00:00:00 2001
From: Dustin Spicuzza <dustin@virtualroadside.com>
Date: Wed, 13 Jul 2016 16:20:47 -0400
Subject: [PATCH] First argument to ctypes.CDLL can be None

---
 PyInstaller/loader/pyiboot01_bootstrap.py | 21 ++++++++++-----------
 tests/functional/test_import.py           | 11 +++++++++++
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/PyInstaller/loader/pyiboot01_bootstrap.py b/PyInstaller/loader/pyiboot01_bootstrap.py
index 320fd06533..17a86e28c8 100644
--- a/PyInstaller/loader/pyiboot01_bootstrap.py
+++ b/PyInstaller/loader/pyiboot01_bootstrap.py
@@ -123,11 +123,16 @@ 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
@@ -135,9 +140,7 @@ def __init__(self, name, *args, **kwargs):
 
     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,9 +149,7 @@ 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
@@ -156,9 +157,7 @@ def __init__(self, name,*args, **kwargs):
 
         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
diff --git a/tests/functional/test_import.py b/tests/functional/test_import.py
index 9a84583403..163bbd75b3 100644
--- a/tests/functional/test_import.py
+++ b/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