adjusted import and setup.py

honeynet · Sep 1, 2014 · a0f7a34 · a0f7a34
1 parent 54e7785
commit a0f7a34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/beeswarm/__init__.py b/beeswarm/__init__.py
@@ -1,5 +1,8 @@
-import zmq.green as zmq
+try:
+    import zmq.green as zmq
+    zmq_context = zmq.Context()
+except ImportError:
+    pass
 
 version = '0.4.15'
 
-zmq_context = zmq.Context()
diff --git a/setup.py b/setup.py
@@ -2,11 +2,11 @@
 from ez_setup import use_setuptools
 use_setuptools()
 from setuptools import setup, find_packages
-import beeswarm
+from beeswarm import version as beeswarm_version
 
 setup(
     name='Beeswarm',
-    version=beeswarm.version,
+    version=beeswarm_version,
     packages=find_packages(exclude=['bin', 'docs']),
     scripts=['bin/beeswarm'],
     url='https://github.com/honeynet/beeswarm',