declare leap namespace

2 files changed, 10 insertions, 13 deletions

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index 8b30f3d..f48ad10 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -1,12 +1,6 @@
-# -*- encoding: utf-8 -*-
-"""
-leap/__init__.py
-----------------
-Module intialization file for leap.
-"""
-
-from leap.mx.util import version
-
-__all__     = ['mx']
-__author__  = version.getAuthors()
-__version__ = version.getVersion()
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)
diff --git a/src/leap/mx/__init__.py b/src/leap/mx/__init__.py
index 27fadca..8ef1bc9 100644
--- a/src/leap/mx/__init__.py
+++ b/src/leap/mx/__init__.py
@@ -2,7 +2,10 @@
 """
 leap/mx/__init__.py
 -------------------
-Module intialization file for leap.mx .
+Module initialization file for leap.mx .
 """
+from leap.mx.util import version
 
 __all__ = ['alias_resolver', 'couchdb', 'exceptions', 'runner', 'util']
+__author__ = version.getAuthors()
+__version__ = version.getVersion()