Rename web/handlers_users.py -> web/users.py

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

diff --git a/Makefile.am b/Makefile.am
index c0bd286d0ecc4fb288a113a27416959f2364612b..9a4965411db25ac550ceb8e2c2cb24cf5f19c96e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,7 +138,7 @@ web_PYTHON = \
        src/web/search.py \
        src/web/ui_modules.py \
        src/web/updates.py \
-       src/web/handlers_users.py
+       src/web/users.py
 
 webdir = $(buildservicedir)/web
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 05524749871e7d92a16c28a44db9dccf6831c1aa..b57938b333c1282a3179faedc76a0acca8897964 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -173,4 +173,4 @@ src/web/packages.py
 src/web/search.py
 src/web/ui_modules.py
 src/web/updates.py
-src/web/handlers_users.py
+src/web/users.py

diff --git a/src/web/__init__.py b/src/web/__init__.py
index cbcac730761db07f2bcd89d6c22a890fa0a20ad9..4cf457b227273b5890b9b379cbc5373dc709e1ea 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -26,6 +26,7 @@ from . import mirrors
 from . import packages
 from . import search
 from . import updates
+from . import users
 from .handlers import *
 
 from . import ui_modules
@@ -119,15 +120,15 @@ class Application(tornado.web.Application):
                        (r"/password-recovery", auth.PasswordRecoveryHandler),
 
                        # User profiles
-                       (r"/users", UsersHandler),
-                       (r"/user/(\w+)/impersonate", UserImpersonateHandler),
-                       (r"/user/(\w+)/passwd", UserPasswdHandler),
-                       (r"/user/(\w+)/delete", UserDeleteHandler),
-                       (r"/user/(\w+)/edit", UserEditHandler),
+                       (r"/users", users.UsersHandler),
+                       (r"/user/(\w+)/impersonate", users.UserImpersonateHandler),
+                       (r"/user/(\w+)/passwd", users.UserPasswdHandler),
+                       (r"/user/(\w+)/delete", users.UserDeleteHandler),
+                       (r"/user/(\w+)/edit", users.UserEditHandler),
                        (r"/user/(\w+)/activate", auth.ActivationHandler),
-                       (r"/user/(\w+)", UserHandler),
-                       (r"/profile", UserHandler),
-                       (r"/profile/builds", UsersBuildsHandler),
+                       (r"/user/(\w+)", users.UserHandler),
+                       (r"/profile", users.UserHandler),
+                       (r"/profile/builds", users.UsersBuildsHandler),
 
                        # Packages
                        (r"/packages", packages.PackageListHandler),
@@ -209,7 +210,7 @@ class Application(tornado.web.Application):
                                distributions.DistroUpdateDetailHandler),
 
                        # Updates
-                       (r"/updates", UpdatesHandler),
+                       (r"/updates", updates.UpdatesHandler),
 
                        # Mirrors
                        (r"/mirrors",                                   mirrors.MirrorListHandler),

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 582549961f1e07c1d40ba0eeb7dac048770db82d..35b2668be7b9a6600a4742ddbf9166b22eef4fef 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -5,8 +5,6 @@ import tornado.web
 
 from . import base
 
-from .handlers_users import *
-
 class IndexHandler(base.BaseHandler):
        def get(self):
                jobs = self.pakfire.jobs.get_active()

diff --git a/src/web/handlers_users.py b/src/web/users.py
similarity index 99%
rename from src/web/handlers_users.py
rename to src/web/users.py
index 3a8fc28095c91b1757086116c4e2ac8317df3fd5..0a2c2e74cfb52a9c3359ccb5cb960ffb4a96274a 100644 (file)
--- a/src/web/handlers_users.py
+++ b/src/web/users.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-import datetime
-
 import tornado.locale
 import tornado.web