diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
| commit | 6bae67c3e7c66af9e8ce1605070f7e92f247f0cb (patch) | |
| tree | 64dc7e2588cc5c17fdb6c801877792f83cfcecf3 /src/leap/__init__.py | |
| parent | 00efccabb1eb6c3597282bc0e095cf2026f75a3b (diff) | |
| parent | 00d98a47c60764475d97df1c2eb847e20a77cae5 (diff) | |
Merge tag '0.3.0' into debian
Tag bitmask version 0.3.0
Conflicts:
.coveragerc
.tx/config
NEWS.rst
setup.cfg
src/leap/base/checks.py
src/leap/base/exceptions.py
src/leap/base/tests/test_checks.py
src/leap/eip/checks.py
src/leap/gui/firstrun/login.py
src/leap/gui/locale_rc.py
src/leap/util/polkit.py
tests/test_qt_environment.py
tox.ini
Diffstat (limited to 'src/leap/__init__.py')
| -rw-r--r-- | src/leap/__init__.py | 37 |
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__) |