web: Rename handlers_accounts.py -> accounts.py

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

diff --git a/Makefile.am b/Makefile.am
index a6a7a264c6bd3705457a485a9d064b447dcbfe5b..5b13675cfc12e5aa9dc428522f1152afd0cd5a2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,11 +75,11 @@ backenddir = $(pythondir)/ipfire
 
 web_PYTHON = \
        src/web/__init__.py \
+       src/web/accounts.py \
        src/web/auth.py \
        src/web/blog.py \
        src/web/download.py \
        src/web/handlers.py \
-       src/web/handlers_accounts.py \
        src/web/handlers_admin.py \
        src/web/handlers_base.py \
        src/web/handlers_boot.py \

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 1ed253978978efe99d8dd102f8607ae1d10ea7ff..97a50dec41a19717099b5f5c88d4a1e879f96827 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -11,6 +11,7 @@ import ipfire
 
 from .handlers import *
 
+from . import accounts
 from . import auth
 from . import blog
 from . import download
@@ -253,7 +254,7 @@ class Application(tornado.web.Application):
 
                # accounts.ipfire.org
                self.add_handlers(r"accounts(\.dev)?\.ipfire\.org", [
-                       (r"/avatar/(\w+)\.jpg", AccountsAvatarHandler),
+                       (r"/avatar/(\w+)\.jpg", accounts.AvatarHandler),
                ])
 
                # admin.ipfire.org

diff --git a/src/web/handlers_accounts.py b/src/web/accounts.py
similarity index 95%
rename from src/web/handlers_accounts.py
rename to src/web/accounts.py
index 1560eee6e2aab059c532fab65a07eed51e8695fa..105255fec8350ddfdb6eea1c0335d28075e7e222 100644 (file)
--- a/src/web/handlers_accounts.py
+++ b/src/web/accounts.py
@@ -5,7 +5,7 @@ import tornado.web
 
 from . import handlers_base as base
 
-class AccountsAvatarHandler(base.BaseHandler):
+class AvatarHandler(base.BaseHandler):
        def get(self, who):
                # Get the desired size of the avatar file
                size = self.get_argument("size", 0)

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 046d96cc07ca84299030873bf3375bc28833a0cc..d2aa3ae7ffbf619f35d40122af61a7be477fe455 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -16,7 +16,6 @@ import tornado.gen
 import tornado.web
 #import unicodedata
 
-from .handlers_accounts import *
 from .handlers_admin import *
 from .handlers_base import *
 from .handlers_boot import *