]> git.ipfire.org Git - people/jschlag/pbs.git/commitdiff
Use relative imports everywhere
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 6 Oct 2017 15:07:29 +0000 (16:07 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 6 Oct 2017 15:07:29 +0000 (16:07 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
52 files changed:
po/POTFILES.in
src/buildservice/__init__.py
src/buildservice/arches.py
src/buildservice/bugtracker.py
src/buildservice/builders.py
src/buildservice/builds.py
src/buildservice/cache.py
src/buildservice/distribution.py
src/buildservice/git.py
src/buildservice/keys.py
src/buildservice/logs.py
src/buildservice/messages.py
src/buildservice/mirrors.py
src/buildservice/misc.py
src/buildservice/packages.py
src/buildservice/repository.py
src/buildservice/scheduler.py
src/buildservice/sessions.py
src/buildservice/settings.py
src/buildservice/sources.py
src/buildservice/updates.py
src/buildservice/uploads.py
src/buildservice/users.py
src/hub/__init__.py
src/hub/handlers.py
src/manager/__init__.py
src/manager/base.py
src/manager/bugs.py
src/manager/builds.py
src/manager/messages.py
src/manager/repositories.py
src/manager/sessions.py
src/manager/sources.py
src/manager/uploads.py
src/scripts/pakfire-hub
src/scripts/pakfire-manager
src/scripts/pakfire-web
src/web/__init__.py
src/web/handlers.py
src/web/handlers_auth.py
src/web/handlers_base.py
src/web/handlers_builders.py
src/web/handlers_builds.py
src/web/handlers_distro.py
src/web/handlers_jobs.py
src/web/handlers_keys.py
src/web/handlers_mirrors.py
src/web/handlers_packages.py
src/web/handlers_search.py
src/web/handlers_updates.py
src/web/handlers_users.py
src/web/ui_modules.py

index 6c439e725a5b03863b14b9f164a2755689704585..8eb1a41d652a7385c0e869fa14dc2ae533c850e2 100644 (file)
@@ -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
index 00cf507e7c2454acb1401e66b58594c7819787f8..d1ef4bbf3967662c99c47675700f5838e8bf8cd0 100644 (file)
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 
+from __future__ import absolute_import
+
 import ConfigParser
 import logging
 import os
index 2c07e2a534676b1c2ac8abb41807483355cb5858..1b4d623556ab6afd344f6d42c204ed1202f12672 100644 (file)
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import base
+from . import base
 
 class Arches(base.Object):
        def get_all(self, really=False):
index 680f9214c5504f7aea69bbcd8acecb683f066ddc..7d80c1c3ef2c94cd39b50df74e010116946561d1 100644 (file)
@@ -2,7 +2,7 @@
 
 import xmlrpclib
 
-import base
+from . import base
 
 class BugzillaBug(base.Object):
        def __init__(self, bugzilla, bug_id):
index c03703ece4b2e574f67ccec42eff181491717ea0..5417ea88a3ebd12e02cc82964bfde00cfcf58f2a 100644 (file)
@@ -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):
index 66aedde52b3801d325291b4d1fade695f100a843..53f2d44bfcdcc141411a154a4b082b592d8c6c48 100644 (file)
@@ -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):
index 6ff843270237bbe7b1736eca84154c50df5ec5b5..8b64f9e43b5bd50010ddfee23afe9f6aa18f1725 100644 (file)
@@ -3,7 +3,7 @@
 import logging
 import memcache
 
-import base
+from . import base
 
 class Client(memcache.Client):
        def debuglog(self, str):
index 27f52d9683b17445808c6a60a24af3a31bc49c94..edd4c8184f1865404f6ab8f3aca3acb475430544 100644 (file)
@@ -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):
index 02d1de73e9735bf6b1d57fa5a8383150390f5071..1f2f486de1fc5371fa1126b60b1c3a92b5ef13b2 100644 (file)
@@ -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"):
index 03f40e3dc5680fa9b46375b2b606b97978b8ab7c..21d0e9b7580d4c6dc48ca3ebbf7980668273c899 100644 (file)
@@ -7,7 +7,7 @@ import os
 import shutil
 import tempfile
 
-import base
+from . import base
 
 def read_key(data):
        data = str(data)
index 0a5c8b1e0e493d616858a01c59ec27ef95021708..716991aea53efbdd5003fcffcf79816da6ef273a 100644 (file)
@@ -2,8 +2,7 @@
 
 import os
 
-import base
-import builds
+from . import base
 
 _ = lambda x: x
 
index 8572fb26eb5e2dbb502fb8c2394ffcb3246ffff3..0c75377e3b8037ddd0701470181c65bcb24076a6 100644 (file)
@@ -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):
index b28b75a7ebbba01fa0434cd992f027f6bbba4ae9..4f093df224c8aedc007c16d087fffd0fb108b9ab 100644 (file)
@@ -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):
index 8e730c3ac59f0def757d69b4d87446e6964ba878..5808951466234ae37c938e6f32a7088bd8269256 100644 (file)
@@ -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")
index e6f80f03ba6ca28de8ee26bc228867a26d4d32ba..1dbf92e4c1b46f1b15e411cbf93fcf704a3ef2c4 100644 (file)
@@ -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
 
index b07652c4d08160236a42f7aecb73f130aae550db..3ba144e3ab6d83cddb750cba8f0ee4bd197fa183 100644 (file)
@@ -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
index 9e08362e4c5070fe53ec614aeea82c747fe30432..3151dc53ea0c1a5231c6ca0152c3533946c8b7d8 100644 (file)
@@ -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)
 
index 73d7730e3266f3867f8f9c4043dcb219746c2afc..7b71f0f1dabee378ef858baa7fbdec1c08196617 100644 (file)
@@ -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):
index ae6aeb7f7ebfc17ac76740fc8e4b2bc6e06abfae..db1a6a023c94674fbdde277494688cff804da18e 100644 (file)
@@ -2,8 +2,8 @@
 
 import time
 
-import base
-import cache
+from . import base
+from . import cache
 
 class Settings(base.Object):
        def __init__(self, pakfire):
index 8b7f7243558a42dadf9454607c9538bb7644898f..5e34d548062ccd1fe132328fe8776ae6977c84c8 100644 (file)
@@ -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()
index 97684527233e9d3fbfaa2b945d768f5b4d14b1cf..7946fb890028692f1d1ba872b178c9eaeb0fa58a 100644 (file)
@@ -1,8 +1,6 @@
 #!/usr/bin/python
 
-import base
-import builds
-import distribution
+from . import base
 
 class Updates(base.Object):
        def __init__(self, pakfire):
index a702da7de9ed083e999d3bc85b771a6ecf1eb321..6e48dc8dae3360ee08831dfe918ab765006a89ed 100644 (file)
@@ -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):
index 97a132676c114a6fb111bcdc8a990fab45daad96..2157010e4451b110b7d3cf672bb20f89415ad424 100644 (file)
@@ -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
index 74bf16095781e63c200ed501282d6a573d74fe32..3f90935355d8da9a185ae2e9dea5c5c7acd77a7b 100644 (file)
@@ -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
 
index 9826a42a956d379a56ba8217c6fdc410f09a5782..e98b1b304e97c153277ec5616f47f66566f36f3d 100644 (file)
@@ -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
index fb88860620dcb9432bff72f2264f5986410ea02c..4453a094ca5836f5d3abc1986221d9210dd8ca5f 100644 (file)
@@ -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.
index 7d0b1713148952d8f4f7e801d085b5efe93b9219..35ad9d5b2f42de0566a762e4539d4b9672ea1e2b 100644 (file)
@@ -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
 
index 10dcaa4a60d349e903ce344957f05533e13a4dd6..1ee5f64fd974bb7897158651edc2d0df3637a71e 100644 (file)
@@ -2,7 +2,7 @@
 
 import logging
 
-import base
+from . import base
 
 class BugsUpdateEvent(base.Event):
        # User feedback gets a high priority.
index 395e265e1d56f28278b22a6198ccfa214a67a699..0e230ba069bc105d7a27bf84f50dced5aeec2128 100644 (file)
@@ -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:
index ade15449b668547dbccee116e436cae5e8902ca5..41139149e2df014de362014438003c015b3ce994 100644 (file)
@@ -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.
index 7f75941d72030cc2028667c5050134063a09696c..1d1c8de15b1bd4b3d59af26263e3fd11d9146aff 100644 (file)
@@ -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
index 283a756efceaa4efeaec6e2ac3554c439a11e359..1d5579e248dcd2be4d0d971f527bdc0c354813eb 100644 (file)
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import base
+from . import base
 
 class SessionsCleanupEvent(base.Event):
        """
index 39b0ed742ff0a6ed5e4fa2dc078a64dc7369def6..104056542a107146fa5654a22da005233818df0b 100644 (file)
@@ -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.
index 2cbfe9de21513e2f548a454eddd445f8bbc2f517..c00845552b8538467cb2739c64be09220fbc6011 100644 (file)
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import base
+from . import base
 
 class UploadsCleanupEvent(base.Event):
        interval = 3600
index 21d2836427f0ac041467476cfbb7db68be5e633d..6390a895b816dc2bd5b19b10408d8245af757462 100644 (file)
@@ -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
index 01dcf42cf047b06f1e5f21bfa1432274d6e71acc..d620253e2ba76067978e8323410c21c568aec96a 100644 (file)
@@ -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.
index feea458590499941ba7d9dd69ec6ca16daa23f10..a50a92bf71e66d64f9e7055082f4c14773c933f2 100644 (file)
@@ -7,8 +7,7 @@ import sys
 
 import tornado.options
 
-from web import Application
-
+from pakfire.buildservice.web import Application
 
 #tornado.options.parse_command_line()
 
index bb6d5579b7736856f919f7e7a0437f705afae400..7697ece284b2d510d7b5f59c5c95a48fea985926 100644 (file)
@@ -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")
 
index cbbd48d9868362ebec622a430ce26cfa202e8ca3..ec75b1793ee0fc320ed0f5e4cbaccf1f0f0d9a53 100644 (file)
@@ -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):
index 822da85cc1e1dc5a94c4935828040e2e406ed188..60d04a660d132b0f7c9a9e182a6d2d2499280376 100644 (file)
@@ -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)
index fc39e06b4d7f0590283c65786cb1a151ffda4304..9f615e67ec510cf79abae301e72e5aa7f6297a85 100644 (file)
@@ -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,
index 771b2d4ace4fa7138c9b62c49330d47d719e6da1..aa0136f403824957364cf37130c51ea5561fde64 100644 (file)
@@ -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)
index 266874cd30ee34636b0439036cc3594ccb03d913..c638a1467cb4b0daed120ec6d0c221bcf7489831 100644 (file)
@@ -2,7 +2,7 @@
 
 import tornado.web
 
-from handlers_base import BaseHandler
+from .handlers_base import BaseHandler
 
 class BuildsHandler(BaseHandler):
        def get(self):
index 04bacc9567fbfbbac00cfbe98a25488fae8c6ab1..57a35b85b8742a99b9f04c26146442da3c968b27 100644 (file)
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
-from handlers_base import *
-
+from .handlers_base import *
 
 class DistributionListHandler(BaseHandler):
        def get(self):
index 12949f5231fcda570173ecc85023f861a7acfd5d..807229ebeca02e7c4bf3446925dea8eecf7e72f0 100644 (file)
@@ -2,8 +2,7 @@
 
 import tornado.web
 
-from handlers_base import BaseHandler
-
+from .handlers_base import BaseHandler
 
 class JobsIndexHandler(BaseHandler):
        def get(self):
index e3f40d1bb988aa08146222db74620409d794acc6..cb52f77722d01e22478424023eb995882a5b957c 100644 (file)
@@ -2,7 +2,7 @@
 
 import tornado.web
 
-from handlers_base import BaseHandler
+from .handlers_base import BaseHandler
 
 class KeysActionHandler(BaseHandler):
        def prepare(self):
index c022f2f73550159a9d664deacfe934dcc0579fee..dabcc38c3149776a60fa2bec468cafe7e3745433 100644 (file)
@@ -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
 
index bed6e6ee0a9c0995ad736777c9f20bd616442b45..d108360a914bcf25b66ee84a5ae928b0309f0ff3 100644 (file)
@@ -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):
index dd9eca6a09908fc2f0d5263688db2718b6a6a860..6af32418bfc9ff4f384ae55c5dca454809ef50fb 100644 (file)
@@ -2,7 +2,7 @@
 
 import re
 
-from handlers_base import *
+from .handlers_base import *
 
 class SearchHandler(BaseHandler):
        def get(self):
index a1028f9d79fc943fa20dd3f33fd581abfb005071..3eb919ff5d3328d5497f0898c47db49c9c619d3d 100644 (file)
@@ -2,7 +2,7 @@
 
 import tornado.web
 
-from handlers_base import BaseHandler
+from .handlers_base import BaseHandler
 
 class UpdatesHandler(BaseHandler):
        def get(self):
index 06bd49e2f04c9b4cb48c761e9c3ffe1113a1c127..7e6a0d298f5f2b108da3b5f70c0d30566eeb6639 100644 (file)
@@ -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
index de053f3cfc2edf7afc61628b4ed5aa106c2ef2e0..4bdb0eeceed4df71a3106c72a6d7187e8aee217b 100644 (file)
@@ -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"