Fix imports

3 files changed, 8 insertions, 9 deletions

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'] = []