Closes #26; SafeFunction import in joblib-0.10.0

pescadores · Jul 28, 2016 · fafe7b5 · fafe7b5
1 parent 7f8b51b
commit fafe7b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ develop-eggs
 lib
 lib64
 __pycache__
+.cache
 
 # Installer logs
 pip-log.txt

diff --git a/pescador/zmq_stream.py b/pescador/zmq_stream.py
@@ -19,7 +19,12 @@
 except ImportError:
     import json
 
-from joblib.parallel import SafeFunction
+try:
+    # joblib <= 0.9.4
+    from joblib.parallel import SafeFunction
+except ImportError:
+    # joblib >= 0.10.0
+    from joblib._parallel_backends import SafeFunction
 
 __all__ = ['zmq_stream']