From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 6 Oct 2017 15:07:29 +0000 (+0100)
Subject: Use relative imports everywhere
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c9091281ef50fedfcacaa32c276cc6904afcb17;p=pbs.git

Use relative imports everywhere

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6c439e72..8eb1a41d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,7 +11,6 @@ src/buildservice/git.py
 src/buildservice/__init__.py
 src/buildservice/keys.py
 src/buildservice/logs.py
-src/buildservice/main.py
 src/buildservice/messages.py
 src/buildservice/mirrors.py
 src/buildservice/misc.py
diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py
index 00cf507e..d1ef4bbf 100644
--- a/src/buildservice/__init__.py
+++ b/src/buildservice/__init__.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 
+from __future__ import absolute_import
+
 import ConfigParser
 import logging
 import os
diff --git a/src/buildservice/arches.py b/src/buildservice/arches.py
index 2c07e2a5..1b4d6235 100644
--- a/src/buildservice/arches.py
+++ b/src/buildservice/arches.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import base
+from . import base
 
 class Arches(base.Object):
 	def get_all(self, really=False):
diff --git a/src/buildservice/bugtracker.py b/src/buildservice/bugtracker.py
index 680f9214..7d80c1c3 100644
--- a/src/buildservice/bugtracker.py
+++ b/src/buildservice/bugtracker.py
@@ -2,7 +2,7 @@
 
 import xmlrpclib
 
-import base
+from . import base
 
 class BugzillaBug(base.Object):
 	def __init__(self, bugzilla, bug_id):
diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index c03703ec..5417ea88 100644
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 import datetime
 import hashlib
@@ -9,10 +9,10 @@ import random
 import string
 import time
 
-import base
-import logs
+from . import base
+from . import logs
 
-from users import generate_password_hash, check_password_hash, generate_random_string
+from .users import generate_password_hash, check_password_hash, generate_random_string
 
 class Builders(base.Object):
 	def auth(self, name, passphrase):
diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 66aedde5..53f2d44b 100644
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -12,15 +12,15 @@ import pakfire
 import pakfire.config
 import pakfire.packages
 
-import base
-import builders
-import logs
-import packages
-import repository
-import updates
-import users
-
-from constants import *
+from . import base
+from . import builders
+from . import logs
+from . import packages
+from . import repository
+from . import updates
+from . import users
+
+from .constants import *
 
 def import_from_package(_pakfire, filename, distro=None, commit=None, type="release",
 		arches=None, check_for_duplicates=True, owner=None):
diff --git a/src/buildservice/cache.py b/src/buildservice/cache.py
index 6ff84327..8b64f9e4 100644
--- a/src/buildservice/cache.py
+++ b/src/buildservice/cache.py
@@ -3,7 +3,7 @@
 import logging
 import memcache
 
-import base
+from . import base
 
 class Client(memcache.Client):
 	def debuglog(self, str):
diff --git a/src/buildservice/distribution.py b/src/buildservice/distribution.py
index 27f52d96..edd4c818 100644
--- a/src/buildservice/distribution.py
+++ b/src/buildservice/distribution.py
@@ -2,14 +2,14 @@
 
 import logging
 
-import arches
-import base
-import builds
-import packages
-import sources
-import updates
-
-from repository import Repository, RepositoryAux
+from . import arches
+from . import base
+from . import builds
+from . import packages
+from . import sources
+from . import updates
+
+from .repository import Repository, RepositoryAux
 
 class Distributions(base.Object):
 	def get_all(self):
diff --git a/src/buildservice/git.py b/src/buildservice/git.py
index 02d1de73..1f2f486d 100644
--- a/src/buildservice/git.py
+++ b/src/buildservice/git.py
@@ -5,8 +5,8 @@ import logging
 import os
 import subprocess
 
-import base
-import sources
+from . import base
+from . import sources
 
 class Repo(base.Object):
 	def __init__(self, pakfire, id, mode="normal"):
diff --git a/src/buildservice/keys.py b/src/buildservice/keys.py
index 03f40e3d..21d0e9b7 100644
--- a/src/buildservice/keys.py
+++ b/src/buildservice/keys.py
@@ -7,7 +7,7 @@ import os
 import shutil
 import tempfile
 
-import base
+from . import base
 
 def read_key(data):
 	data = str(data)
diff --git a/src/buildservice/logs.py b/src/buildservice/logs.py
index 0a5c8b1e..716991ae 100644
--- a/src/buildservice/logs.py
+++ b/src/buildservice/logs.py
@@ -2,8 +2,7 @@
 
 import os
 
-import base
-import builds
+from . import base
 
 _ = lambda x: x
 
diff --git a/src/buildservice/messages.py b/src/buildservice/messages.py
index 8572fb26..0c75377e 100644
--- a/src/buildservice/messages.py
+++ b/src/buildservice/messages.py
@@ -7,7 +7,7 @@ import tornado.locale
 
 from email.mime.text import MIMEText
 
-import base
+from . import base
 
 class Messages(base.Object):
 	def add(self, to, subject, text, frm=None):
diff --git a/src/buildservice/mirrors.py b/src/buildservice/mirrors.py
index b28b75a7..4f093df2 100644
--- a/src/buildservice/mirrors.py
+++ b/src/buildservice/mirrors.py
@@ -4,8 +4,8 @@ import logging
 import math
 import socket
 
-import base
-import logs
+from . import base
+from . import logs
 
 class GeoIP(object):
 	def __init__(self, pakfire):
diff --git a/src/buildservice/misc.py b/src/buildservice/misc.py
index 8e730c3a..58089514 100644
--- a/src/buildservice/misc.py
+++ b/src/buildservice/misc.py
@@ -9,7 +9,7 @@ import tarfile
 
 from tornado.escape import xhtml_escape
 
-from constants import *
+from .constants import *
 
 def format_size(s):
 	units = ("B", "k", "M", "G", "T")
diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index e6f80f03..1dbf92e4 100644
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -8,14 +8,13 @@ import shutil
 import pakfire
 import pakfire.packages as packages
 
-import arches
-import base
-import builds
-import database
-import misc
-import sources
+from . import arches
+from . import base
+from . import database
+from . import misc
+from . import sources
 
-from constants import *
+from .constants import *
 
 class Packages(base.Object):
 	def get_all_names(self, public=None, user=None, states=None):
@@ -471,7 +470,7 @@ class Package(base.Object):
 			WHERE type = 'release' AND pkg_id = %s", self.id)
 
 		if build:
-			return builds.Build(self.pakfire, build.id)
+			return self.pakfire.builds.get_by_id(build.id)
 
 	@property
 	def job(self):
@@ -480,7 +479,7 @@ class Package(base.Object):
 				WHERE pkg_id = %s", self.id)
 
 			if job:
-				self._job = builds.Job(self.pakfire, job.id)
+				self._job = self.pakfire.jobs.get_by_id(job.id)
 
 		return self._job
 
diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py
index b07652c4..3ba144e3 100644
--- a/src/buildservice/repository.py
+++ b/src/buildservice/repository.py
@@ -2,10 +2,8 @@
 
 import os.path
 
-import base
-import builds
-import logs
-import packages
+from . import base
+from . import logs
 
 class Repositories(base.Object):
 	def get_all(self):
@@ -326,7 +324,7 @@ class Repository(base.Object):
 
 		_builds = []
 		for build in self.db.query(query, *args):
-			build = builds.Build(self.pakfire, build.id)
+			build = self.pakfire.builds.get_by_id(build.id)
 			build._repo = self
 
 			_builds.append(build)
@@ -357,7 +355,7 @@ class Repository(base.Object):
 		return pkgs
 
 	def get_packages(self, arch):
-		pkgs =  [packages.Package(self.pakfire, p.id) for p in self._get_packages(arch)]
+		pkgs =  [self.pakfire.packages.get_by_id(p.id) for p in self._get_packages(arch)]
 		pkgs.sort()
 
 		return pkgs
@@ -380,7 +378,7 @@ class Repository(base.Object):
 
 		ret = []
 		for row in query:
-			b = builds.Build(self.pakfire, row.build_id)
+			b = self.pakfire.builds.get_by_id(row.build_id)
 			ret.append(b)
 
 		return ret
diff --git a/src/buildservice/scheduler.py b/src/buildservice/scheduler.py
index 9e08362e..3151dc53 100644
--- a/src/buildservice/scheduler.py
+++ b/src/buildservice/scheduler.py
@@ -5,7 +5,7 @@ import multiprocessing
 import time
 import traceback
 
-import backend.main
+from . import Pakfire
 
 class Event(object):
 	interval = None
@@ -50,7 +50,7 @@ class Event(object):
 	@staticmethod
 	def fork(method, *args, **kwargs):
 		# Create new pakfire instance.
-		_pakfire = backend.main.Pakfire()
+		_pakfire = Pakfire()
 
 		return method(_pakfire, *args, **kwargs)
 
diff --git a/src/buildservice/sessions.py b/src/buildservice/sessions.py
index 73d7730e..7b71f0f1 100644
--- a/src/buildservice/sessions.py
+++ b/src/buildservice/sessions.py
@@ -2,8 +2,8 @@
 
 import uuid
 
-import base
-import users
+from . import base
+from . import users
 
 class Sessions(base.Object):
 	def get(self, session_id):
diff --git a/src/buildservice/settings.py b/src/buildservice/settings.py
index ae6aeb7f..db1a6a02 100644
--- a/src/buildservice/settings.py
+++ b/src/buildservice/settings.py
@@ -2,8 +2,8 @@
 
 import time
 
-import base
-import cache
+from . import base
+from . import cache
 
 class Settings(base.Object):
 	def __init__(self, pakfire):
diff --git a/src/buildservice/sources.py b/src/buildservice/sources.py
index 8b7f7243..5e34d548 100644
--- a/src/buildservice/sources.py
+++ b/src/buildservice/sources.py
@@ -5,10 +5,8 @@ import logging
 import os
 import subprocess
 
-import base
-import builds
-import database
-import packages
+from . import base
+from . import database
 
 class Sources(base.Object):
 	def get_all(self):
@@ -153,7 +151,7 @@ class Commit(base.Object):
 			self._packages = []
 
 			for pkg in self.db.query("SELECT id FROM packages WHERE commit_id = %s", self.id):
-				pkg = packages.Package(self.pakfire, pkg.id)
+				pkg = self.pakfire.packages.get_by_id(pkg.id)
 				self._packages.append(pkg)
 
 			self._packages.sort()
diff --git a/src/buildservice/updates.py b/src/buildservice/updates.py
index 97684527..7946fb89 100644
--- a/src/buildservice/updates.py
+++ b/src/buildservice/updates.py
@@ -1,8 +1,6 @@
 #!/usr/bin/python
 
-import base
-import builds
-import distribution
+from . import base
 
 class Updates(base.Object):
 	def __init__(self, pakfire):
diff --git a/src/buildservice/uploads.py b/src/buildservice/uploads.py
index a702da7d..6e48dc8d 100644
--- a/src/buildservice/uploads.py
+++ b/src/buildservice/uploads.py
@@ -11,11 +11,11 @@ import uuid
 
 import pakfire.packages
 
-import base
-import misc
-import packages
+from . import base
+from . import misc
+from . import packages
 
-from constants import *
+from .constants import *
 
 class Uploads(base.Object):
 	def get_by_uuid(self, _uuid):
diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 97a13267..2157010e 100644
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -10,7 +10,7 @@ import urllib
 
 import tornado.locale
 
-import base
+from . import base
 
 # A list of possible random characters.
 random_chars = string.ascii_letters + string.digits
diff --git a/src/hub/__init__.py b/src/hub/__init__.py
index 74bf1609..3f909353 100644
--- a/src/hub/__init__.py
+++ b/src/hub/__init__.py
@@ -7,8 +7,9 @@ import tornado.locale
 import tornado.options
 import tornado.web
 
-import backend
-import handlers
+from .. import Pakfire
+
+from . import handlers
 
 BASEDIR = os.path.join(os.path.dirname(__file__), "..", "data")
 
@@ -81,7 +82,7 @@ class Application(tornado.web.Application):
 		if self.__pakfire is None:
 			config_file = os.path.join(BASEDIR, "..", "pbs.conf")
 
-			self.__pakfire = backend.Pakfire(config_file=config_file)
+			self.__pakfire = Pakfire(config_file=config_file)
 
 		return self.__pakfire
 
diff --git a/src/hub/handlers.py b/src/hub/handlers.py
index 9826a42a..e98b1b30 100644
--- a/src/hub/handlers.py
+++ b/src/hub/handlers.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-import backend
-
 import base64
 import hashlib
 import json
@@ -9,6 +7,11 @@ import logging
 import time
 import tornado.web
 
+from .. import builds
+from .. import builders
+from .. import uploads
+from .. import users
+
 class LongPollMixin(object):
 	def initialize(self):
 		self._start_time = time.time()
@@ -76,12 +79,12 @@ class BaseHandler(LongPollMixin, tornado.web.RequestHandler):
 
 	@property
 	def builder(self):
-		if isinstance(self.current_user, backend.builders.Builder):
+		if isinstance(self.current_user, builders.Builder):
 			return self.current_user
 
 	@property
 	def user(self):
-		if isinstance(self.current_user, backend.users.User):
+		if isinstance(self.current_user, users.User):
 			return self.current_user
 
 	def get_argument_int(self, *args, **kwargs):
@@ -207,7 +210,7 @@ class UploadsCreateHandler(BaseHandler):
 		filesize = self.get_argument_int("filesize")
 		filehash = self.get_argument("hash")
 
-		upload = backend.uploads.Upload.create(self.backend, filename, filesize,
+		upload = uploads.Upload.create(self.backend, filename, filesize,
 			filehash, user=self.user, builder=self.builder)
 
 		self.finish(upload.uuid)
@@ -341,7 +344,7 @@ class BuildsCreateHandler(BaseHandler):
 			args["owner"] = self.user
 
 		try:
-			pkg, build = backend.builds.import_from_package(self.backend, upload.path, **args)
+			pkg, build = builds.import_from_package(self.backend, upload.path, **args)
 
 		except:
 			# Raise any exception.
@@ -512,7 +515,7 @@ class PackagesGetHandler(BaseHandler):
 		if pkg.type == "source":
 			ret["supported_arches"] = pkg.supported_arches
 
-		if isinstance(pkg.maintainer, backend.users.User):
+		if isinstance(pkg.maintainer, users.User):
 			ret["maintainer"] = "%s <%s>" % (pkg.maintainer.realname, pkg.maintainer.email)
 		elif pkg.maintainer:
 			ret["maintainer"] = pkg.maintainer
diff --git a/src/manager/__init__.py b/src/manager/__init__.py
index fb888606..4453a094 100644
--- a/src/manager/__init__.py
+++ b/src/manager/__init__.py
@@ -1,15 +1,15 @@
 #!/usr/bin/python
 
-import base
+from . import base
 
-from bugs         import BugsUpdateEvent
-from builds       import BuildsFailedRestartEvent, CheckBuildDependenciesEvent
-from builds       import CreateTestBuildsEvent, DistEvent
-from messages     import MessagesSendEvent
-from repositories import RepositoriesUpdateEvent
-from sessions     import SessionsCleanupEvent
-from sources      import SourcesPullEvent
-from uploads      import UploadsCleanupEvent
+from .bugs         import BugsUpdateEvent
+from .builds       import BuildsFailedRestartEvent, CheckBuildDependenciesEvent
+from .builds       import CreateTestBuildsEvent, DistEvent
+from .messages     import MessagesSendEvent
+from .repositories import RepositoriesUpdateEvent
+from .sessions     import SessionsCleanupEvent
+from .sources      import SourcesPullEvent
+from .uploads      import UploadsCleanupEvent
 
 
 # Events that do not fit anywhere else.
diff --git a/src/manager/base.py b/src/manager/base.py
index 7d0b1713..35ad9d5b 100644
--- a/src/manager/base.py
+++ b/src/manager/base.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python
 
-import backend.scheduler
+from .. import scheduler
 
-class Event(backend.scheduler.Event):
+class Event(scheduler.Event):
 	def __init__(self, pakfire, *args, **kwargs):
-		backend.scheduler.Event.__init__(self, *args, **kwargs)
+		scheduler.Event.__init__(self, *args, **kwargs)
 
 		self.pakfire = pakfire
 
diff --git a/src/manager/bugs.py b/src/manager/bugs.py
index 10dcaa4a..1ee5f64f 100644
--- a/src/manager/bugs.py
+++ b/src/manager/bugs.py
@@ -2,7 +2,7 @@
 
 import logging
 
-import base
+from . import base
 
 class BugsUpdateEvent(base.Event):
 	# User feedback gets a high priority.
diff --git a/src/manager/builds.py b/src/manager/builds.py
index 395e265e..0e230ba0 100644
--- a/src/manager/builds.py
+++ b/src/manager/builds.py
@@ -7,12 +7,12 @@ import pakfire.config
 import shutil
 import tempfile
 
-import backend.builds
-import backend.git
+from .. import builds
+from .. import git
 
-import base
+from . import base
 
-from pakfire.constants import *
+from ..constants import *
 
 class BuildsFailedRestartEvent(base.Event):
 	# Run when idle.
@@ -160,7 +160,7 @@ class DistEvent(base.Event):
 			logging.debug("Processing commit %s: %s" % (commit.revision, commit.subject))
 
 			# Get the repository of this commit.
-			repo = backend.git.Repo(self.pakfire, commit.source_id)
+			repo = git.Repo(self.pakfire, commit.source_id)
 
 			# Make sure, it is checked out.
 			if not repo.cloned:
@@ -196,7 +196,7 @@ class DistEvent(base.Event):
 				continue
 
 			# Initialize the repository or and clone it if necessary.
-			repo = backend.git.Repo(self.pakfire, source.id)
+			repo = git.Repo(self.pakfire, source.id)
 			if not repo.cloned:
 				repo.clone()
 
@@ -250,7 +250,7 @@ class DistFileEvent(base.Event):
 				# Import all packages in one swoop.
 				for pkg in pkgs:
 					# Import the package file and create a build out of it.
-					backend.builds.import_from_package(_pakfire, pkg,
+					builds.import_from_package(_pakfire, pkg,
 						distro=source.distro, commit=commit, type="release")
 
 			except:
diff --git a/src/manager/messages.py b/src/manager/messages.py
index ade15449..41139149 100644
--- a/src/manager/messages.py
+++ b/src/manager/messages.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import base
+from . import base
 
 class MessagesSendEvent(base.Event):
 	# Emails should be sent out as quickly as possible.
diff --git a/src/manager/repositories.py b/src/manager/repositories.py
index 7f75941d..1d1c8de1 100644
--- a/src/manager/repositories.py
+++ b/src/manager/repositories.py
@@ -4,9 +4,9 @@ import logging
 import os
 import pakfire
 
-import base
+from . import base
 
-from backend.constants import *
+from ..constants import *
 
 class RepositoriesUpdateEvent(base.Event):
 	priority = 6
diff --git a/src/manager/sessions.py b/src/manager/sessions.py
index 283a756e..1d5579e2 100644
--- a/src/manager/sessions.py
+++ b/src/manager/sessions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import base
+from . import base
 
 class SessionsCleanupEvent(base.Event):
 	"""
diff --git a/src/manager/sources.py b/src/manager/sources.py
index 39b0ed74..10405654 100644
--- a/src/manager/sources.py
+++ b/src/manager/sources.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 
-import backend.git
+from .. import git
 
-import base
+from . import base
 
 class SourcesPullEvent(base.Event):
 	# This should run whenever possible, so the user can see his commits
@@ -15,7 +15,7 @@ class SourcesPullEvent(base.Event):
 
 	def run(self):
 		for source in self.pakfire.sources.get_all():
-			repo = backend.git.Repo(self.pakfire, source.id, mode="mirror")
+			repo = git.Repo(self.pakfire, source.id, mode="mirror")
 
 			# If the repository is not yet cloned, we need to make a local
 			# clone to work with.
diff --git a/src/manager/uploads.py b/src/manager/uploads.py
index 2cbfe9de..c0084555 100644
--- a/src/manager/uploads.py
+++ b/src/manager/uploads.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import base
+from . import base
 
 class UploadsCleanupEvent(base.Event):
 	interval = 3600
diff --git a/src/scripts/pakfire-hub b/src/scripts/pakfire-hub
index 21d28364..6390a895 100644
--- a/src/scripts/pakfire-hub
+++ b/src/scripts/pakfire-hub
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
-import hub
-
-app = hub.Application()
-app.run()
+import pakfire.buildservice.hub
 
+app = pakfire.buildservice.hub.Application()
+app.run()
\ No newline at end of file
diff --git a/src/scripts/pakfire-manager b/src/scripts/pakfire-manager
index 01dcf42c..d620253e 100644
--- a/src/scripts/pakfire-manager
+++ b/src/scripts/pakfire-manager
@@ -1,9 +1,7 @@
 #!/usr/bin/python
 
-import backend.main
-import backend.scheduler
-
-import manager
+import pakfire.buildservice
+import pakfire.buildservice.manager
 
 # Use tornado's logging options.
 import tornado.options
@@ -12,23 +10,23 @@ tornado.options.parse_command_line()
 # main
 
 # Create Scheduler instance.
-s = backend.scheduler.Scheduler()
+s = pakfire.buildservice.scheduler.Scheduler()
 
 # Create Pakfire instance.
-p = backend.main.Pakfire()
+p = pakfire.buildservice.Pakfire()
 
 events = (
-	manager.BugsUpdateEvent,
-	manager.BuildsFailedRestartEvent,
-	manager.CheckBuildDependenciesEvent,
-	manager.CleanupFilesEvent,
-	manager.CreateTestBuildsEvent,
-	manager.DistEvent,
-	manager.MessagesSendEvent,
-	manager.RepositoriesUpdateEvent,
-	manager.SessionsCleanupEvent,
-	manager.SourcesPullEvent,
-	manager.UploadsCleanupEvent,
+	pakfire.buildservice.manager.BugsUpdateEvent,
+	pakfire.buildservice.manager.BuildsFailedRestartEvent,
+	pakfire.buildservice.manager.CheckBuildDependenciesEvent,
+	pakfire.buildservice.manager.CleanupFilesEvent,
+	pakfire.buildservice.manager.CreateTestBuildsEvent,
+	pakfire.buildservice.manager.DistEvent,
+	pakfire.buildservice.manager.MessagesSendEvent,
+	pakfire.buildservice.manager.RepositoriesUpdateEvent,
+	pakfire.buildservice.manager.SessionsCleanupEvent,
+	pakfire.buildservice.manager.SourcesPullEvent,
+	pakfire.buildservice.manager.UploadsCleanupEvent,
 )
 
 # Add all events to the scheduler.
diff --git a/src/scripts/pakfire-web b/src/scripts/pakfire-web
index feea4585..a50a92bf 100644
--- a/src/scripts/pakfire-web
+++ b/src/scripts/pakfire-web
@@ -7,8 +7,7 @@ import sys
 
 import tornado.options
 
-from web import Application
-
+from pakfire.buildservice.web import Application
 
 #tornado.options.parse_command_line()
 
diff --git a/src/web/__init__.py b/src/web/__init__.py
index bb6d5579..7697ece2 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -9,10 +9,10 @@ import tornado.locale
 import tornado.options
 import tornado.web
 
-from handlers import *
-from ui_modules import *
+from . import handlers_api
 
-import handlers_api
+from .handlers import *
+from .ui_modules import *
 
 BASEDIR = os.path.join(os.path.dirname(__file__), "..", "data")
 
diff --git a/src/web/handlers.py b/src/web/handlers.py
index cbbd48d9..ec75b179 100644
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -2,18 +2,18 @@
 
 import tornado.web
 
-from handlers_auth import *
-from handlers_base import *
-from handlers_builds import *
-from handlers_builders import *
-from handlers_distro import *
-from handlers_jobs import *
-from handlers_keys import *
-from handlers_mirrors import *
-from handlers_packages import *
-from handlers_search import *
-from handlers_updates import *
-from handlers_users import *
+from .handlers_auth import *
+from .handlers_base import *
+from .handlers_builds import *
+from .handlers_builders import *
+from .handlers_distro import *
+from .handlers_jobs import *
+from .handlers_keys import *
+from .handlers_mirrors import *
+from .handlers_packages import *
+from .handlers_search import *
+from .handlers_updates import *
+from .handlers_users import *
 
 class IndexHandler(BaseHandler):
 	def get(self):
diff --git a/src/web/handlers_auth.py b/src/web/handlers_auth.py
index 822da85c..60d04a66 100644
--- a/src/web/handlers_auth.py
+++ b/src/web/handlers_auth.py
@@ -2,10 +2,9 @@
 
 import tornado.web
 
-import backend.sessions
-import backend.users
+from .. import sessions
 
-from handlers_base import *
+from .handlers_base import *
 
 class LoginHandler(BaseHandler):
 	def get(self):
@@ -25,7 +24,7 @@ class LoginHandler(BaseHandler):
 
 		if user:
 			# Create a new session for the user.
-			session = backend.sessions.Session.create(self.pakfire, user)
+			session = sessions.Session.create(self.pakfire, user)
 
 			# Set a cookie and update the current user.
 			self.set_cookie("session_id", session.id, expires=session.valid_until)
@@ -114,7 +113,7 @@ class ActivationHandler(BaseHandler):
 
 			else:
 				# Automatically login the user.
-				session = backend.sessions.Session.create(self.pakfire, user)
+				session = sessions.Session.create(self.pakfire, user)
 
 				# Set a cookie and update the current user.
 				self.set_cookie("session_id", session.id, expires=session.valid_until)
diff --git a/src/web/handlers_base.py b/src/web/handlers_base.py
index fc39e06b..9f615e67 100644
--- a/src/web/handlers_base.py
+++ b/src/web/handlers_base.py
@@ -10,8 +10,7 @@ import tornado.locale
 import tornado.web
 import traceback
 
-import backend
-import backend.misc
+from .. import misc
 
 class BaseHandler(tornado.web.RequestHandler):
 	@property
@@ -90,10 +89,10 @@ class BaseHandler(tornado.web.RequestHandler):
 			"bugtracker"      : self.pakfire.bugzilla,
 			"hostname"        : self.request.host,
 			"format_date"     : self.format_date,
-			"format_size"     : backend.misc.format_size,
-			"friendly_time"   : backend.misc.friendly_time,
-			"format_email"    : backend.misc.format_email,
-			"format_filemode" : backend.misc.format_filemode,
+			"format_size"     : misc.format_size,
+			"friendly_time"   : misc.friendly_time,
+			"format_email"    : misc.format_email,
+			"format_filemode" : misc.format_filemode,
 			"lang"            : self.locale.code[:2],
 			"pakfire_version" : pakfire.__version__,
 			"session"         : session,
diff --git a/src/web/handlers_builders.py b/src/web/handlers_builders.py
index 771b2d4a..aa0136f4 100644
--- a/src/web/handlers_builders.py
+++ b/src/web/handlers_builders.py
@@ -2,9 +2,9 @@
 
 import tornado.web
 
-import backend
+from .. import builders
 
-from handlers_base import *
+from .handlers_base import *
 
 class BuilderListHandler(BaseHandler):
 	def get(self):
@@ -52,7 +52,7 @@ class BuilderNewHandler(BaseHandler):
 
 		# Create a new builder.
 		builder, passphrase = \
-			backend.builders.Builder.create(self.pakfire, name, user=self.current_user)
+			builders.Builder.create(self.pakfire, name, user=self.current_user)
 
 		self.render("builders/pass.html", action="new", builder=builder,
 			passphrase=passphrase)
diff --git a/src/web/handlers_builds.py b/src/web/handlers_builds.py
index 266874cd..c638a146 100644
--- a/src/web/handlers_builds.py
+++ b/src/web/handlers_builds.py
@@ -2,7 +2,7 @@
 
 import tornado.web
 
-from handlers_base import BaseHandler
+from .handlers_base import BaseHandler
 
 class BuildsHandler(BaseHandler):
 	def get(self):
diff --git a/src/web/handlers_distro.py b/src/web/handlers_distro.py
index 04bacc95..57a35b85 100644
--- a/src/web/handlers_distro.py
+++ b/src/web/handlers_distro.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
-from handlers_base import *
-
+from .handlers_base import *
 
 class DistributionListHandler(BaseHandler):
 	def get(self):
diff --git a/src/web/handlers_jobs.py b/src/web/handlers_jobs.py
index 12949f52..807229eb 100644
--- a/src/web/handlers_jobs.py
+++ b/src/web/handlers_jobs.py
@@ -2,8 +2,7 @@
 
 import tornado.web
 
-from handlers_base import BaseHandler
-
+from .handlers_base import BaseHandler
 
 class JobsIndexHandler(BaseHandler):
 	def get(self):
diff --git a/src/web/handlers_keys.py b/src/web/handlers_keys.py
index e3f40d1b..cb52f777 100644
--- a/src/web/handlers_keys.py
+++ b/src/web/handlers_keys.py
@@ -2,7 +2,7 @@
 
 import tornado.web
 
-from handlers_base import BaseHandler
+from .handlers_base import BaseHandler
 
 class KeysActionHandler(BaseHandler):
 	def prepare(self):
diff --git a/src/web/handlers_mirrors.py b/src/web/handlers_mirrors.py
index c022f2f7..dabcc38c 100644
--- a/src/web/handlers_mirrors.py
+++ b/src/web/handlers_mirrors.py
@@ -2,9 +2,9 @@
 
 import tornado.web
 
-import backend
+from .. import mirrors
 
-from handlers_base import BaseHandler
+from .handlers_base import BaseHandler
 
 class MirrorListHandler(BaseHandler):
 	def get(self):
@@ -77,7 +77,7 @@ class MirrorNewHandler(MirrorActionHandler):
 			})
 			return self.get(**errors)
 
-		mirror = backend.mirrors.Mirror.create(self.pakfire, hostname, path,
+		mirror = mirrors.Mirror.create(self.pakfire, hostname, path,
 			user=self.current_user)
 		assert mirror
 
diff --git a/src/web/handlers_packages.py b/src/web/handlers_packages.py
index bed6e6ee..d108360a 100644
--- a/src/web/handlers_packages.py
+++ b/src/web/handlers_packages.py
@@ -4,9 +4,9 @@ import mimetypes
 import os.path
 import tornado.web
 
-from handlers_base import BaseHandler
+from .handlers_base import BaseHandler
 
-from backend.constants import BUFFER_SIZE
+from ..constants import BUFFER_SIZE
 
 class PackageIDDetailHandler(BaseHandler):
 	def get(self, id):
diff --git a/src/web/handlers_search.py b/src/web/handlers_search.py
index dd9eca6a..6af32418 100644
--- a/src/web/handlers_search.py
+++ b/src/web/handlers_search.py
@@ -2,7 +2,7 @@
 
 import re
 
-from handlers_base import *
+from .handlers_base import *
 
 class SearchHandler(BaseHandler):
 	def get(self):
diff --git a/src/web/handlers_updates.py b/src/web/handlers_updates.py
index a1028f9d..3eb919ff 100644
--- a/src/web/handlers_updates.py
+++ b/src/web/handlers_updates.py
@@ -2,7 +2,7 @@
 
 import tornado.web
 
-from handlers_base import BaseHandler
+from .handlers_base import BaseHandler
 
 class UpdatesHandler(BaseHandler):
 	def get(self):
diff --git a/src/web/handlers_users.py b/src/web/handlers_users.py
index 06bd49e2..7e6a0d29 100644
--- a/src/web/handlers_users.py
+++ b/src/web/handlers_users.py
@@ -5,7 +5,7 @@ import datetime
 import tornado.locale
 import tornado.web
 
-from handlers_base import *
+from .handlers_base import *
 
 class UserHandler(BaseHandler):
 	@tornado.web.authenticated
diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index de053f3c..4bdb0eec 100644
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -11,8 +11,8 @@ import string
 import tornado.escape
 import tornado.web
 
-import backend.users
-from backend.constants import *
+from .. import users
+from ..constants import *
 
 class UIModule(tornado.web.UIModule):
 	@property
@@ -438,7 +438,7 @@ class LogEntryCommentModule(LogEntryModule):
 
 class MaintainerModule(UIModule):
 	def render(self, maintainer):
-		if isinstance(maintainer, backend.users.User):
+		if isinstance(maintainer, users.User):
 			type = "user"
 		else:
 			type = "string"