From 2d0170b51a064788eb68af75d5f0d4efb40e386f Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Mon, 28 Jan 2013 18:01:00 +0000
Subject: Fixed module structure, again, due to directory layout change.

---
 src/leap/__init__.py      | 12 ++++++++----
 src/leap/util/__init__.py |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

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']
-- 
cgit v1.2.3