# HG changeset patch # User Sandro Knauß # Date 1326171822 -3600 # Node ID ee10253258adb7ce134c26d41de1ce1ae0b4066a # Parent f479738b487954bc7bcabafa2dd302ba80a5bbdf now right relative imports diff -r f479738b4879 -r ee10253258ad iro/controller/database.py --- a/iro/controller/database.py Thu Dec 22 03:13:34 2011 +0100 +++ b/iro/controller/database.py Tue Jan 10 06:03:42 2012 +0100 @@ -1,6 +1,6 @@ from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker -from model import Base +from ..model import Base engine = create_engine('sqlite:///:memory:', echo=True) diff -r f479738b4879 -r ee10253258ad iro/controller/user.py --- a/iro/controller/user.py Thu Dec 22 03:13:34 2011 +0100 +++ b/iro/controller/user.py Tue Jan 10 06:03:42 2012 +0100 @@ -2,10 +2,9 @@ import re from .database import WithSession -from model import User +from ..model import User -from error import UserNotFound, InterfaceException, ValidateException - +from ..error import UserNotFound, InterfaceException, ValidateException def rehash(hash): diff -r f479738b4879 -r ee10253258ad iro/view/xmlrpc.py --- a/iro/view/xmlrpc.py Thu Dec 22 03:13:34 2011 +0100 +++ b/iro/view/xmlrpc.py Tue Jan 10 06:03:42 2012 +0100 @@ -16,7 +16,7 @@ import logging -from controller.viewinterface import Interface +from ..controller.viewinterface import Interface class TwistedInterface(Interface):