From: Michael Tremer Date: Wed, 25 Oct 2017 17:33:57 +0000 (+0100) Subject: Rename web/handlers_base.py -> web/base.py X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0919f2160242509e29df066372a91d73d796479a;p=pbs.git Rename web/handlers_base.py -> web/base.py Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 22f745f3..01bda2ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,10 +123,10 @@ hubdir = $(buildservicedir)/hub web_PYTHON = \ src/web/__init__.py \ + src/web/base.py \ src/web/handlers.py \ src/web/handlers_api.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 \ diff --git a/src/web/handlers_base.py b/src/web/base.py similarity index 97% rename from src/web/handlers_base.py rename to src/web/base.py index 00d64357..23e05d83 100644 --- a/src/web/handlers_base.py +++ b/src/web/base.py @@ -1,8 +1,5 @@ #!/usr/bin/python -import pakfire - -import datetime import httplib import pytz import time @@ -117,4 +114,8 @@ class BaseHandler(tornado.web.RequestHandler): @property def mirrors(self): - return self.pakfire.mirrors \ No newline at end of file + return self.pakfire.mirrors + + +class ApiBaseHandler(BaseHandler): + pass diff --git a/src/web/handlers.py b/src/web/handlers.py index 9e87889d..50b298a9 100644 --- a/src/web/handlers.py +++ b/src/web/handlers.py @@ -3,8 +3,9 @@ import random import tornado.web +from . import base + from .handlers_auth import * -from .handlers_base import * from .handlers_builds import * from .handlers_builders import * from .handlers_distro import * @@ -15,7 +16,7 @@ from .handlers_search import * from .handlers_updates import * from .handlers_users import * -class IndexHandler(BaseHandler): +class IndexHandler(base.BaseHandler): def get(self): jobs = self.pakfire.jobs.get_active() jobs += self.pakfire.jobs.get_latest(age="24 hours", limit=5) @@ -32,12 +33,12 @@ class IndexHandler(BaseHandler): self.render("index.html", jobs=jobs, updates=updates) -class Error404Handler(BaseHandler): +class Error404Handler(base.BaseHandler): def get(self): raise tornado.web.HTTPError(404) -class UploadsHandler(BaseHandler): +class UploadsHandler(base.BaseHandler): @tornado.web.authenticated def get(self): if not self.current_user.is_admin(): @@ -46,27 +47,27 @@ class UploadsHandler(BaseHandler): self.render("uploads-list.html", uploads=self.backend.uploads) -class DocsIndexHandler(BaseHandler): +class DocsIndexHandler(base.BaseHandler): def get(self): self.render("docs-index.html") -class DocsBuildsHandler(BaseHandler): +class DocsBuildsHandler(base.BaseHandler): def get(self): self.render("docs-build.html") -class DocsUsersHandler(BaseHandler): +class DocsUsersHandler(base.BaseHandler): def get(self): self.render("docs-users.html") -class DocsWhatsthisHandler(BaseHandler): +class DocsWhatsthisHandler(base.BaseHandler): def get(self): self.render("docs-whatsthis.html") -class FileDetailHandler(BaseHandler): +class FileDetailHandler(base.BaseHandler): def get(self, uuid): pkg, file = self.pakfire.packages.get_with_file_by_uuid(uuid) @@ -76,12 +77,12 @@ class FileDetailHandler(BaseHandler): self.render("file-detail.html", pkg=pkg, file=file) -class LogHandler(BaseHandler): +class LogHandler(base.BaseHandler): def get(self): self.render("log.html", log=self.pakfire.log) -class SessionsHandler(BaseHandler): +class SessionsHandler(base.BaseHandler): def prepare(self): # This is only accessible for administrators. if not self.current_user.is_admin(): @@ -104,7 +105,7 @@ class SessionsHandler(BaseHandler): self.render("sessions/index.html", sessions=sessions) -class RepositoryDetailHandler(BaseHandler): +class RepositoryDetailHandler(base.BaseHandler): def get(self, distro, repo): distro = self.pakfire.distros.get_by_name(distro) if not distro: @@ -138,7 +139,7 @@ class RepositoryDetailHandler(BaseHandler): obsolete_builds=obsolete_builds, build_times=build_times) -class RepositoryEditHandler(BaseHandler): +class RepositoryEditHandler(base.BaseHandler): @tornado.web.authenticated def get(self, distro, repo): distro = self.pakfire.distros.get_by_name(distro) @@ -154,7 +155,7 @@ class RepositoryEditHandler(BaseHandler): self.render("repository-edit.html", distro=distro, repo=repo) -class RepositoryConfHandler(BaseHandler): +class RepositoryConfHandler(base.BaseHandler): def get(self, distro, repo): distro = self.pakfire.distros.get_by_name(distro) if not distro: @@ -174,7 +175,7 @@ class RepositoryConfHandler(BaseHandler): self.finish() -class RepositoryMirrorlistHandler(BaseHandler): +class RepositoryMirrorlistHandler(base.BaseHandler): def get(self, distro, repo): distro = self.pakfire.distros.get_by_name(distro) if not distro: @@ -216,7 +217,7 @@ class RepositoryMirrorlistHandler(BaseHandler): self.finish(ret) -class RepoActionHandler(BaseHandler): +class RepoActionHandler(base.BaseHandler): @tornado.web.authenticated def post(self, type): assert type in ("run", "remove") diff --git a/src/web/handlers_api.py b/src/web/handlers_api.py index 21a08ca7..df84c512 100644 --- a/src/web/handlers_api.py +++ b/src/web/handlers_api.py @@ -2,13 +2,9 @@ import tornado.web -from handlers_base import * +from . import base -class ApiBaseHandler(BaseHandler): - pass - - -class ApiPackagesAutocomplete(BaseHandler): +class ApiPackagesAutocomplete(base.ApiBaseHandler): def get(self): query = self.get_argument("q") if not query: diff --git a/src/web/handlers_auth.py b/src/web/handlers_auth.py index 6ecbaeb2..dd4b7eec 100644 --- a/src/web/handlers_auth.py +++ b/src/web/handlers_auth.py @@ -2,9 +2,9 @@ import tornado.web -from .handlers_base import * +from . import base -class LoginHandler(BaseHandler): +class LoginHandler(base.BaseHandler): def get(self): # If the user is already logged in, we just send him back # to the start page. @@ -41,7 +41,7 @@ class LoginHandler(BaseHandler): self.redirect(next) -class RegisterHandler(BaseHandler): +class RegisterHandler(base.BaseHandler): def get(self): # If the user is already logged in, we just send him back # to the start page. @@ -105,7 +105,7 @@ class RegisterHandler(BaseHandler): self.render("register-success.html", user=user) -class ActivationHandler(BaseHandler): +class ActivationHandler(base.BaseHandler): def get(self, _user): user = self.pakfire.users.get_by_name(_user) if not user: @@ -136,7 +136,7 @@ class ActivationHandler(BaseHandler): self.render("register-activation-fail.html") -class PasswordRecoveryHandler(BaseHandler): +class PasswordRecoveryHandler(base.BaseHandler): def get(self): return self.render("user-forgot-password.html") @@ -149,7 +149,7 @@ class PasswordRecoveryHandler(BaseHandler): # XXX TODO -class LogoutHandler(BaseHandler): +class LogoutHandler(base.BaseHandler): @tornado.web.authenticated def get(self): # Destroy the user's session. diff --git a/src/web/handlers_builders.py b/src/web/handlers_builders.py index 92e840ed..3fa03909 100644 --- a/src/web/handlers_builders.py +++ b/src/web/handlers_builders.py @@ -4,14 +4,14 @@ import tornado.web from .. import builders -from .handlers_base import * +from . import base -class BuilderListHandler(BaseHandler): +class BuilderListHandler(base.BaseHandler): def get(self): self.render("builders/list.html", builders=self.backend.builders) -class BuilderDetailHandler(BaseHandler): +class BuilderDetailHandler(base.BaseHandler): def get(self, hostname): builder = self.pakfire.builders.get_by_name(hostname) @@ -37,7 +37,7 @@ class BuilderDetailHandler(BaseHandler): self.redirect("/builder/%s" % builder.hostname) -class BuilderNewHandler(BaseHandler): +class BuilderNewHandler(base.BaseHandler): def get(self): self.render("builders/new.html") @@ -56,7 +56,7 @@ class BuilderNewHandler(BaseHandler): passphrase=passphrase) -class BuilderEditHandler(BaseHandler): +class BuilderEditHandler(base.BaseHandler): @tornado.web.authenticated def get(self, hostname): builder = self.pakfire.builders.get_by_name(hostname) @@ -93,7 +93,7 @@ class BuilderEditHandler(BaseHandler): self.redirect("/builder/%s" % builder.hostname) -class BuilderRenewPassphraseHandler(BaseHandler): +class BuilderRenewPassphraseHandler(base.BaseHandler): @tornado.web.authenticated def get(self, name): builder = self.pakfire.builders.get_by_name(name) @@ -104,7 +104,7 @@ class BuilderRenewPassphraseHandler(BaseHandler): passphrase=passphrase) -class BuilderDeleteHandler(BaseHandler): +class BuilderDeleteHandler(base.BaseHandler): @tornado.web.authenticated def get(self, name): builder = self.pakfire.builders.get_by_name(name) @@ -126,7 +126,7 @@ class BuilderDeleteHandler(BaseHandler): self.render("builders/delete.html", builder=builder) -class BuilderStatusChangeHandler(BaseHandler): +class BuilderStatusChangeHandler(base.BaseHandler): enabled = None @tornado.web.authenticated diff --git a/src/web/handlers_builds.py b/src/web/handlers_builds.py index 8a4ea62f..c11a162b 100644 --- a/src/web/handlers_builds.py +++ b/src/web/handlers_builds.py @@ -2,9 +2,9 @@ import tornado.web -from .handlers_base import BaseHandler +from . import base -class BuildsHandler(BaseHandler): +class BuildsHandler(base.BaseHandler): def get(self): limit = self.get_argument("limit", None) try: @@ -23,7 +23,7 @@ class BuildsHandler(BaseHandler): self.render("build-index.html", builds=builds) -class BuildBaseHandler(BaseHandler): +class BuildBaseHandler(base.BaseHandler): def get_build(self, uuid): build = self.pakfire.builds.get_by_uuid(uuid) if not build: @@ -76,7 +76,7 @@ class BuildDeleteHandler(BuildBaseHandler): self.render("build-delete.html", build=build) -class BuildBugsHandler(BaseHandler): +class BuildBugsHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uuid): build = self.pakfire.builds.get_by_uuid(uuid) @@ -133,7 +133,7 @@ class BuildBugsHandler(BaseHandler): self.redirect("/build/%s/bugs" % build.uuid) -class BuildsCommentsHandler(BaseHandler): +class BuildsCommentsHandler(base.BaseHandler): def get(self, user_name=None): user = None if user_name: @@ -164,7 +164,7 @@ class BuildsCommentsHandler(BaseHandler): offset=offset + limit, user=user, have_prev=have_prev, have_next=have_next) -class BuildStateHandler(BaseHandler): +class BuildStateHandler(base.BaseHandler): def get(self, uuid): build = self.pakfire.builds.get_by_uuid(uuid) if not build: @@ -201,13 +201,13 @@ class BuildStateHandler(BaseHandler): self.redirect("/build/%s" % build.uuid) -class BuildQueueHandler(BaseHandler): +class BuildQueueHandler(base.BaseHandler): def get(self): self.render("build-queue.html", jobs=self.backend.jobqueue, average_waiting_time=self.backend.jobqueue.average_waiting_time) -class BuildDetailCommentHandler(BaseHandler): +class BuildDetailCommentHandler(base.BaseHandler): @tornado.web.authenticated def post(self, uuid): build = self.pakfire.builds.get_by_uuid(uuid) @@ -234,7 +234,7 @@ class BuildDetailCommentHandler(BaseHandler): self.redirect("/build/%s" % build.uuid) -class BuildManageHandler(BaseHandler): +class BuildManageHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uuid): build = self.pakfire.builds.get_by_uuid(uuid) @@ -291,7 +291,7 @@ class BuildManageHandler(BaseHandler): self.redirect("/build/%s" % build.uuid) -class BuildPriorityHandler(BaseHandler): +class BuildPriorityHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uuid): build = self.pakfire.builds.get_by_uuid(uuid) @@ -326,7 +326,7 @@ class BuildPriorityHandler(BaseHandler): self.redirect("/build/%s" % build.uuid) -class BuildWatchersHandler(BaseHandler): +class BuildWatchersHandler(base.BaseHandler): def get(self, uuid): build = self.pakfire.builds.get_by_uuid(uuid) @@ -340,7 +340,7 @@ class BuildWatchersHandler(BaseHandler): self.render("builds-watchers-list.html", build=build, watchers=watchers) -class BuildWatchersAddHandler(BaseHandler): +class BuildWatchersAddHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uuid, error_msg=None): build = self.pakfire.builds.get_by_uuid(uuid) @@ -382,7 +382,7 @@ class BuildWatchersAddHandler(BaseHandler): self.redirect("/build/%s" % build.uuid) -class BuildListHandler(BaseHandler): +class BuildListHandler(base.BaseHandler): def get(self): builder = self.get_argument("builder", None) state = self.get_argument("state", None) @@ -393,7 +393,7 @@ class BuildListHandler(BaseHandler): self.render("build-list.html", builds=builds) -class BuildFilterHandler(BaseHandler): +class BuildFilterHandler(base.BaseHandler): def get(self): builders = self.pakfire.builders.get_all() distros = self.pakfire.distros.get_all() diff --git a/src/web/handlers_distro.py b/src/web/handlers_distro.py index 8b814877..5c8ac881 100644 --- a/src/web/handlers_distro.py +++ b/src/web/handlers_distro.py @@ -1,13 +1,15 @@ #!/usr/bin/python -from .handlers_base import * +import tornado.web -class DistributionListHandler(BaseHandler): +from . import base + +class DistributionListHandler(base.BaseHandler): def get(self): self.render("distro-list.html", distros=self.backend.distros) -class DistributionDetailHandler(BaseHandler): +class DistributionDetailHandler(base.BaseHandler): def get(self, name): distro = self.pakfire.distros.get_by_name(name) if not distro: @@ -16,7 +18,7 @@ class DistributionDetailHandler(BaseHandler): self.render("distro-detail.html", distro=distro) -class DistributionEditHandler(BaseHandler): +class DistributionEditHandler(base.BaseHandler): def prepare(self): self.sources = self.pakfire.sources.get_all() @@ -65,7 +67,7 @@ class DistributionEditHandler(BaseHandler): self.redirect("/distribution/%s" % distro.sname) -class DistroSourceDetailHandler(BaseHandler): +class DistroSourceDetailHandler(base.BaseHandler): def get(self, distro_ident, source_ident): distro = self.pakfire.distros.get_by_name(distro_ident) if not distro: @@ -83,7 +85,7 @@ class DistroSourceDetailHandler(BaseHandler): commits=commits) -class DistroSourceCommitsHandler(BaseHandler): +class DistroSourceCommitsHandler(base.BaseHandler): def get(self, distro_ident, source_ident): distro = self.pakfire.distros.get_by_name(distro_ident) if not distro: @@ -112,7 +114,7 @@ class DistroSourceCommitsHandler(BaseHandler): commits=commits, limit=limit, offset=offset, number=50) -class DistroSourceCommitDetailHandler(BaseHandler): +class DistroSourceCommitDetailHandler(base.BaseHandler): def get(self, distro_ident, source_ident, commit_ident): distro = self.pakfire.distros.get_by_name(distro_ident) if not distro: @@ -132,7 +134,7 @@ class DistroSourceCommitDetailHandler(BaseHandler): source=source, commit=commit) -class DistroSourceCommitResetHandler(BaseHandler): +class DistroSourceCommitResetHandler(base.BaseHandler): @tornado.web.authenticated def get(self, distro_ident, source_ident, commit_ident): distro = self.pakfire.distros.get_by_name(distro_ident) @@ -164,7 +166,7 @@ class DistroSourceCommitResetHandler(BaseHandler): source=source, commit=commit) -class DistroUpdateCreateHandler(BaseHandler): +class DistroUpdateCreateHandler(base.BaseHandler): def get(self, distro_ident): distro = self.pakfire.distros.get_by_name(distro_ident) if not distro: @@ -182,7 +184,7 @@ class DistroUpdateCreateHandler(BaseHandler): distro=distro, builds=builds) -class DistroUpdateDetailHandler(BaseHandler): +class DistroUpdateDetailHandler(base.BaseHandler): def get(self, distro_ident, year, num): distro = self.pakfire.distros.get_by_name(distro_ident) if not distro: @@ -196,14 +198,14 @@ class DistroUpdateDetailHandler(BaseHandler): update=update, repo=update.repo, user=update.user) # XXX currently unused -class SourceListHandler(BaseHandler): +class SourceListHandler(base.BaseHandler): def get(self): sources = self.pakfire.sources.get_all() self.render("source-list.html", sources=sources) -class SourceDetailHandler(BaseHandler): +class SourceDetailHandler(base.BaseHandler): def get(self, id): source = self.pakfire.sources.get_by_id(id) diff --git a/src/web/handlers_jobs.py b/src/web/handlers_jobs.py index 41192914..f3f016cf 100644 --- a/src/web/handlers_jobs.py +++ b/src/web/handlers_jobs.py @@ -2,9 +2,9 @@ import tornado.web -from .handlers_base import BaseHandler +from . import base -class JobsIndexHandler(BaseHandler): +class JobsIndexHandler(base.BaseHandler): def get(self): # Filter for a certain arch. arch = self.get_argument("arch", None) @@ -29,14 +29,14 @@ class JobsIndexHandler(BaseHandler): date=date) -class JobsFilterHandler(BaseHandler): +class JobsFilterHandler(base.BaseHandler): def get(self): builders = self.pakfire.builders.get_all() self.render("jobs-filter.html", arches=self.backend.arches, builders=builders) -class JobDetailHandler(BaseHandler): +class JobDetailHandler(base.BaseHandler): def get(self, uuid): job = self.pakfire.jobs.get_by_uuid(uuid) if not job: @@ -48,7 +48,7 @@ class JobDetailHandler(BaseHandler): self.render("jobs-detail.html", job=job, build=job.build, log=log) -class JobBuildrootHandler(BaseHandler): +class JobBuildrootHandler(base.BaseHandler): def get(self, uuid): job = self.pakfire.jobs.get_by_uuid(uuid) if not job: @@ -70,7 +70,7 @@ class JobBuildrootHandler(BaseHandler): buildroot_size=buildroot_size) -class JobScheduleHandler(BaseHandler): +class JobScheduleHandler(base.BaseHandler): allowed_types = ("test", "rebuild",) @tornado.web.authenticated @@ -110,7 +110,7 @@ class JobScheduleHandler(BaseHandler): self.redirect("/job/%s" % job.uuid) -class JobAbortHandler(BaseHandler): +class JobAbortHandler(base.BaseHandler): def get_job(self, uuid): job = self.pakfire.jobs.get_by_uuid(uuid) if not job: diff --git a/src/web/handlers_keys.py b/src/web/handlers_keys.py index cb52f777..99b9442d 100644 --- a/src/web/handlers_keys.py +++ b/src/web/handlers_keys.py @@ -2,9 +2,9 @@ import tornado.web -from .handlers_base import BaseHandler +from . import base -class KeysActionHandler(BaseHandler): +class KeysActionHandler(base.BaseHandler): def prepare(self): if not self.current_user.has_perm("manage_keys"): raise tornado.web.HTTPError(403) @@ -41,14 +41,14 @@ class KeysDeleteHandler(KeysActionHandler): self.render("keys-delete.html", key=key) -class KeysListHandler(BaseHandler): +class KeysListHandler(base.BaseHandler): def get(self): keys = self.pakfire.keys.get_all() self.render("keys-list.html", keys=keys) -class KeysDownloadHandler(BaseHandler): +class KeysDownloadHandler(base.BaseHandler): def get(self, fingerprint): key = self.pakfire.keys.get_by_fpr(fingerprint) if not key: diff --git a/src/web/handlers_packages.py b/src/web/handlers_packages.py index 9a4cbb84..8c0344af 100644 --- a/src/web/handlers_packages.py +++ b/src/web/handlers_packages.py @@ -4,11 +4,11 @@ import mimetypes import os.path import tornado.web -from .handlers_base import BaseHandler +from . import base from ..constants import BUFFER_SIZE -class PackageIDDetailHandler(BaseHandler): +class PackageIDDetailHandler(base.BaseHandler): def get(self, id): package = self.packages.get_by_id(id) if not package: @@ -17,7 +17,7 @@ class PackageIDDetailHandler(BaseHandler): self.render("package-detail.html", package=package) -class PackageListHandler(BaseHandler): +class PackageListHandler(base.BaseHandler): def get(self): packages = {} @@ -48,7 +48,7 @@ class PackageListHandler(BaseHandler): self.render("packages-list.html", packages=packages) -class PackageNameHandler(BaseHandler): +class PackageNameHandler(base.BaseHandler): def get(self, name): builds = self.pakfire.builds.get_active_builds(name) if not builds: @@ -64,7 +64,7 @@ class PackageNameHandler(BaseHandler): latest_build=latest_build, pkg=latest_build.pkg, bugs=bugs) -class PackageScratchBuildsHandler(BaseHandler): +class PackageScratchBuildsHandler(base.BaseHandler): def get(self, name): offset = self.get_argument("offset", 0) limit = self.get_argument("limit", 10) @@ -85,7 +85,7 @@ class PackageScratchBuildsHandler(BaseHandler): pkg=latest_build.pkg) -class PackageChangelogHandler(BaseHandler): +class PackageChangelogHandler(base.BaseHandler): def get(self, name): limit = self.get_argument("limit", 10) try: @@ -120,7 +120,7 @@ class PackageChangelogHandler(BaseHandler): limit=limit, offset=offset, have_prev=have_prev, have_next=have_next) -class PackageDetailHandler(BaseHandler): +class PackageDetailHandler(base.BaseHandler): def get(self, uuid): pkg = self.pakfire.packages.get_by_uuid(uuid) if not pkg: @@ -146,7 +146,7 @@ class PackageDetailHandler(BaseHandler): self.render("package-detail.html", pkg=pkg) -class PackagePropertiesHandler(BaseHandler): +class PackagePropertiesHandler(base.BaseHandler): @tornado.web.authenticated def get(self, name): build = self.pakfire.builds.get_latest_by_name(name) @@ -182,7 +182,7 @@ class PackagePropertiesHandler(BaseHandler): build.pkg.update_property("critical_path", critical_path) -class PackageFileDownloadHandler(BaseHandler): +class PackageFileDownloadHandler(base.BaseHandler): def get_file(self, pkg_uuid, filename): # Fetch package. pkg = self.pakfire.packages.get_by_uuid(pkg_uuid) @@ -244,7 +244,7 @@ class PackageFileViewHandler(PackageFileDownloadHandler): mimetype=mimetype, content=content, filesize=f.size) -class PackageBuildsTimesHandler(BaseHandler): +class PackageBuildsTimesHandler(base.BaseHandler): def get(self, name): latest_build = self.pakfire.builds.get_latest_by_name(name) diff --git a/src/web/handlers_search.py b/src/web/handlers_search.py index 6af32418..c1a556be 100644 --- a/src/web/handlers_search.py +++ b/src/web/handlers_search.py @@ -2,9 +2,9 @@ import re -from .handlers_base import * +from . import base -class SearchHandler(BaseHandler): +class SearchHandler(base.BaseHandler): def get(self): pattern = self.get_argument("q", "") if not pattern: diff --git a/src/web/handlers_updates.py b/src/web/handlers_updates.py index 3eb919ff..0e1b7a78 100644 --- a/src/web/handlers_updates.py +++ b/src/web/handlers_updates.py @@ -2,8 +2,8 @@ import tornado.web -from .handlers_base import BaseHandler +from . import base -class UpdatesHandler(BaseHandler): +class UpdatesHandler(base.BaseHandler): def get(self): self.render("updates-index.html") diff --git a/src/web/handlers_users.py b/src/web/handlers_users.py index 1064b1c9..3a8fc280 100644 --- a/src/web/handlers_users.py +++ b/src/web/handlers_users.py @@ -5,9 +5,9 @@ import datetime import tornado.locale import tornado.web -from .handlers_base import * +from . import base -class UserHandler(BaseHandler): +class UserHandler(base.BaseHandler): @tornado.web.authenticated def get(self, name=None): user = self.current_user @@ -20,7 +20,7 @@ class UserHandler(BaseHandler): self.render("user-profile.html", user=user) -class UserImpersonateHandler(BaseHandler): +class UserImpersonateHandler(base.BaseHandler): @tornado.web.authenticated def get(self, username): # You must be an admin to do this. @@ -51,7 +51,7 @@ class UserImpersonateHandler(BaseHandler): self.redirect("/") -class UserActionHandler(BaseHandler): +class UserActionHandler(base.BaseHandler): def get_user(self, name): user = self.pakfire.users.get_by_name(name) if not user: @@ -63,7 +63,7 @@ class UserActionHandler(BaseHandler): return user -class UserDeleteHandler(BaseHandler): +class UserDeleteHandler(base.BaseHandler): @tornado.web.authenticated def get(self, name): user = self.get_user(name) @@ -129,7 +129,7 @@ class UserPasswdHandler(UserActionHandler): self.render("user-profile-passwd-ok.html", user=user) -class UserEditHandler(BaseHandler): +class UserEditHandler(base.BaseHandler): @tornado.web.authenticated def get(self, name): user = self.pakfire.users.get_by_name(name) @@ -199,13 +199,13 @@ class UserEditHandler(BaseHandler): self.redirect("/user/%s" % user.name) -class UsersHandler(BaseHandler): +class UsersHandler(base.BaseHandler): @tornado.web.authenticated def get(self): self.render("user-list.html", users=self.backend.users) -class UsersBuildsHandler(BaseHandler): +class UsersBuildsHandler(base.BaseHandler): def get(self, name=None): if name is None: user = self.current_user diff --git a/src/web/mirrors.py b/src/web/mirrors.py index b684fbd4..b4f1aecc 100644 --- a/src/web/mirrors.py +++ b/src/web/mirrors.py @@ -4,15 +4,15 @@ import tornado.web from .. import mirrors -from .handlers_base import BaseHandler +from . import base -class MirrorListHandler(BaseHandler): +class MirrorListHandler(base.BaseHandler): def get(self): self.render("mirrors/list.html", mirrors=self.backend.mirrors, log=self.backend.mirrors.get_history(limit=5)) -class MirrorDetailHandler(BaseHandler): +class MirrorDetailHandler(base.BaseHandler): def get(self, hostname): mirror = self.backend.mirrors.get_by_hostname(hostname) if not mirror: @@ -23,7 +23,7 @@ class MirrorDetailHandler(BaseHandler): self.render("mirrors/detail.html", mirror=mirror, log=log) -class MirrorActionHandler(BaseHandler): +class MirrorActionHandler(base.BaseHandler): """ A handler that makes sure if the user has got sufficent rights to do actions.