Fix imports

8 files changed, 28 insertions, 32 deletions

diff --git a/ipsilon/admin/common.py b/ipsilon/admin/common.py
index 6c975b1..834823c 100755
--- a/ipsilon/admin/common.py
+++ b/ipsilon/admin/common.py
@@ -17,22 +17,22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from util import data
-from util import page
-from util import user
+from ipsilon.util.data import Store
+from ipsilon.util.page import Page
+from ipsilon.util.user import UserSession
 import cherrypy
 
 def admin_protect(fn):
 
     def check(*args, **kwargs):
-        if user.UserSession().get_user().is_admin:
+        if UserSession().get_user().is_admin:
             return fn(*args, **kwargs)
 
         raise cherrypy.HTTPError(403)
 
     return check
 
-class LoginPluginPage(page.Page):
+class LoginPluginPage(Page):
 
     def __init__(self, obj, site, baseurl):
         super(LoginPluginPage, self).__init__(site)
@@ -72,7 +72,7 @@ class LoginPluginPage(page.Page):
         if len(new_values) != 0:
             # First we try to save in the database
             try:
-                store = data.Store()
+                store = Store()
                 store.save_login_plugin_config(self._obj.name, new_values)
                 message = "New configuration saved."
             except Exception, e:
@@ -97,7 +97,7 @@ class LoginPluginPage(page.Page):
             return op(*args, **kwargs)
 
 
-class LoginPlugins(page.Page):
+class LoginPlugins(Page):
     def __init__(self, site, baseurl):
         super(LoginPlugins, self).__init__(site)
         self.url = '%s/login' % baseurl
@@ -108,7 +108,7 @@ class LoginPlugins(page.Page):
             self.__dict__[plugin] = LoginPluginPage(obj, self._site, self.url)
 
 
-class Admin(page.Page):
+class Admin(Page):
 
     def __init__(self, *args, **kwargs):
         super(Admin, self).__init__(*args, **kwargs)
diff --git a/ipsilon/login/authkrb.py b/ipsilon/login/authkrb.py
index 867da0c..2ad258a 100755
--- a/ipsilon/login/authkrb.py
+++ b/ipsilon/login/authkrb.py
@@ -17,8 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from login import common
-from util import page
+from ipsilon.login import common
 import cherrypy
 
 class Krb(common.LoginPageBase):
diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index d11731d..223c158 100755
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -17,8 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from login import common
-from util import page
+from ipsilon.login import common
 import cherrypy
 import pam
 
diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py
index 7a11f18..dbeec0f 100755
--- a/ipsilon/login/common.py
+++ b/ipsilon/login/common.py
@@ -17,10 +17,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from util import data
-from util import page
-from util import user
-from util import plugin
+
+from ipsilon.util import data
+from ipsilon.util import page
+from ipsilon.util import user
+from ipsilon.util.plugin import Plugins
 import cherrypy
 import inspect
 import os
@@ -117,7 +118,7 @@ class Login(page.Page):
         login_plugins = self._site['login_plugins']
         login_plugins['config'] = config
 
-        plugins = plugin.Plugins(path=cherrypy.config['base.dir'])
+        plugins = Plugins(path=cherrypy.config['base.dir'])
         (login_path, login_file) = os.path.split(inspect.getfile(Login))
         login_plugins['available'] = plugins.get_plugins(login_path, 'LoginManager')
         login_plugins['enabled'] = []
diff --git a/ipsilon/main.py b/ipsilon/main.py
index 3f3043b..dd8fd12 100755
--- a/ipsilon/main.py
+++ b/ipsilon/main.py
@@ -22,17 +22,15 @@ sys.stdout = sys.stderr
 
 import os
 import atexit
-import threading
 import cherrypy
-from login import common
-from util import data
-from util import page
+from ipsilon.util.data import Store
+import ipsilon.util.page as page
 from jinja2 import Environment, FileSystemLoader
-import root
+from ipsilon.root import Root
 
 cherrypy.config.update('ipsilon.conf')
 
-datastore = data.Store()
+datastore = Store()
 admin_config = datastore.get_admin_config()
 for option in admin_config:
     cherrypy.config[option] = admin_config[option]
@@ -47,7 +45,7 @@ if __name__ == "__main__":
              '/ui': { 'tools.staticdir.on': True,
                       'tools.staticdir.dir': 'ui' }
            }
-    cherrypy.quickstart(root.Root('default', template_env), '/', conf)
+    cherrypy.quickstart(Root('default', template_env), '/', conf)
 
 else:
     cherrypy.config['environment'] = 'embedded'
@@ -56,5 +54,5 @@ else:
         cherrypy.engine.start(blocking=False)
         atexit.register(cherrypy.engine.stop)
 
-    application = cherrypy.Application(root.Root('default', template_env),
+    application = cherrypy.Application(Root('default', template_env),
                                        script_name=None, config=None)
diff --git a/ipsilon/root.py b/ipsilon/root.py
index 160e85e..ebf01d4 100755
--- a/ipsilon/root.py
+++ b/ipsilon/root.py
@@ -17,14 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from util import page
-from login import common as lc
-from admin import common as ac
-import cherrypy
+from ipsilon.util.page import Page
+import ipsilon.login.common as lc
+import ipsilon.admin.common as ac
 
 sites = dict()
 
-class Root(page.Page):
+class Root(Page):
 
     def __init__(self, site, template_env):
         if not site in sites:
diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py
index bf30c77..0a21ed4 100755
--- a/ipsilon/util/page.py
+++ b/ipsilon/util/page.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from util import user
+from ipsilon.util import user
 import cherrypy
 
 def protect():
diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index f008571..23233fb 100755
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from util import data
+from ipsilon.util import data
 import cherrypy
 
 class Site(object):