Rename web/handlers_keys.py -> web/keys.py

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

diff --git a/Makefile.am b/Makefile.am
index 6ed150b8285ad4bc20b2672508312f36aa1cff60..37790e7920a9719c0bb66433552017cb32428720 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,12 +132,12 @@ web_PYTHON = \
        src/web/errors.py \
        src/web/handlers.py \
        src/web/jobs.py \
-       src/web/handlers_keys.py \
+       src/web/keys.py \
+       src/web/mirrors.py \
        src/web/handlers_packages.py \
        src/web/handlers_search.py \
        src/web/handlers_updates.py \
        src/web/handlers_users.py \
-       src/web/mirrors.py \
        src/web/ui_modules.py
 
 webdir = $(buildservicedir)/web

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b2f27b3ab9703f53dda9331184e8f84d27e94226..0940547c15b2b771b629c495d5a12fd2e3063aa7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -165,10 +165,10 @@ src/web/base.py
 src/web/builders.py
 src/web/builds.py
 src/web/distributions.py
-src/web/mirrors.py
 src/web/handlers.py
 src/web/jobs.py
-src/web/handlers_keys.py
+src/web/keys.py
+src/web/mirrors.py
 src/web/handlers_packages.py
 src/web/handlers_search.py
 src/web/handlers_updates.py

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 18ddc8c2270fb4bbd86ca011d25468da5488c836..4ada5341ac9e88bfe0842f45927ca3b9788a2d83 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -22,6 +22,7 @@ from . import builds
 from . import distributions
 from . import errors
 from . import jobs
+from . import keys
 from . import mirrors
 from . import ui_modules
 
@@ -214,10 +215,10 @@ class Application(tornado.web.Application):
                        (r"/mirror/([\w\-\.]+)",                mirrors.MirrorDetailHandler),
 
                        # Key management
-                       (r"/keys", KeysListHandler),
-                       (r"/key/import", KeysImportHandler),
-                       (r"/key/([A-Z0-9]+)", KeysDownloadHandler),
-                       (r"/key/([A-Z0-9]+)/delete", KeysDeleteHandler),
+                       (r"/keys", keys.KeysListHandler),
+                       (r"/key/import", keys.KeysImportHandler),
+                       (r"/key/([A-Z0-9]+)", keys.KeysDownloadHandler),
+                       (r"/key/([A-Z0-9]+)/delete", keys.KeysDeleteHandler),
 
                        # Documents
                        (r"/documents", DocsIndexHandler),

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 1dd051fefc5e451f70ffb85691b8d47d0d02e5a1..34c522a6d9706f4f7bfaa57ec8bfc4d3ec884bce 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -5,8 +5,6 @@ import tornado.web
 
 from . import base
 
-from .handlers_jobs import *
-from .handlers_keys import *
 from .handlers_packages import *
 from .handlers_search import *
 from .handlers_updates import *

diff --git a/src/web/handlers_keys.py b/src/web/keys.py
similarity index 100%
rename from src/web/handlers_keys.py
rename to src/web/keys.py