web: Rename base module

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

diff --git a/Makefile.am b/Makefile.am
index fa25988933a1ad65a39d8e85b45bcd42a7274a27..83d55e0f5061111e14dff25028f9181a9bc090dd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,10 +75,10 @@ backenddir = $(pythondir)/ipfire
 web_PYTHON = \
        src/web/__init__.py \
        src/web/auth.py \
+       src/web/base.py \
        src/web/blog.py \
        src/web/download.py \
        src/web/handlers.py \
-       src/web/handlers_base.py \
        src/web/handlers_boot.py \
        src/web/handlers_fireinfo.py \
        src/web/handlers_iuse.py \

diff --git a/src/web/auth.py b/src/web/auth.py
index 87cbae04667aad5be57ee0a9ca03970f6d55ee99..bf481d971c16f127d615378b39e711f35a9eb744 100644 (file)
--- a/src/web/auth.py
+++ b/src/web/auth.py
@@ -3,7 +3,7 @@
 import logging
 import tornado.web
 
-from . import handlers_base as base
+from . import base
 
 class AuthenticationMixin(object):
        def login(self, username, password):

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

diff --git a/src/web/blog.py b/src/web/blog.py
index e02b1afdd873fcf51eee8523725ecb395b4242f9..23f900a60e5dde3b760226da01382da267da6e9b 100644 (file)
--- a/src/web/blog.py
+++ b/src/web/blog.py
@@ -4,9 +4,8 @@ import datetime
 import email.utils
 import tornado.web
 
-from . import handlers_base as base
-
 from . import auth
+from . import base
 from . import ui_modules
 
 class IndexHandler(auth.CacheMixin, base.BaseHandler):

diff --git a/src/web/download.py b/src/web/download.py
index 7b041a3f8aa6e7009d2d10e9235c42b7a6f8e6a7..0941c256d3438f9474d4666f4dd44c0372bf3c4f 100644 (file)
--- a/src/web/download.py
+++ b/src/web/download.py
@@ -3,8 +3,7 @@
 import random
 import tornado.web
 
-from . import handlers_base as base
-
+from . import base
 from . import ui_modules
 
 class IndexHandler(base.BaseHandler):

diff --git a/src/web/handlers.py b/src/web/handlers.py
index ba6023583b11fd0c1e9edfb9e891f874ba419119..2aacd35813a672541a5cf8d4c0a798de6f7b4895 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -16,7 +16,8 @@ import tornado.gen
 import tornado.web
 #import unicodedata
 
-from .handlers_base import *
+from . import base
+
 from .handlers_boot import *
 from .handlers_fireinfo import *
 from .handlers_iuse import *

diff --git a/src/web/handlers_boot.py b/src/web/handlers_boot.py
index 14a1568c523572c1a2ea73e940b1d1eca3891e6a..0c91db00c16a67f8699396c3c12f5858c8d8639f 100644 (file)
--- a/src/web/handlers_boot.py
+++ b/src/web/handlers_boot.py
@@ -8,7 +8,7 @@ import tornado.locale
 import tornado.options
 import tornado.web
 
-from .handlers_base import BaseHandler
+from . import base
 
 BASEDIR = os.path.dirname(__file__)
 
@@ -27,7 +27,7 @@ def word_wrap(s, width=45):
                lines.append(paragraph.lstrip())
        return '\n'.join(lines)
 
-class BootBaseHandler(BaseHandler):
+class BootBaseHandler(base.BaseHandler):
        @property
        def arch(self):
                arch = self.get_argument("arch", "i386")

diff --git a/src/web/handlers_fireinfo.py b/src/web/handlers_fireinfo.py
index 72c0e6e7665433897d0da30f5c120a3842fd237b..12c417ea4d29cbda4cbff791be18a0e6d35cd665 100644 (file)
--- a/src/web/handlers_fireinfo.py
+++ b/src/web/handlers_fireinfo.py
@@ -11,9 +11,9 @@ import tornado.web
 
 from .. import fireinfo
 
-from .handlers_base import *
+from . import base
 
-class FireinfoBaseHandler(BaseHandler):
+class FireinfoBaseHandler(base.BaseHandler):
        def cut_string(self, s, limit=15):
                if len(s) > limit:
                        s = s[:limit] + "..."

diff --git a/src/web/handlers_iuse.py b/src/web/handlers_iuse.py
index 0c9643711f314e7c0e072a1ec3e26bee88d1009d..41f968704713188bec9f0c0994bcf8d8b5e23740 100644 (file)
--- a/src/web/handlers_iuse.py
+++ b/src/web/handlers_iuse.py
@@ -6,9 +6,9 @@ import os
 import random
 import tornado.web
 
-from .handlers_base import *
+from . import base
 
-class IUseImage(BaseHandler):
+class IUseImage(base.BaseHandler):
        expires = 3600 * 3
 
        def write_error(self, status_code, **kwargs):

diff --git a/src/web/handlers_mirrors.py b/src/web/handlers_mirrors.py
index 6ad81daea1505c48a3ca501d5ce58b8c8c9d290e..b26abf05bcc01095b5d25666435836e4f9f53b3e 100644 (file)
--- a/src/web/handlers_mirrors.py
+++ b/src/web/handlers_mirrors.py
@@ -3,9 +3,9 @@
 import socket
 import tornado.web
 
-from .handlers_base import *
+from . import base
 
-class MirrorIndexHandler(BaseHandler):
+class MirrorIndexHandler(base.BaseHandler):
        def get(self):
                ip_addr = self.get_argument("addr", None)
                if not ip_addr:
@@ -23,7 +23,7 @@ class MirrorIndexHandler(BaseHandler):
                        preferred_mirrors=preferred_mirrors, mirrors=mirrors)
 
 
-class MirrorItemHandler(BaseHandler):
+class MirrorItemHandler(base.BaseHandler):
        def get(self, what):
                mirror = self.mirrors.get_by_hostname(what)
                if not mirror:
@@ -42,16 +42,16 @@ class MirrorItemHandler(BaseHandler):
                self.render("mirrors-item.html", item=mirror, client_distance=client_distance)
 
 
-class MirrorHandler(BaseHandler):
+class MirrorHandler(base.BaseHandler):
        def get(self):
                self.redirect("mirrors/all")
 
 
-class MirrorAllHandler(BaseHandler):
+class MirrorAllHandler(base.BaseHandler):
        def get(self):
                self.render("downloads-mirrors.html", mirrors=self.mirrors.list())
 
 
-class MirrorDetailHandler(BaseHandler):
+class MirrorDetailHandler(base.BaseHandler):
        def get(self, id):
                self.render("download-mirror-detail.html", mirror=self.mirrors.get(id))

diff --git a/src/web/location.py b/src/web/location.py
index ecac92b01d4b81ddd2c720720348c4321a427061..977a59f07394b7e2f3ef252fcda682a84acb9c84 100644 (file)
--- a/src/web/location.py
+++ b/src/web/location.py
@@ -5,7 +5,7 @@ import logging
 import tornado.gen
 import tornado.web
 
-from . import handlers_base as base
+from . import base
 
 class IndexHandler(base.BaseHandler):
        def get(self):

diff --git a/src/web/newsletter.py b/src/web/newsletter.py
index a88b7a876c5010bd0eb0bbd31d0dd23265f2cf9c..49b9ca7fdbe80d0ec107f60543f6fd302142d321 100644 (file)
--- a/src/web/newsletter.py
+++ b/src/web/newsletter.py
@@ -5,7 +5,7 @@ import logging
 import tornado.gen
 import tornado.process
 
-from . import handlers_base as base
+from . import base
 
 class SubscribeHandler(base.BaseHandler):
        @tornado.gen.coroutine

diff --git a/src/web/nopaste.py b/src/web/nopaste.py
index 0f8a92e63be68a87b52b71156113e70cd4eb4fc8..8a7784ef1c09b22d43d0c23e839b0bb43e7583b5 100644 (file)
--- a/src/web/nopaste.py
+++ b/src/web/nopaste.py
@@ -3,7 +3,7 @@
 import tornado.web
 
 from . import auth
-from . import handlers_base as base
+from . import base
 from . import ui_modules
 
 class CreateHandler(base.BaseHandler):

diff --git a/src/web/people.py b/src/web/people.py
index cd6e932f0519bb9765beaf0e45ecb945cd5f911c..7eb2d06242f7358f21438b9a709a37a63378fcbc 100644 (file)
--- a/src/web/people.py
+++ b/src/web/people.py
@@ -7,7 +7,7 @@ import sshpubkeys
 import tornado.web
 
 from . import auth
-from . import handlers_base as base
+from . import base
 from . import ui_modules
 
 class IndexHandler(auth.CacheMixin, base.BaseHandler):