From 124a8404e3b6d4b195d789543c3a8f214ff42b98 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 26 Oct 2018 17:40:49 +0100 Subject: [PATCH] web: Rename base module Signed-off-by: Michael Tremer --- Makefile.am | 2 +- src/web/auth.py | 2 +- src/web/{handlers_base.py => base.py} | 0 src/web/blog.py | 3 +-- src/web/download.py | 3 +-- src/web/handlers.py | 3 ++- src/web/handlers_boot.py | 4 ++-- src/web/handlers_fireinfo.py | 4 ++-- src/web/handlers_iuse.py | 4 ++-- src/web/handlers_mirrors.py | 12 ++++++------ src/web/location.py | 2 +- src/web/newsletter.py | 2 +- src/web/nopaste.py | 2 +- src/web/people.py | 2 +- 14 files changed, 22 insertions(+), 23 deletions(-) rename src/web/{handlers_base.py => base.py} (100%) diff --git a/Makefile.am b/Makefile.am index fa259889..83d55e0f 100644 --- 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 87cbae04..bf481d97 100644 --- 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 e02b1afd..23f900a6 100644 --- 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 7b041a3f..0941c256 100644 --- 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 ba602358..2aacd358 100644 --- 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 14a1568c..0c91db00 100644 --- 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 72c0e6e7..12c417ea 100644 --- 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 0c964371..41f96870 100644 --- 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 6ad81dae..b26abf05 100644 --- 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 ecac92b0..977a59f0 100644 --- 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 a88b7a87..49b9ca7f 100644 --- 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 0f8a92e6..8a7784ef 100644 --- 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 cd6e932f..7eb2d062 100644 --- 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): -- 2.47.2