Clean modules

deflex/config.py

@@ -17,8 +17,6 @@
 
 
 _loaded = False
-print('count')
 if not _loaded:
     init(paths=[os.path.dirname(__file__)])
     _loaded = True
-    print('load!!!!!!!!!')

deflex/main.py

@@ -17,9 +17,6 @@
 import time
 import traceback
 
-# oemof packages
-from oemof.tools import logger
-
 # internal modules
 import reegis.config as cfg
 from deflex import scenario_tools
@@ -65,7 +62,7 @@ def main(year, rmap, plot_graph=False):
 
     if not os.path.isdir(csv_path):
         fn = basic_scenario.create_basic_scenario(year, path=path,
-                                                         csv_dir=csv_dir)
+                                                  csv_dir=csv_dir)
         if csv_path != fn.csv:
             msg = ("\n{0}\n{1}\nThe wrong path is checked. This will recreate "
                    "the scenario every time!".format(csv_path, fn.csv))
@@ -117,9 +114,8 @@ def main_secure(year, rmap, plot_graph=False):
     --------
     >>> main_secure(2014, 'de21', False)  # doctest: +SKIP
     """
-    cfg.tmp_set('init', 'map', rmap)
     try:
-        main(year, plot_graph=plot_graph)
+        main(year, rmap, plot_graph=plot_graph)
     except Exception as e:
         logging.error(traceback.format_exc())
         time.sleep(0.5)

deflex/powerplants.py

@@ -19,10 +19,10 @@
 import deflex.geometries
 
 
-#Todo: Revise and test.
+# Todo: Revise and test.
 
 
-def pp_reegis2deflex(clean_offshore=True):
+def pp_reegis2deflex():
     filename_out = os.path.join(cfg.get('paths', 'powerplants'),
                                 cfg.get('powerplants', 'deflex_pp')).format(
         map=cfg.get('init', 'map'))
@@ -74,7 +74,7 @@ def remove_onshore_technology_from_offshore_regions(df):
                               'NI': 'DE14'},
                      'de22': {'MV': 'DE01',
                               'SH': 'DE13',
-                              'NI': 'DE14'},}
+                              'NI': 'DE14'}}
     try:
         dc = coast_regions[cfg.get('init', 'map')]
     except KeyError:

deflex/scenario_tools.py

@@ -29,8 +29,6 @@
 from oemof import outputlib
 from oemof import graph
 
-from reegis import config as cfg
-
 
 class NodeDict(dict):
     __slots__ = ()