Merge branch 'release-0.2.2'0.2.2

1 files changed, 4 insertions, 33 deletions

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index 0e880867..f48ad105 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -1,35 +1,6 @@
-"""
-LEAP Encryption Access Project
-website: U{https://leap.se/}
-"""
-
-from leap import eip
-from leap import baseapp
-from leap import util
-#from leap import soledad
-
-__all__ = [eip, baseapp, util]
-__version__ = "unknown"
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
 try:
-    from ._version import get_versions
-    __version__ = get_versions()['version']
-    del get_versions
+    __import__('pkg_resources').declare_namespace(__name__)
 except ImportError:
-    #running on a tree that has not run
-    #the setup.py setver
-    pass
-
-__appname__ = "unknown"
-try:
-    from leap._appname import __appname__
-except ImportError:
-    #running on a tree that has not run
-    #the setup.py setver
-    pass
-
-__full_version__ = __appname__ + '/' + str(__version__)
-
-try:
-    from leap._branding import BRANDING as __branding
-except ImportError:
-    __branding = {}
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)