Merge pull request #2 from vuolter/0.4.10

merge from vuolter

2 files changed, 10 insertions, 10 deletions

diff --git a/pyload/manager/thread/Plugin.py b/pyload/manager/thread/Plugin.py
index 658ce4550..08a2664da 100644
--- a/pyload/manager/thread/Plugin.py
+++ b/pyload/manager/thread/Plugin.py
@@ -28,7 +28,7 @@ class PluginThread(Thread):
         """Constructor"""
         Thread.__init__(self)
         self.setDaemon(True)
-        self.m = manager #thread manager
+        self.m = manager  #: thread manager
 
 
     def writeDebugReport(self, pyfile):
@@ -52,7 +52,7 @@ class PluginThread(Thread):
                     pass
 
             info = zipfile.ZipInfo(fs_join(pyfile.pluginname, "debug_Report.txt"), gmtime())
-            info.external_attr = 0644 << 16L # change permissions
+            info.external_attr = 0644 << 16L  #: change permissions
 
             zip.writestr(info, dump)
             zip.close()
@@ -95,7 +95,7 @@ class PluginThread(Thread):
 
             del frame
 
-        del stack #delete it just to be sure...
+        del stack  #: delete it just to be sure...
 
         dump += "\n\nPLUGIN OBJECT DUMP: \n\n"
 
diff --git a/pyload/manager/thread/Server.py b/pyload/manager/thread/Server.py
index b724ad2f9..990325f5d 100644
--- a/pyload/manager/thread/Server.py
+++ b/pyload/manager/thread/Server.py
@@ -20,12 +20,12 @@ class WebServer(threading.Thread):
         self.core = pycore
         core = pycore
         self.running = True
-        self.server = pycore.config['webui']['server']
-        self.https = pycore.config['webui']['https']
-        self.cert = pycore.config["ssl"]["cert"]
-        self.key = pycore.config["ssl"]["key"]
-        self.host = pycore.config['webui']['host']
-        self.port = pycore.config['webui']['port']
+        self.server = pycore.config.get("webui", "server")
+        self.https = pycore.config.get("webui", "https")
+        self.cert = pycore.config.get("ssl", "cert")
+        self.key = pycore.config.get("ssl", "key")
+        self.host = pycore.config.get("webui", "host")
+        self.port = pycore.config.get("webui", "port")
 
         self.setDaemon(True)
 
@@ -103,7 +103,7 @@ class WebServer(threading.Thread):
         try:
             webinterface.run_fcgi(host=self.host, port=self.port)
 
-        except ValueError: #@TODO: Fix https://github.com/pyload/pyload/issues/1145
+        except ValueError:  #@TODO: Fix https://github.com/pyload/pyload/issues/1145
             pass