Merge branch 'develop' of https://github.com/dmwyatt/pyinstaller into…

… issue-110-zmq-hook
wonderg · Jan 7, 2015 · 312f7f0 · 312f7f0
2 parents 6cf2d0f + de4ccbc
commit 312f7f0
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/PyInstaller/hooks/hook-zmq.py b/PyInstaller/hooks/hook-zmq.py
@@ -12,18 +12,12 @@
 Hook for PyZMQ. Cython based Python bindings for messaging library ZeroMQ.
 http://www.zeromq.org/
 """
-
-
 import glob
 import os
-import sys
+from PyInstaller.hooks.hookutils import collect_submodules
 
 
-hiddenimports = [
-    'zmq.core.pysocket',
-    'zmq.utils.jsonapi',
-    'zmq.utils.strtypes',
-]
+hiddenimports = []
 
 
 def hook(mod):
@@ -42,4 +36,7 @@ def hook(mod):
             mod.pyinstaller_binaries.append((name, bundled[0], 'BINARY'))
             break
 
+    hiddenimports.extend(collect_submodules('zmq.backend'))
+    hiddenimports.append('zmq.utils.garbage')
+
     return mod