From 9e40c296f8d18b7a37db7e80c6fe5956a7d1839c Mon Sep 17 00:00:00 2001
From: Peer Wagner <wagnerpeer@gmail.com>
Date: Sun, 9 Jun 2019 21:40:42 +0200
Subject: [PATCH] Clean up based on pylint output

---
 park_vorhersage/__init__.py  | 18 +++++++++---------
 park_vorhersage/controler.py |  5 +----
 park_vorhersage/storage.py   |  9 ++++++++-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/park_vorhersage/__init__.py b/park_vorhersage/__init__.py
index 88413e0..47107aa 100644
--- a/park_vorhersage/__init__.py
+++ b/park_vorhersage/__init__.py
@@ -6,13 +6,19 @@
 Define basic logging format and the sqlalchemy session to be used throughout
 the package.
 """
+__all__ = []
+
 import logging
 import logging.config
 
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
+from . import controler
+from .controler import *
+from . import storage
+from .storage import *
+
+__all__ += controler.__all__
+__all__ += storage.__all__
 
-__all__ = ["Session"]
 
 LOGGING_CONFIGURATION = {
     "version": 1,
@@ -36,9 +42,3 @@
 }
 
 logging.config.dictConfig(LOGGING_CONFIGURATION)
-
-_engine = create_engine("sqlite:///opg.db", echo=True)
-
-Session = sessionmaker(bind=_engine)
-
-from .controler import *
diff --git a/park_vorhersage/controler.py b/park_vorhersage/controler.py
index e0d2c55..a17f904 100644
--- a/park_vorhersage/controler.py
+++ b/park_vorhersage/controler.py
@@ -9,10 +9,7 @@
 """
 __all__ = ["init", "scrape_and_store"]
 
-
-from . import Session
-
-from .storage import Base, Capacity, ParkingRamp, store
+from .storage import Base, Session, store
 from .scraper import scrape
 
 
diff --git a/park_vorhersage/storage.py b/park_vorhersage/storage.py
index 23480bf..58104f6 100644
--- a/park_vorhersage/storage.py
+++ b/park_vorhersage/storage.py
@@ -6,11 +6,18 @@
 Module is used to define a database schema to hold general parking ramp
 information and details about their capacity using sqlalchemy.
 """
+__all__ = ["Capacity", "ParkingRamp", "Session"]
+
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.orm import relationship
 
-from . import Session
+_ENGINE = create_engine("sqlite:///opg.db", echo=True)
+
+Session = sessionmaker(bind=_ENGINE)
 
 Base = declarative_base()