Merge branch 'fs58-pywikibot-logging-changed' into test-v1

In master branch of pywikibot the logging related stuff is moved to a
new module pywikibot.logging. As we want to be compatible to both
the master (for use of shared pywikibot on labs) and also the 2.0 branch
we need to catch this

[https://fs.golderweb.de/index.php?do=details&task_id=58 FS#58]
pywikibot-core commit d7d7a14

config.py

@@ -31,21 +31,66 @@ import ast
 
 import pywikibot
 
-__config = configparser.ConfigParser(interpolation=None)
-__config.read(pywikibot.config.get_base_dir() + "/jogobot.conf")
 
-# Convert to dict as configparser could contain only strings
+def load_config():
-config = dict( __config )
+    """
+    Reads raw configuration from file and provides it as attribute
 
-# Parse all sections
+    @param  Config-Object
-for section in __config.sections():
+    @r-type  configparser.ConfigParser
+    """
+    # Load configparser
+    config = configparser.ConfigParser(interpolation=None)
+    # Load config file
+    config.read(pywikibot.config.get_base_dir() + "/jogobot.conf")
+
+    return config
+
+
+def parse_config( raw_config ):
+    """
+    Converts config to normal dictionary
+    Parses each entry with ast.literal_eval
+
+    @param config  Config-Object to parse
+    @type config  configparser.ConfigParser
+
+    @return  Parsed configuration
+    @rtype  dict
+    """
     # Convert to dict as configparser could contain only strings
-    config[section] = dict( __config[section] )
+    config = dict( raw_config )
+
+    # Parse all sections
+    for section in raw_config.sections():
+        # Convert to dict as configparser could contain only strings
+        config[section] = dict( raw_config[section] )
 
         # Parse config with ast.literal_eval to get python datatypes
         for key, value in config[section].items():
             config[section][key] = ast.literal_eval( value )
 
-# Make jogobot entrys available in root level (without sections)
+    return config
-for key, value in config["jogobot"].items():
+
+
+def root_section( config, section="jogobot" ):
+    """
+    Make 'section' entrys available in root level (without sections)
+
+    @param config  Config-Object to parse
+    @type config  dict
+
+    @return  Parsed configuration
+    @rtype  dict
+    """
+    for key, value in config[section].items():
         config[key] = value
+
+    return config
+
+# Load config
+config = load_config()
+# Parse config to get python datatypes
+config = parse_config( config )
+# Make jogobot section available as root
+config = root_section( config )

jogobot.py

@@ -30,7 +30,15 @@ from subprocess import Popen, PIPE, TimeoutExpired
 
 import pywikibot
 
-from pywikibot.bot import(
+# Location of logging related stuff in pywikibot was changed with
+# commit d7d7a14 on Mon Sep 7 14:41:43 2015
+# This is to be compatible with recent versions as well as 2.0-branch
+try:
+    from pywikibot.logging import(
+        DEBUG, INFO, WARNING, ERROR, CRITICAL, STDOUT, VERBOSE, logoutput )
+except( ImportError ):
+    # Legacy support (pywikibot 2.0 branch)
+    from pywikibot.bot import(
         DEBUG, INFO, WARNING, ERROR, CRITICAL, STDOUT, VERBOSE, logoutput )
 
 from jogobot.config import config