Rename web/handlers_builders.py -> web/builders.py

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

diff --git a/Makefile.am b/Makefile.am
index 596edfe4564eec933c9a11a59f120b279b2bffb5..c008ead8aa3a90492eaecffa07e499eeefc7f3cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,9 +126,9 @@ web_PYTHON = \
        src/web/api.py \
        src/web/auth.py \
        src/web/base.py \
+       src/web/builders.py \
        src/web/errors.py \
        src/web/handlers.py \
-       src/web/handlers_builders.py \
        src/web/handlers_builds.py \
        src/web/handlers_distro.py \
        src/web/handlers_jobs.py \

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 86bed0061360e264502a7478ce99f4b6fe10f921..57cfeab8ef788b6160db6b5718d78c770900fa95 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -161,7 +161,6 @@ src/hub/__init__.py
 src/web/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
 src/web/handlers_jobs.py

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 27a5e0bc23e932b14b68892051e59c1456a69041..9f0e8b6ad6188bfda35d5231d12161da76ac8d2d 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -17,6 +17,7 @@ from .handlers import *
 
 from . import api
 from . import auth
+from . import builders
 from . import errors
 from . import mirrors
 from . import ui_modules
@@ -159,14 +160,14 @@ class Application(tornado.web.Application):
                        (r"/job/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/schedule", JobScheduleHandler),
 
                        # Builders
-                       (r"/builders", BuilderListHandler),
-                       (r"/builder/new", BuilderNewHandler),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/enable", BuilderEnableHander),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/disable", BuilderDisableHander),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/delete", BuilderDeleteHandler),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/edit", BuilderEditHandler),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/renew", BuilderRenewPassphraseHandler),
-                       (r"/builder/([A-Za-z0-9\-\.]+)", BuilderDetailHandler),
+                       (r"/builders", builders.BuilderListHandler),
+                       (r"/builder/new", builders.BuilderNewHandler),
+                       (r"/builder/([A-Za-z0-9\-\.]+)/enable", builders.BuilderEnableHander),
+                       (r"/builder/([A-Za-z0-9\-\.]+)/disable", builders.BuilderDisableHander),
+                       (r"/builder/([A-Za-z0-9\-\.]+)/delete", builders.BuilderDeleteHandler),
+                       (r"/builder/([A-Za-z0-9\-\.]+)/edit", builders.BuilderEditHandler),
+                       (r"/builder/([A-Za-z0-9\-\.]+)/renew", builders.BuilderRenewPassphraseHandler),
+                       (r"/builder/([A-Za-z0-9\-\.]+)", builders.BuilderDetailHandler),
 
                        # Distributions
                        (r"/distros", DistributionListHandler),

diff --git a/src/web/handlers_builders.py b/src/web/builders.py
similarity index 99%
rename from src/web/handlers_builders.py
rename to src/web/builders.py
index 3fa039091fd0bd54639cd5bcdd32d928fe984b1a..1de3a2adb90474f0a04d8e16cd0f50209017c463 100644 (file)
--- a/src/web/handlers_builders.py
+++ b/src/web/builders.py
@@ -2,8 +2,6 @@
 
 import tornado.web
 
-from .. import builders
-
 from . import base
 
 class BuilderListHandler(base.BaseHandler):

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 09928833aacae9bdc3b9d50733b690365de0a956..e8036b2e02eb89e805b32273ef32044c2e51735c 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -6,7 +6,6 @@ import tornado.web
 from . import base
 
 from .handlers_builds import *
-from .handlers_builders import *
 from .handlers_distro import *
 from .handlers_jobs import *
 from .handlers_keys import *