summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIsis Lovecruft <isis@torproject.org>2013-01-28 18:01:00 +0000
committerIsis Lovecruft <isis@torproject.org>2013-01-28 18:02:09 +0000
commit2d0170b51a064788eb68af75d5f0d4efb40e386f (patch)
tree50ce18cc569d8d8a011594ee4863c8bbd2802f15 /src
parente1e9b3b9982f56cee322a05d97529d55d75cb629 (diff)
Fixed module structure, again, due to directory layout change.
Diffstat (limited to 'src')
-rw-r--r--src/leap/__init__.py12
-rw-r--r--src/leap/util/__init__.py1
2 files changed, 8 insertions, 5 deletions
diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index cf897e4..99a951f 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -1,8 +1,12 @@
# -*- encoding: utf-8 -*-
-import mx
-import util
+from leap import mx
+from leap import util
+from leap.util import version as mxversion
__all__ = ['mx', 'util']
-__author__ = util.version.authors
-__version__ = util.version.getVersion()
+__author__ = mxversion.authors
+__version__ = mxversion.getVersion()
+
+print "Authors: %s" % __author__
+print "Version: %s" % __version__
diff --git a/src/leap/util/__init__.py b/src/leap/util/__init__.py
index d54801b..e69de29 100644
--- a/src/leap/util/__init__.py
+++ b/src/leap/util/__init__.py
@@ -1 +0,0 @@
-__all__ = ['net', 'log', 'version']