From df6180a58fc12d52b6ca0c9dcea384ced71369e5 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 18 Jul 2018 19:00:11 +0100
Subject: [PATCH] web: Don't include * from ui_modules

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/web/__init__.py | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/web/__init__.py b/src/web/__init__.py
index d0189fa9..3475b9a4 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -9,10 +9,10 @@ import tornado.web
 import ipfire
 
 from handlers import *
-from ui_modules import *
 
 from . import blog
 from . import location
+from . import ui_modules
 
 BASEDIR = os.path.join(os.path.dirname(__file__), "..")
 
@@ -40,7 +40,7 @@ class Application(tornado.web.Application):
 				"format_month_name" : self.format_month_name,
 			},
 			"ui_modules" : {
-				"Menu"                 : MenuModule,
+				"Menu"                 : ui_modules.MenuModule,
 
 				# Blog
 				"BlogHistoryNavigation": blog.HistoryNavigationModule,
@@ -49,26 +49,26 @@ class Application(tornado.web.Application):
 				"BlogPosts"            : blog.PostsModule,
 
 				# Location
-				"Map"                  : MapModule,
+				"Map"                  : ui_modules.MapModule,
 
 				# Old modules
-				"DownloadButton"       : DownloadButtonModule,
-				"LanguageName"         : LanguageNameModule,
-
-				"MirrorItem"           : MirrorItemModule,
-				"MirrorsTable"         : MirrorsTableModule,
-				"NetBootMenuConfig"    : NetBootMenuConfigModule,
-				"NetBootMenuHeader"    : NetBootMenuHeaderModule,
-				"NetBootMenuSeparator" : NetBootMenuSeparatorModule,
-				"ProgressBar"          : ProgressBarModule,
-				"ReleaseItem"          : ReleaseItemModule,
-				"FireinfoDeviceTable"     : FireinfoDeviceTableModule,
-				"FireinfoDeviceAndGroupsTable" : FireinfoDeviceAndGroupsTableModule,
-				"FireinfoGeoTable"        : FireinfoGeoTableModule,
-				"TalkContact"          : TalkContactModule,
-				"TalkCallLog"          : TalkCallLogModule,
-				"TalkLines"            : TalkLinesModule,
-				"TalkOngoingCalls"     : TalkOngoingCallsModule,
+				"DownloadButton"       : ui_modules.DownloadButtonModule,
+				"LanguageName"         : ui_modules.LanguageNameModule,
+
+				"MirrorItem"           : ui_modules.MirrorItemModule,
+				"MirrorsTable"         : ui_modules.MirrorsTableModule,
+				"NetBootMenuConfig"    : ui_modules.NetBootMenuConfigModule,
+				"NetBootMenuHeader"    : ui_modules.NetBootMenuHeaderModule,
+				"NetBootMenuSeparator" : ui_modules.NetBootMenuSeparatorModule,
+				"ProgressBar"          : ui_modules.ProgressBarModule,
+				"ReleaseItem"          : ui_modules.ReleaseItemModule,
+				"FireinfoDeviceTable"  : ui_modules.FireinfoDeviceTableModule,
+				"FireinfoDeviceAndGroupsTable" : ui_modules.FireinfoDeviceAndGroupsTableModule,
+				"FireinfoGeoTable"        : ui_modules.FireinfoGeoTableModule,
+				"TalkContact"          : ui_modules.TalkContactModule,
+				"TalkCallLog"          : ui_modules.TalkCallLogModule,
+				"TalkLines"            : ui_modules.TalkLinesModule,
+				"TalkOngoingCalls"     : ui_modules.TalkOngoingCallsModule,
 			},
 
 			# Call this when a page wasn't found
-- 
2.39.2