backend: Move main class into __init__.py

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

diff --git a/Makefile.am b/Makefile.am
index 2f4983b703d45d6cadc406d6396297b8cbc1f65d..5d2d4d3f8beeb04df4d412cc17434a97b775607c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,7 +102,6 @@ westferry_backend_PYTHON = \
        src/westferry/backend/__version__.py \
        src/westferry/backend/base.py \
        src/westferry/backend/graphs.py \
-       src/westferry/backend/main.py \
        src/westferry/backend/system.py
 
 westferry_backenddir = $(pythondir)/westferry/backend

diff --git a/src/westferry/backend/__init__.py b/src/westferry/backend/__init__.py
index cad0eb38e8955442c05d2c21a0d0e73d11a4fc01..3e998363f543c85b470d31516116c9737a449087 100644 (file)
--- a/src/westferry/backend/__init__.py
+++ b/src/westferry/backend/__init__.py
@@ -19,4 +19,16 @@
 #                                                                             #
 ###############################################################################
 
-from .main import Backend
+from .__version__ import VERSION
+
+from . import graphs
+from . import system
+
+class Backend(object):
+       version = VERSION
+
+       def __init__(self, debug=False):
+               self.debug = True
+
+               self.graphs = graphs.GraphsBackend(self)
+               self.system = system.SystemBackend(self)

diff --git a/src/westferry/backend/main.py b/src/westferry/backend/main.py
deleted file mode 100644 (file)
index fa05a13..0000000
--- a/src/westferry/backend/main.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/python3
-###############################################################################
-#                                                                             #
-# Westferry - The IPFire web user interface                                   #
-# Copyright (C) 2015 IPFire development team                                  #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-from .__version__ import VERSION
-
-from . import graphs
-from . import system
-
-class Backend(object):
-       version = VERSION
-
-       def __init__(self):
-               self.graphs = graphs.GraphsBackend(self)
-               self.system = system.SystemBackend(self)