Fix comments

28 files changed, 367 insertions, 367 deletions

diff --git a/docs/write_plugins.rst b/docs/write_plugins.rst
index 6c2a1d453..64868d638 100644
--- a/docs/write_plugins.rst
+++ b/docs/write_plugins.rst
@@ -92,7 +92,7 @@ Example: ::
 
             urls = ["http://get.pyload.org/src", "http://get.pyload.org/debian", "http://get.pyload.org/win"]
 
-            self.packages.append(("pyLoad packages", urls, "pyLoad packages")) # urls list of urls
+            self.packages.append(("pyLoad packages", urls, "pyLoad packages"))  #: urls list of urls
 
 They can access all the methods from :class:`Plugin <pyload.plugin.Plugin.Plugin>`, but the important thing is they
 have to append all packages they parsed to the `self.packages` list. Simply append tuples with `(name, urls, folder)`,
diff --git a/locale/pavement.py b/locale/pavement.py
index 0cdfb4872..5e24ce9f2 100644
--- a/locale/pavement.py
+++ b/locale/pavement.py
@@ -44,7 +44,7 @@ setup(
     #package_data=find_package_data(),
     #data_files=[],
     include_package_data=True,
-    exclude_package_data={'pyload': ["docs*", "scripts*", "tests*"]}, #exluced from build but not from sdist
+    exclude_package_data={'pyload': ["docs*", "scripts*", "tests*"]},  #: exluced from build but not from sdist
     # 'bottle >= 0.10.0' not in list, because its small and contain little modifications
     install_requires=['thrift >= 0.8.0', 'jinja2', 'pycurl', 'Beaker', 'BeautifulSoup >= 3.2, < 3.3'] + extradeps,
     extras_require={
@@ -360,7 +360,7 @@ def clean():
     path("dist").rmtree()
 
 
-#helper functions
+# helper functions
 
 def walk_trans(path, EXCLUDE, endings=[".py"]):
     result = ""
diff --git a/pyload/Core.py b/pyload/Core.py
index 2a3b1108f..706149eec 100755
--- a/pyload/Core.py
+++ b/pyload/Core.py
@@ -56,7 +56,7 @@ class Core(object):
         self.remote = True
         self.arg_links = []
         self.pidfile = "pyload.pid"
-        self.deleteLinks = False # will delete links on startup
+        self.deleteLinks = False  #: will delete links on startup
 
         if len(argv) > 1:
             try:
@@ -216,7 +216,7 @@ class Core(object):
             return
 
         try:
-            os.kill(pid, 3) #SIGUIT
+            os.kill(pid, 3)  #: SIGUIT
 
             t = time()
             print "waiting for pyLoad to quit"
@@ -227,7 +227,7 @@ class Core(object):
             if not exists(self.pidfile):
                 print "pyLoad successfully stopped"
             else:
-                os.kill(pid, 9) #SIGKILL
+                os.kill(pid, 9)  #: SIGKILL
                 print "pyLoad did not respond"
                 print "Kill signal was send to process with id %s" % pid
 
@@ -319,9 +319,9 @@ class Core(object):
         self.check_file(self.config.get("log", "log_folder"), _("folder for logs"), True)
 
         if self.debug:
-            self.init_logger(logging.DEBUG) # logging level
+            self.init_logger(logging.DEBUG)  #: logging level
         else:
-            self.init_logger(logging.INFO) # logging level
+            self.init_logger(logging.INFO)  #: logging level
 
         self.do_kill = False
         self.do_restart = False
@@ -343,7 +343,7 @@ class Core(object):
         self.check_file("tmp", _("folder for temporary files"), True)
         #tesser = self.check_install("tesseract", _("tesseract for captcha reading"), False) if os.name != "nt" else True
 
-        self.captcha = True # checks seems to fail, although tesseract is available
+        self.captcha = True  #: checks seems to fail, although tesseract is available
 
         self.check_file(self.config.get("general", "download_folder"), _("folder for downloads"), True)
 
@@ -401,7 +401,7 @@ class Core(object):
 
         self.log.info(_("Free space: %s") % formatSize(spaceLeft))
 
-        self.config.save() #save so config files gets filled
+        self.config.save()  #: save so config files gets filled
 
         link_file = join(pypath, "links.txt")
 
@@ -441,18 +441,18 @@ class Core(object):
                 self.shutdown()
                 self.log.info(_("pyLoad quits"))
                 self.removeLogger()
-                _exit(0) #@TODO thrift blocks shutdown
+                _exit(0)  #@TODO thrift blocks shutdown
 
             self.threadManager.work()
             self.scheduler.work()
 
 
     def setupDB(self):
-        self.db = DatabaseBackend(self) # the backend
+        self.db = DatabaseBackend(self)  #: the backend
         self.db.setup()
 
         self.files = FileHandler(self)
-        self.db.manager = self.files #ugly?
+        self.db.manager = self.files  #: ugly?
 
 
     def init_webserver(self):
@@ -465,7 +465,7 @@ class Core(object):
         console = logging.StreamHandler(sys.stdout)
         frm = logging.Formatter("%(asctime)s %(levelname)-8s  %(message)s", "%d.%m.%Y %H:%M:%S")
         console.setFormatter(frm)
-        self.log = logging.getLogger("log") # settable in config
+        self.log = logging.getLogger("log")  #: settable in config
 
         if self.config.get("log", "file_log"):
             if self.config.get("log", "log_rotate"):
@@ -479,7 +479,7 @@ class Core(object):
             file_handler.setFormatter(frm)
             self.log.addHandler(file_handler)
 
-        self.log.addHandler(console) #if console logging
+        self.log.addHandler(console)  #: if console logging
         self.log.setLevel(level)
 
 
diff --git a/pyload/cli/Cli.py b/pyload/cli/Cli.py
index 855ef47cc..4d6c3160d 100644
--- a/pyload/cli/Cli.py
+++ b/pyload/cli/Cli.py
@@ -81,8 +81,8 @@ class Cli(object):
             inp = self.getch.impl()
             if ord(inp) == 3:
                 os.system("clear")
-                sys.exit() # ctrl + c
-            elif ord(inp) == 13: #enter
+                sys.exit()  #: ctrl + c
+            elif ord(inp) == 13:  #: enter
                 try:
                     self.lock.acquire()
                     self.inputHandler.onEnter(self.input)
@@ -93,14 +93,14 @@ class Cli(object):
                     self.lock.release()
 
             elif ord(inp) == 127:
-                self.input = self.input[:-1] #backspace
+                self.input = self.input[:-1]  #: backspace
                 try:
                     self.lock.acquire()
                     self.inputHandler.onBackSpace()
                 finally:
                     self.lock.release()
 
-            elif ord(inp) == 27: #ugly symbol
+            elif ord(inp) == 27:  #: ugly symbol
                 pass
             else:
                 self.input += inp
@@ -143,7 +143,7 @@ class Cli(object):
     def renderHeader(self, line):
         """ prints download status """
         #print updated information
-        #        print "\033[J" #clear screen
+        #        print "\033[J"  #: clear screen
         #        self.println(1, blue("py") + yellow("Load") + white(_(" Command Line Interface")))
         #        self.println(2, "")
         #        self.println(3, white(_("%s Downloads:") % (len(data))))
diff --git a/pyload/database/Backend.py b/pyload/database/Backend.py
index 116241a13..45a5c7361 100644
--- a/pyload/database/Backend.py
+++ b/pyload/database/Backend.py
@@ -129,12 +129,12 @@ class DatabaseBackend(Thread):
 
     def run(self):
         """main loop, which executes commands"""
-        convert = self._checkVersion() #returns None or current version
+        convert = self._checkVersion()  #: returns None or current version
 
         self.conn = sqlite3.connect("files.db")
         chmod("files.db", 0600)
 
-        self.c = self.conn.cursor() #compatibility
+        self.c = self.conn.cursor()  #: compatibility
 
         if convert is not None:
             self._convertDB(convert)
diff --git a/pyload/manager/Account.py b/pyload/manager/Account.py
index ea6f15e87..4e4a82aed 100644
--- a/pyload/manager/Account.py
+++ b/pyload/manager/Account.py
@@ -23,11 +23,11 @@ class AccountManager(object):
         self.lock = Lock()
 
         self.initPlugins()
-        self.saveAccounts() # save to add categories to conf
+        self.saveAccounts()  #: save to add categories to conf
 
 
     def initPlugins(self):
-        self.accounts = {} # key = ( plugin )
+        self.accounts = {}  #: key = ( plugin )
         self.plugins = {}
 
         self.initAccountPlugins()
diff --git a/pyload/manager/Captcha.py b/pyload/manager/Captcha.py
index 0814cf78a..4a7582d65 100644
--- a/pyload/manager/Captcha.py
+++ b/pyload/manager/Captcha.py
@@ -54,7 +54,7 @@ class CaptchaManager(object):
         cli = self.core.isClientConnected()
 
         if cli:  #: client connected -> should solve the captcha
-            task.setWaiting(timeout) #wait 50 sec for response
+            task.setWaiting(timeout)  #: wait 50 sec for response
 
         for plugin in self.core.addonManager.activePlugins():
             try:
diff --git a/pyload/manager/thread/Plugin.py b/pyload/manager/thread/Plugin.py
index 155e687d4..d5b4cfefe 100644
--- a/pyload/manager/thread/Plugin.py
+++ b/pyload/manager/thread/Plugin.py
@@ -27,7 +27,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):
@@ -51,7 +51,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()
@@ -94,7 +94,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 48958f6fb..990325f5d 100644
--- a/pyload/manager/thread/Server.py
+++ b/pyload/manager/thread/Server.py
@@ -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
 
 
diff --git a/pyload/network/Browser.py b/pyload/network/Browser.py
index 61bf523ab..fab7454f3 100644
--- a/pyload/network/Browser.py
+++ b/pyload/network/Browser.py
@@ -13,10 +13,10 @@ class Browser(object):
     def __init__(self, bucket=None, options={}):
         self.log = getLogger("log")
 
-        self.options = options #holds pycurl options
+        self.options = options  #: holds pycurl options
         self.bucket = bucket
 
-        self.cj = None # needs to be setted later
+        self.cj = None  #: needs to be setted later
         self._size = 0
 
         self.renewHTTPRequest()
@@ -119,7 +119,7 @@ class Browser(object):
         :param pwd: string, user:password
         """
         self.options["auth"] = pwd
-        self.renewHTTPRequest() #we need a new request
+        self.renewHTTPRequest()  #: we need a new request
 
 
     def removeAuth(self):
diff --git a/pyload/network/Bucket.py b/pyload/network/Bucket.py
index 408a1e240..5f8260384 100644
--- a/pyload/network/Bucket.py
+++ b/pyload/network/Bucket.py
@@ -10,7 +10,7 @@ MIN_RATE = 10240  #: 10kb minimum rate
 class Bucket(object):
 
     def __init__(self):
-        self.rate      = 0 # bytes per second, maximum targeted throughput
+        self.rate      = 0  #: bytes per second, maximum targeted throughput
         self.tokens    = 0
         self.timestamp = time()
         self.lock      = Lock()
diff --git a/pyload/network/HTTPChunk.py b/pyload/network/HTTPChunk.py
index c11ad9e3c..82e1ca76e 100644
--- a/pyload/network/HTTPChunk.py
+++ b/pyload/network/HTTPChunk.py
@@ -86,7 +86,7 @@ class ChunkInfo(object):
         ci.loaded = True
         ci.setSize(size)
         while True:
-            if not fh.readline(): #skip line
+            if not fh.readline():  #: skip line
                 break
             name = fh.readline()[1:-1]
             range = fh.readline()[1:-1]
@@ -122,8 +122,8 @@ class HTTPChunk(HTTPRequest):
 
     def __init__(self, id, parent, range=None, resume=False):
         self.id = id
-        self.p = parent # HTTPDownload instance
-        self.range = range # tuple (start, end)
+        self.p = parent  #: HTTPDownload instance
+        self.range = range  #: tuple (start, end)
         self.resume = resume
         self.log = parent.log
 
@@ -134,14 +134,14 @@ class HTTPChunk(HTTPRequest):
         self.c = pycurl.Curl()
 
         self.header = ""
-        self.headerParsed = False #indicates if the header has been processed
+        self.headerParsed = False  #: indicates if the header has been processed
 
-        self.fp = None #file handle
+        self.fp = None  #: file handle
 
         self.initHandle()
         self.setInterface(self.p.options)
 
-        self.BOMChecked = False # check and remove byte order mark
+        self.BOMChecked = False  #: check and remove byte order mark
 
         self.rep = None
 
@@ -175,10 +175,10 @@ class HTTPChunk(HTTPRequest):
                 self.arrived = stat(fs_name).st_size
 
             if self.range:
-                #do nothing if chunk already finished
+                # do nothing if chunk already finished
                 if self.arrived + self.range[0] >= self.range[1]: return None
 
-                if self.id == len(self.p.info.chunks) - 1: #as last chunk dont set end range, so we get everything
+                if self.id == len(self.p.info.chunks) - 1:  #: as last chunk dont set end range, so we get everything
                     range = "%i-" % (self.arrived + self.range[0])
                 else:
                     range = "%i-%i" % (self.arrived + self.range[0], min(self.range[1] + 1, self.p.size - 1))
@@ -191,7 +191,7 @@ class HTTPChunk(HTTPRequest):
 
         else:
             if self.range:
-                if self.id == len(self.p.info.chunks) - 1: # see above
+                if self.id == len(self.p.info.chunks) - 1:  #: see above
                     range = "%i-" % self.range[0]
                 else:
                     range = "%i-%i" % (self.range[0], min(self.range[1] + 1, self.p.size - 1))
@@ -249,7 +249,7 @@ class HTTPChunk(HTTPRequest):
             sleep(self.sleep)
 
         if self.range and self.arrived > self.size:
-            return 0 #close if we have enough data
+            return 0  #: close if we have enough data
 
 
     def parseHeader(self):
@@ -300,8 +300,8 @@ class HTTPChunk(HTTPRequest):
     def flushFile(self):
         """  flush and close file """
         self.fp.flush()
-        fsync(self.fp.fileno()) #make sure everything was written to disk
-        self.fp.close() #needs to be closed, or merging chunks will fail
+        fsync(self.fp.fileno())  #: make sure everything was written to disk
+        self.fp.close()  #: needs to be closed, or merging chunks will fail
 
 
     def close(self):
diff --git a/pyload/network/HTTPDownload.py b/pyload/network/HTTPDownload.py
index 0580a6b90..32c165f82 100644
--- a/pyload/network/HTTPDownload.py
+++ b/pyload/network/HTTPDownload.py
@@ -34,7 +34,7 @@ class HTTPDownload(object):
 
         self.abort = False
         self.size = 0
-        self.nameDisposition = None #will be parsed from content disposition
+        self.nameDisposition = None  #: will be parsed from content disposition
 
         self.chunks = []
 
@@ -42,7 +42,7 @@ class HTTPDownload(object):
 
         try:
             self.info = ChunkInfo.load(filename)
-            self.info.resume = True #resume is only possible with valid info file
+            self.info.resume = True  #: resume is only possible with valid info file
             self.size = self.info.size
             self.infoSaved = True
         except IOError:
@@ -77,18 +77,18 @@ class HTTPDownload(object):
 
 
     def _copyChunks(self):
-        init = fs_encode(self.info.getChunkName(0)) #initial chunk name
+        init = fs_encode(self.info.getChunkName(0))  #: initial chunk name
 
         if self.info.getCount() > 1:
-            fo = open(init, "rb+") #first chunkfile
+            fo = open(init, "rb+")  #: first chunkfile
             for i in range(1, self.info.getCount()):
                 #input file
                 fo.seek(
-                    self.info.getChunkRange(i - 1)[1] + 1) #seek to beginning of chunk, to get rid of overlapping chunks
+                    self.info.getChunkRange(i - 1)[1] + 1)  #: seek to beginning of chunk, to get rid of overlapping chunks
                 fname = fs_encode("%s.chunk%d" % (self.filename, i))
                 fi = open(fname, "rb")
                 buf = 32 * 1024
-                while True: #copy in chunks, consumes less memory
+                while True:  #: copy in chunks, consumes less memory
                     data = fi.read(buf)
                     if not data:
                         break
@@ -97,16 +97,16 @@ class HTTPDownload(object):
                 if fo.tell() < self.info.getChunkRange(i)[1]:
                     fo.close()
                     remove(init)
-                    self.info.remove() #there are probably invalid chunks
+                    self.info.remove()  #: there are probably invalid chunks
                     raise Exception("Downloaded content was smaller than expected. Try to reduce download connections.")
-                remove(fname) #remove chunk
+                remove(fname)  #: remove chunk
             fo.close()
 
         if self.nameDisposition and self.disposition:
             self.filename = fs_join(dirname(self.filename), self.nameDisposition)
 
         move(init, fs_encode(self.filename))
-        self.info.remove() #remove info file
+        self.info.remove()  #: remove info file
 
 
     def download(self, chunks=1, resume=False):
@@ -141,12 +141,12 @@ class HTTPDownload(object):
     def _download(self, chunks, resume):
         if not resume:
             self.info.clear()
-            self.info.addChunk("%s.chunk0" % self.filename, (0, 0)) #create an initial entry
+            self.info.addChunk("%s.chunk0" % self.filename, (0, 0))  #: create an initial entry
             self.info.save()
 
         self.chunks = []
 
-        init = HTTPChunk(0, self, None, resume) #initial chunk that will load complete file (if needed)
+        init = HTTPChunk(0, self, None, resume)  #: initial chunk that will load complete file (if needed)
 
         self.chunks.append(init)
         self.m.add_handle(init.getHandle())
@@ -156,12 +156,12 @@ class HTTPDownload(object):
         chunksDone = set()  # list of curl handles that are finished
         chunksCreated = False
         done = False
-        if self.info.getCount() is 0: # This is a resume, if we were chunked originally assume still can
+        if self.info.getCount() is 0:  #: This is a resume, if we were chunked originally assume still can
             self.chunkSupport = False
 
         while 1:
             #need to create chunks
-            if not chunksCreated and self.chunkSupport and self.size: #will be setted later by first chunk
+            if not chunksCreated and self.chunkSupport and self.size:  #: will be setted later by first chunk
 
                 if not resume:
                     self.info.setSize(self.size)
@@ -197,12 +197,12 @@ class HTTPDownload(object):
             while lastFinishCheck + 0.5 < t:
                 # list of failed curl handles
                 failed = []
-                ex = None # save only last exception, we can only raise one anyway
+                ex = None  #: save only last exception, we can only raise one anyway
 
                 num_q, ok_list, err_list = self.m.info_read()
                 for c in ok_list:
                     chunk = self.findChunk(c)
-                    try: # check if the header implies success, else add it to failed list
+                    try:  #: check if the header implies success, else add it to failed list
                         chunk.verifyHeader()
                     except BadHeader, e:
                         self.log.debug("Chunk %d failed: %s" % (chunk.id + 1, str(e)))
@@ -221,7 +221,7 @@ class HTTPDownload(object):
                         self.log.debug("Chunk %d failed: %s" % (chunk.id + 1, str(ex)))
                         continue
 
-                    try: # check if the header implies success, else add it to failed list
+                    try:  #: check if the header implies success, else add it to failed list
                         chunk.verifyHeader()
                     except BadHeader, e:
                         self.log.debug("Chunk %d failed: %s" % (chunk.id + 1, str(e)))
@@ -229,7 +229,7 @@ class HTTPDownload(object):
                         ex = e
                     else:
                         chunksDone.add(curl)
-                if not num_q: # no more infos to get
+                if not num_q:  #: no more infos to get
 
                     # check if init is not finished so we reset download connections
                     # note that other chunks are closed and downloaded with init too
@@ -261,7 +261,7 @@ class HTTPDownload(object):
                     break
 
             if done:
-                break #all chunks loaded
+                break  #: all chunks loaded
 
             # calc speed once per second, averaging over 3 seconds
             if lastTimeCheck + 1 < t:
@@ -278,11 +278,11 @@ class HTTPDownload(object):
             if self.abort:
                 raise Abort
 
-            # sleep(0.003) #supress busy waiting - limits dl speed to (1 / x) * buffersize
+            # sleep(0.003)  #: supress busy waiting - limits dl speed to (1 / x) * buffersize
             self.m.select(1)
 
         for chunk in self.chunks:
-            chunk.flushFile() #make sure downloads are written to disk
+            chunk.flushFile()  #: make sure downloads are written to disk
 
         self._copyChunks()
 
diff --git a/pyload/network/RequestFactory.py b/pyload/network/RequestFactory.py
index 97bc58209..a80882088 100644
--- a/pyload/network/RequestFactory.py
+++ b/pyload/network/RequestFactory.py
@@ -45,7 +45,7 @@ class RequestFactory(object):
     def getHTTPRequest(self, **kwargs):
         """ returns a http request, dont forget to close it ! """
         options = self.getOptions()
-        options.update(kwargs) # submit kwargs as additional options
+        options.update(kwargs)  #: submit kwargs as additional options
         return HTTPRequest(CookieJar(None), options)
 
 
diff --git a/pyload/plugin/hoster/ZippyshareCom.py b/pyload/plugin/hoster/ZippyshareCom.py
index 91a636f0a..a062df458 100644
--- a/pyload/plugin/hoster/ZippyshareCom.py
+++ b/pyload/plugin/hoster/ZippyshareCom.py
@@ -67,13 +67,13 @@ class ZippyshareCom(SimpleHoster):
 
 
         def replElementById(element):
-            id   = element.group(1) # id might be either 'x' (a real id) or x (a variable)
+            id   = element.group(1)  #: id might be either 'x' (a real id) or x (a variable)
             attr = element.group(4)  # attr might be None
 
             varName = re.sub(r'-', '', 'GVAR[%s+"_%s"]' %(id, attr))
 
             realid = id.strip('"\'')
-            if id != realid: #id is not a variable, so look for realid.attr in the html
+            if id != realid:  #: id is not a variable, so look for realid.attr in the html
                 initValues = filter(None, [elt.get(attr, None) for elt in soup.findAll(id=realid)])
                 initValue  = '"%s"' % initValues[-1] if initValues else 'null'
                 initScripts.add('%s = %s;' % (varName, initValue))
diff --git a/pyload/plugin/ocr/NetloadIn.py b/pyload/plugin/ocr/NetloadIn.py
index 9e31d18d5..57651428b 100644
--- a/pyload/plugin/ocr/NetloadIn.py
+++ b/pyload/plugin/ocr/NetloadIn.py
@@ -24,6 +24,6 @@ class NetloadIn(OCR):
         self.clean(3)
         self.run_tesser(True, True, False, False)
 
-        self.result_captcha = self.result_captcha.replace(" ", "")[:4] # cut to 4 numbers
+        self.result_captcha = self.result_captcha.replace(" ", "")[:4]  #: cut to 4 numbers
 
         return self.result_captcha
diff --git a/pyload/remote/ThriftBackend.py b/pyload/remote/ThriftBackend.py
index adb168df2..0ac7f1bb5 100644
--- a/pyload/remote/ThriftBackend.py
+++ b/pyload/remote/ThriftBackend.py
@@ -9,7 +9,7 @@ from pyload.remote.thriftbackend.Processor import Processor
 from pyload.remote.thriftbackend.Protocol import ProtocolFactory
 from pyload.remote.thriftbackend.Socket import ServerSocket
 from pyload.remote.thriftbackend.Transport import TransportFactory
-#from pyload.remote.thriftbackend.Transport import TransportFactoryCompressed
+# from pyload.remote.thriftbackend.Transport import TransportFactoryCompressed
 
 from thrift.server import TServer
 
diff --git a/pyload/remote/thriftbackend/Socket.py b/pyload/remote/thriftbackend/Socket.py
index 7e1268c5c..7d078ab93 100644
--- a/pyload/remote/thriftbackend/Socket.py
+++ b/pyload/remote/thriftbackend/Socket.py
@@ -8,7 +8,7 @@ from time import sleep
 
 from thrift.transport.TSocket import TSocket, TServerSocket, TTransportException
 
-WantReadError = Exception #overwritten when ssl is used
+WantReadError = Exception  #: overwritten when ssl is used
 
 class SecureSocketConnection(object):
 
diff --git a/pyload/remote/thriftbackend/ThriftClient.py b/pyload/remote/thriftbackend/ThriftClient.py
index 289762adc..60a4e9ca9 100644
--- a/pyload/remote/thriftbackend/ThriftClient.py
+++ b/pyload/remote/thriftbackend/ThriftClient.py
@@ -7,7 +7,7 @@ from socket import error
 from traceback import print_exc
 
 from thrift.transport import TTransport
-#from thrift.transport.TZlibTransport import TZlibTransport
+# from thrift.transport.TZlibTransport import TZlibTransport
 from Socket import Socket
 from Protocol import Protocol
 
diff --git a/pyload/remote/thriftbackend/ThriftTest.py b/pyload/remote/thriftbackend/ThriftTest.py
index f4c927bd7..fb8dd03c9 100644
--- a/pyload/remote/thriftbackend/ThriftTest.py
+++ b/pyload/remote/thriftbackend/ThriftTest.py
@@ -48,8 +48,8 @@ proxy = xmlrpclib.ServerProxy(server_url, allow_none=True)
 bench(proxy.get_server_version)
 bench(proxy.status_server)
 bench(proxy.status_downloads)
-#bench(proxy.get_queue)
-#bench(proxy.get_collector)
+# bench(proxy.get_queue)
+# bench(proxy.get_collector)
 print
 try:
 
diff --git a/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py b/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py
index 874b705ba..a5e730c35 100644
--- a/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py
+++ b/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py
@@ -3667,10 +3667,10 @@ class getConfigValue_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'category', None, None,), # 1
-    (2, TType.STRING, 'option', None, None,), # 2
-    (3, TType.STRING, 'section', None, None,), # 3
+    None,  #: 0
+    (1, TType.STRING, 'category', None, None,),  #: 1
+    (2, TType.STRING, 'option', None, None,),  #: 2
+    (3, TType.STRING, 'section', None, None,),  #: 3
   )
 
 
@@ -3691,7 +3691,7 @@ class getConfigValue_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRING, 'success', None, None,), # 0
+    (0, TType.STRING, 'success', None, None,),  #: 0
   )
 
 
@@ -3716,11 +3716,11 @@ class setConfigValue_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'category', None, None,), # 1
-    (2, TType.STRING, 'option', None, None,), # 2
-    (3, TType.STRING, 'value', None, None,), # 3
-    (4, TType.STRING, 'section', None, None,), # 4
+    None,  #: 0
+    (1, TType.STRING, 'category', None, None,),  #: 1
+    (2, TType.STRING, 'option', None, None,),  #: 2
+    (3, TType.STRING, 'value', None, None,),  #: 3
+    (4, TType.STRING, 'section', None, None,),  #: 4
   )
 
 
@@ -3760,7 +3760,7 @@ class getConfig_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.STRING, None, TType.STRUCT, (ConfigSection, ConfigSection.thrift_spec)), None,), # 0
+    (0, TType.MAP, 'success', (TType.STRING, None, TType.STRUCT, (ConfigSection, ConfigSection.thrift_spec)), None,),  #: 0
   )
 
 
@@ -3788,7 +3788,7 @@ class getPluginConfig_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.STRING, None, TType.STRUCT, (ConfigSection, ConfigSection.thrift_spec)), None,), # 0
+    (0, TType.MAP, 'success', (TType.STRING, None, TType.STRUCT, (ConfigSection, ConfigSection.thrift_spec)), None,),  #: 0
   )
 
 
@@ -3852,7 +3852,7 @@ class togglePause_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None,), # 0
+    (0, TType.BOOL, 'success', None, None,),  #: 0
   )
 
 
@@ -3880,7 +3880,7 @@ class statusServer_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (ServerStatus, ServerStatus.thrift_spec), None,), # 0
+    (0, TType.STRUCT, 'success', (ServerStatus, ServerStatus.thrift_spec), None,),  #: 0
   )
 
 
@@ -3908,7 +3908,7 @@ class freeSpace_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.I64, 'success', None, None,), # 0
+    (0, TType.I64, 'success', None, None,),  #: 0
   )
 
 
@@ -3936,7 +3936,7 @@ class getServerVersion_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRING, 'success', None, None,), # 0
+    (0, TType.STRING, 'success', None, None,),  #: 0
   )
 
 
@@ -3991,8 +3991,8 @@ class getLog_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'offset', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'offset', None, None,),  #: 1
   )
 
 
@@ -4011,7 +4011,7 @@ class getLog_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRING, None), None,), # 0
+    (0, TType.LIST, 'success', (TType.STRING, None), None,),  #: 0
   )
 
 
@@ -4039,7 +4039,7 @@ class isTimeDownload_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None,), # 0
+    (0, TType.BOOL, 'success', None, None,),  #: 0
   )
 
 
@@ -4067,7 +4067,7 @@ class isTimeReconnect_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None,), # 0
+    (0, TType.BOOL, 'success', None, None,),  #: 0
   )
 
 
@@ -4095,7 +4095,7 @@ class toggleReconnect_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None,), # 0
+    (0, TType.BOOL, 'success', None, None,),  #: 0
   )
 
 
@@ -4114,8 +4114,8 @@ class generatePackages_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.LIST, 'links', (TType.STRING, None), None,), # 1
+    None,  #: 0
+    (1, TType.LIST, 'links', (TType.STRING, None), None,),  #: 1
   )
 
 
@@ -4134,7 +4134,7 @@ class generatePackages_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,), # 0
+    (0, TType.MAP, 'success', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,),  #: 0
   )
 
 
@@ -4153,8 +4153,8 @@ class checkURLs_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.LIST, 'urls', (TType.STRING, None), None,), # 1
+    None,  #: 0
+    (1, TType.LIST, 'urls', (TType.STRING, None), None,),  #: 1
   )
 
 
@@ -4173,7 +4173,7 @@ class checkURLs_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,), # 0
+    (0, TType.MAP, 'success', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,),  #: 0
   )
 
 
@@ -4194,9 +4194,9 @@ class parseURLs_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'html', None, None,), # 1
-    (2, TType.STRING, 'url', None, None,), # 2
+    None,  #: 0
+    (1, TType.STRING, 'html', None, None,),  #: 1
+    (2, TType.STRING, 'url', None, None,),  #: 2
   )
 
 
@@ -4216,7 +4216,7 @@ class parseURLs_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,), # 0
+    (0, TType.MAP, 'success', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,),  #: 0
   )
 
 
@@ -4235,8 +4235,8 @@ class checkOnlineStatus_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.LIST, 'urls', (TType.STRING, None), None,), # 1
+    None,  #: 0
+    (1, TType.LIST, 'urls', (TType.STRING, None), None,),  #: 1
   )
 
 
@@ -4255,7 +4255,7 @@ class checkOnlineStatus_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None,), # 0
+    (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None,),  #: 0
   )
 
 
@@ -4278,10 +4278,10 @@ class checkOnlineStatusContainer_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.LIST, 'urls', (TType.STRING, None), None,), # 1
-    (2, TType.STRING, 'filename', None, None,), # 2
-    (3, TType.STRING, 'data', None, None,), # 3
+    None,  #: 0
+    (1, TType.LIST, 'urls', (TType.STRING, None), None,),  #: 1
+    (2, TType.STRING, 'filename', None, None,),  #: 2
+    (3, TType.STRING, 'data', None, None,),  #: 3
   )
 
 
@@ -4302,7 +4302,7 @@ class checkOnlineStatusContainer_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None,), # 0
+    (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None,),  #: 0
   )
 
 
@@ -4321,8 +4321,8 @@ class pollResults_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'rid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'rid', None, None,),  #: 1
   )
 
 
@@ -4341,7 +4341,7 @@ class pollResults_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None,), # 0
+    (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None,),  #: 0
   )
 
 
@@ -4369,7 +4369,7 @@ class statusDownloads_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT, (DownloadInfo, DownloadInfo.thrift_spec)), None,), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT, (DownloadInfo, DownloadInfo.thrift_spec)), None,),  #: 0
   )
 
 
@@ -4388,8 +4388,8 @@ class getPackageData_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
   )
 
 
@@ -4410,8 +4410,8 @@ class getPackageData_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (PackageData, PackageData.thrift_spec), None,), # 0
-    (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None,), # 1
+    (0, TType.STRUCT, 'success', (PackageData, PackageData.thrift_spec), None,),  #: 0
+    (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None,),  #: 1
   )
 
 
@@ -4431,8 +4431,8 @@ class getPackageInfo_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
   )
 
 
@@ -4453,8 +4453,8 @@ class getPackageInfo_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (PackageData, PackageData.thrift_spec), None,), # 0
-    (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None,), # 1
+    (0, TType.STRUCT, 'success', (PackageData, PackageData.thrift_spec), None,),  #: 0
+    (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None,),  #: 1
   )
 
 
@@ -4474,8 +4474,8 @@ class getFileData_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'fid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'fid', None, None,),  #: 1
   )
 
 
@@ -4496,8 +4496,8 @@ class getFileData_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (FileData, FileData.thrift_spec), None,), # 0
-    (1, TType.STRUCT, 'e', (FileDoesNotExists, FileDoesNotExists.thrift_spec), None,), # 1
+    (0, TType.STRUCT, 'success', (FileData, FileData.thrift_spec), None,),  #: 0
+    (1, TType.STRUCT, 'e', (FileDoesNotExists, FileDoesNotExists.thrift_spec), None,),  #: 1
   )
 
 
@@ -4526,7 +4526,7 @@ class getQueue_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,),  #: 0
   )
 
 
@@ -4554,7 +4554,7 @@ class getCollector_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,),  #: 0
   )
 
 
@@ -4582,7 +4582,7 @@ class getQueueData_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,),  #: 0
   )
 
 
@@ -4610,7 +4610,7 @@ class getCollectorData_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,),  #: 0
   )
 
 
@@ -4629,8 +4629,8 @@ class getPackageOrder_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'destination', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'destination', None, None,),  #: 1
   )
 
 
@@ -4649,7 +4649,7 @@ class getPackageOrder_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.I16, None, TType.I32, None), None,), # 0
+    (0, TType.MAP, 'success', (TType.I16, None, TType.I32, None), None,),  #: 0
   )
 
 
@@ -4668,8 +4668,8 @@ class getFileOrder_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
   )
 
 
@@ -4688,7 +4688,7 @@ class getFileOrder_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.I16, None, TType.I32, None), None,), # 0
+    (0, TType.MAP, 'success', (TType.I16, None, TType.I32, None), None,),  #: 0
   )
 
 
@@ -4709,9 +4709,9 @@ class generateAndAddPackages_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.LIST, 'links', (TType.STRING, None), None,), # 1
-    (2, TType.I32, 'dest', None, None,), # 2
+    None,  #: 0
+    (1, TType.LIST, 'links', (TType.STRING, None), None,),  #: 1
+    (2, TType.I32, 'dest', None, None,),  #: 2
   )
 
 
@@ -4731,7 +4731,7 @@ class generateAndAddPackages_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.I32, None), None,), # 0
+    (0, TType.LIST, 'success', (TType.I32, None), None,),  #: 0
   )
 
 
@@ -4754,10 +4754,10 @@ class addPackage_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'name', None, None,), # 1
-    (2, TType.LIST, 'links', (TType.STRING, None), None,), # 2
-    (3, TType.I32, 'dest', None, None,), # 3
+    None,  #: 0
+    (1, TType.STRING, 'name', None, None,),  #: 1
+    (2, TType.LIST, 'links', (TType.STRING, None), None,),  #: 2
+    (3, TType.I32, 'dest', None, None,),  #: 3
   )
 
 
@@ -4778,7 +4778,7 @@ class addPackage_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.I32, 'success', None, None,), # 0
+    (0, TType.I32, 'success', None, None,),  #: 0
   )
 
 
@@ -4799,9 +4799,9 @@ class addFiles_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
-    (2, TType.LIST, 'links', (TType.STRING, None), None,), # 2
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
+    (2, TType.LIST, 'links', (TType.STRING, None), None,),  #: 2
   )
 
 
@@ -4832,9 +4832,9 @@ class uploadContainer_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'filename', None, None,), # 1
-    (2, TType.STRING, 'data', None, None,), # 2
+    None,  #: 0
+    (1, TType.STRING, 'filename', None, None,),  #: 1
+    (2, TType.STRING, 'data', None, None,),  #: 2
   )
 
 
@@ -4863,8 +4863,8 @@ class deleteFiles_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.LIST, 'fids', (TType.I32, None), None,), # 1
+    None,  #: 0
+    (1, TType.LIST, 'fids', (TType.I32, None), None,),  #: 1
   )
 
 
@@ -4892,8 +4892,8 @@ class deletePackages_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.LIST, 'pids', (TType.I32, None), None,), # 1
+    None,  #: 0
+    (1, TType.LIST, 'pids', (TType.I32, None), None,),  #: 1
   )
 
 
@@ -4921,8 +4921,8 @@ class pushToQueue_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
   )
 
 
@@ -4950,8 +4950,8 @@ class pullFromQueue_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
   )
 
 
@@ -4979,8 +4979,8 @@ class restartPackage_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
   )
 
 
@@ -5008,8 +5008,8 @@ class restartFile_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'fid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'fid', None, None,),  #: 1
   )
 
 
@@ -5037,8 +5037,8 @@ class recheckPackage_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
   )
 
 
@@ -5084,8 +5084,8 @@ class stopDownloads_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.LIST, 'fids', (TType.I32, None), None,), # 1
+    None,  #: 0
+    (1, TType.LIST, 'fids', (TType.I32, None), None,),  #: 1
   )
 
 
@@ -5115,9 +5115,9 @@ class setPackageName_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
-    (2, TType.STRING, 'name', None, None,), # 2
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
+    (2, TType.STRING, 'name', None, None,),  #: 2
   )
 
 
@@ -5148,9 +5148,9 @@ class movePackage_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'destination', None, None,), # 1
-    (2, TType.I32, 'pid', None, None,), # 2
+    None,  #: 0
+    (1, TType.I32, 'destination', None, None,),  #: 1
+    (2, TType.I32, 'pid', None, None,),  #: 2
   )
 
 
@@ -5181,9 +5181,9 @@ class moveFiles_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.LIST, 'fids', (TType.I32, None), None,), # 1
-    (2, TType.I32, 'pid', None, None,), # 2
+    None,  #: 0
+    (1, TType.LIST, 'fids', (TType.I32, None), None,),  #: 1
+    (2, TType.I32, 'pid', None, None,),  #: 2
   )
 
 
@@ -5214,9 +5214,9 @@ class orderPackage_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
-    (2, TType.I16, 'position', None, None,), # 2
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
+    (2, TType.I16, 'position', None, None,),  #: 2
   )
 
 
@@ -5247,9 +5247,9 @@ class orderFile_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'fid', None, None,), # 1
-    (2, TType.I16, 'position', None, None,), # 2
+    None,  #: 0
+    (1, TType.I32, 'fid', None, None,),  #: 1
+    (2, TType.I16, 'position', None, None,),  #: 2
   )
 
 
@@ -5280,9 +5280,9 @@ class setPackageData_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
-    (2, TType.MAP, 'data', (TType.STRING, None, TType.STRING, None), None,), # 2
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
+    (2, TType.MAP, 'data', (TType.STRING, None, TType.STRING, None), None,),  #: 2
   )
 
 
@@ -5302,8 +5302,8 @@ class setPackageData_result(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None,), # 1
+    None,  #: 0
+    (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None,),  #: 1
   )
 
 
@@ -5331,7 +5331,7 @@ class deleteFinished_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.I32, None), None,), # 0
+    (0, TType.LIST, 'success', (TType.I32, None), None,),  #: 0
   )
 
 
@@ -5368,8 +5368,8 @@ class getEvents_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'uuid', None, None,), # 1
+    None,  #: 0
+    (1, TType.STRING, 'uuid', None, None,),  #: 1
   )
 
 
@@ -5388,7 +5388,7 @@ class getEvents_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT, (EventInfo, EventInfo.thrift_spec)), None,), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT, (EventInfo, EventInfo.thrift_spec)), None,),  #: 0
   )
 
 
@@ -5407,8 +5407,8 @@ class getAccounts_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.BOOL, 'refresh', None, None,), # 1
+    None,  #: 0
+    (1, TType.BOOL, 'refresh', None, None,),  #: 1
   )
 
 
@@ -5427,7 +5427,7 @@ class getAccounts_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT, (AccountInfo, AccountInfo.thrift_spec)), None,), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT, (AccountInfo, AccountInfo.thrift_spec)), None,),  #: 0
   )
 
 
@@ -5455,7 +5455,7 @@ class getAccountTypes_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRING, None), None,), # 0
+    (0, TType.LIST, 'success', (TType.STRING, None), None,),  #: 0
   )
 
 
@@ -5480,11 +5480,11 @@ class updateAccount_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'plugin', None, None,), # 1
-    (2, TType.STRING, 'account', None, None,), # 2
-    (3, TType.STRING, 'password', None, None,), # 3
-    (4, TType.MAP, 'options', (TType.STRING, None, TType.STRING, None), None,), # 4
+    None,  #: 0
+    (1, TType.STRING, 'plugin', None, None,),  #: 1
+    (2, TType.STRING, 'account', None, None,),  #: 2
+    (3, TType.STRING, 'password', None, None,),  #: 3
+    (4, TType.MAP, 'options', (TType.STRING, None, TType.STRING, None), None,),  #: 4
   )
 
 
@@ -5517,9 +5517,9 @@ class removeAccount_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'plugin', None, None,), # 1
-    (2, TType.STRING, 'account', None, None,), # 2
+    None,  #: 0
+    (1, TType.STRING, 'plugin', None, None,),  #: 1
+    (2, TType.STRING, 'account', None, None,),  #: 2
   )
 
 
@@ -5550,9 +5550,9 @@ class login_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'username', None, None,), # 1
-    (2, TType.STRING, 'password', None, None,), # 2
+    None,  #: 0
+    (1, TType.STRING, 'username', None, None,),  #: 1
+    (2, TType.STRING, 'password', None, None,),  #: 2
   )
 
 
@@ -5572,7 +5572,7 @@ class login_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None,), # 0
+    (0, TType.BOOL, 'success', None, None,),  #: 0
   )
 
 
@@ -5593,9 +5593,9 @@ class getUserData_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'username', None, None,), # 1
-    (2, TType.STRING, 'password', None, None,), # 2
+    None,  #: 0
+    (1, TType.STRING, 'username', None, None,),  #: 1
+    (2, TType.STRING, 'password', None, None,),  #: 2
   )
 
 
@@ -5615,7 +5615,7 @@ class getUserData_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (UserData, UserData.thrift_spec), None,), # 0
+    (0, TType.STRUCT, 'success', (UserData, UserData.thrift_spec), None,),  #: 0
   )
 
 
@@ -5643,7 +5643,7 @@ class getAllUserData_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.STRING, None, TType.STRUCT, (UserData, UserData.thrift_spec)), None,), # 0
+    (0, TType.MAP, 'success', (TType.STRING, None, TType.STRUCT, (UserData, UserData.thrift_spec)), None,),  #: 0
   )
 
 
@@ -5671,7 +5671,7 @@ class getServices_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.STRING, None, TType.MAP, (TType.STRING, None, TType.STRING, None)), None,), # 0
+    (0, TType.MAP, 'success', (TType.STRING, None, TType.MAP, (TType.STRING, None, TType.STRING, None)), None,),  #: 0
   )
 
 
@@ -5692,9 +5692,9 @@ class hasService_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'plugin', None, None,), # 1
-    (2, TType.STRING, 'func', None, None,), # 2
+    None,  #: 0
+    (1, TType.STRING, 'plugin', None, None,),  #: 1
+    (2, TType.STRING, 'func', None, None,),  #: 2
   )
 
 
@@ -5714,7 +5714,7 @@ class hasService_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None,), # 0
+    (0, TType.BOOL, 'success', None, None,),  #: 0
   )
 
 
@@ -5733,8 +5733,8 @@ class call_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRUCT, 'info', (ServiceCall, ServiceCall.thrift_spec), None,), # 1
+    None,  #: 0
+    (1, TType.STRUCT, 'info', (ServiceCall, ServiceCall.thrift_spec), None,),  #: 1
   )
 
 
@@ -5757,9 +5757,9 @@ class call_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRING, 'success', None, None,), # 0
-    (1, TType.STRUCT, 'ex', (ServiceDoesNotExists, ServiceDoesNotExists.thrift_spec), None,), # 1
-    (2, TType.STRUCT, 'e', (ServiceException, ServiceException.thrift_spec), None,), # 2
+    (0, TType.STRING, 'success', None, None,),  #: 0
+    (1, TType.STRUCT, 'ex', (ServiceDoesNotExists, ServiceDoesNotExists.thrift_spec), None,),  #: 1
+    (2, TType.STRUCT, 'e', (ServiceException, ServiceException.thrift_spec), None,),  #: 2
   )
 
 
@@ -5789,7 +5789,7 @@ class getAllInfo_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.STRING, None, TType.MAP, (TType.STRING, None, TType.STRING, None)), None,), # 0
+    (0, TType.MAP, 'success', (TType.STRING, None, TType.MAP, (TType.STRING, None, TType.STRING, None)), None,),  #: 0
   )
 
 
@@ -5808,8 +5808,8 @@ class getInfoByPlugin_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'plugin', None, None,), # 1
+    None,  #: 0
+    (1, TType.STRING, 'plugin', None, None,),  #: 1
   )
 
 
@@ -5828,7 +5828,7 @@ class getInfoByPlugin_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.MAP, 'success', (TType.STRING, None, TType.STRING, None), None,), # 0
+    (0, TType.MAP, 'success', (TType.STRING, None, TType.STRING, None), None,),  #: 0
   )
 
 
@@ -5856,7 +5856,7 @@ class isCaptchaWaiting_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None,), # 0
+    (0, TType.BOOL, 'success', None, None,),  #: 0
   )
 
 
@@ -5875,8 +5875,8 @@ class getCaptchaTask_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.BOOL, 'exclusive', None, None,), # 1
+    None,  #: 0
+    (1, TType.BOOL, 'exclusive', None, None,),  #: 1
   )
 
 
@@ -5895,7 +5895,7 @@ class getCaptchaTask_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (CaptchaTask, CaptchaTask.thrift_spec), None,), # 0
+    (0, TType.STRUCT, 'success', (CaptchaTask, CaptchaTask.thrift_spec), None,),  #: 0
   )
 
 
@@ -5914,8 +5914,8 @@ class getCaptchaTaskStatus_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'tid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'tid', None, None,),  #: 1
   )
 
 
@@ -5934,7 +5934,7 @@ class getCaptchaTaskStatus_result(TBase):
    ]
 
   thrift_spec = (
-    (0, TType.STRING, 'success', None, None,), # 0
+    (0, TType.STRING, 'success', None, None,),  #: 0
   )
 
 
@@ -5955,9 +5955,9 @@ class setCaptchaResult_args(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'tid', None, None,), # 1
-    (2, TType.STRING, 'result', None, None,), # 2
+    None,  #: 0
+    (1, TType.I32, 'tid', None, None,),  #: 1
+    (2, TType.STRING, 'result', None, None,),  #: 2
   )
 
 
diff --git a/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py b/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py
index 70b29ff1e..1c18f6421 100644
--- a/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py
+++ b/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py
@@ -189,23 +189,23 @@ class DownloadInfo(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'fid', None, None,), # 1
-    (2, TType.STRING, 'name', None, None,), # 2
-    (3, TType.I64, 'speed', None, None,), # 3
-    (4, TType.I32, 'eta', None, None,), # 4
-    (5, TType.STRING, 'format_eta', None, None,), # 5
-    (6, TType.I64, 'bleft', None, None,), # 6
-    (7, TType.I64, 'size', None, None,), # 7
-    (8, TType.STRING, 'format_size', None, None,), # 8
-    (9, TType.BYTE, 'percent', None, None,), # 9
-    (10, TType.I32, 'status', None, None,), # 10
-    (11, TType.STRING, 'statusmsg', None, None,), # 11
-    (12, TType.STRING, 'format_wait', None, None,), # 12
-    (13, TType.I64, 'wait_until', None, None,), # 13
-    (14, TType.I32, 'packageID', None, None,), # 14
-    (15, TType.STRING, 'packageName', None, None,), # 15
-    (16, TType.STRING, 'plugin', None, None,), # 16
+    None,  #: 0
+    (1, TType.I32, 'fid', None, None,),  #: 1
+    (2, TType.STRING, 'name', None, None,),  #: 2
+    (3, TType.I64, 'speed', None, None,),  #: 3
+    (4, TType.I32, 'eta', None, None,),  #: 4
+    (5, TType.STRING, 'format_eta', None, None,),  #: 5
+    (6, TType.I64, 'bleft', None, None,),  #: 6
+    (7, TType.I64, 'size', None, None,),  #: 7
+    (8, TType.STRING, 'format_size', None, None,),  #: 8
+    (9, TType.BYTE, 'percent', None, None,),  #: 9
+    (10, TType.I32, 'status', None, None,),  #: 10
+    (11, TType.STRING, 'statusmsg', None, None,),  #: 11
+    (12, TType.STRING, 'format_wait', None, None,),  #: 12
+    (13, TType.I64, 'wait_until', None, None,),  #: 13
+    (14, TType.I32, 'packageID', None, None,),  #: 14
+    (15, TType.STRING, 'packageName', None, None,),  #: 15
+    (16, TType.STRING, 'plugin', None, None,),  #: 16
   )
 
 
@@ -251,14 +251,14 @@ class ServerStatus(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.BOOL, 'pause', None, None,), # 1
-    (2, TType.I16, 'active', None, None,), # 2
-    (3, TType.I16, 'queue', None, None,), # 3
-    (4, TType.I16, 'total', None, None,), # 4
-    (5, TType.I64, 'speed', None, None,), # 5
-    (6, TType.BOOL, 'download', None, None,), # 6
-    (7, TType.BOOL, 'reconnect', None, None,), # 7
+    None,  #: 0
+    (1, TType.BOOL, 'pause', None, None,),  #: 1
+    (2, TType.I16, 'active', None, None,),  #: 2
+    (3, TType.I16, 'queue', None, None,),  #: 3
+    (4, TType.I16, 'total', None, None,),  #: 4
+    (5, TType.I64, 'speed', None, None,),  #: 5
+    (6, TType.BOOL, 'download', None, None,),  #: 6
+    (7, TType.BOOL, 'reconnect', None, None,),  #: 7
   )
 
 
@@ -289,11 +289,11 @@ class ConfigItem(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'name', None, None,), # 1
-    (2, TType.STRING, 'description', None, None,), # 2
-    (3, TType.STRING, 'value', None, None,), # 3
-    (4, TType.STRING, 'type', None, None,), # 4
+    None,  #: 0
+    (1, TType.STRING, 'name', None, None,),  #: 1
+    (2, TType.STRING, 'description', None, None,),  #: 2
+    (3, TType.STRING, 'value', None, None,),  #: 3
+    (4, TType.STRING, 'type', None, None,),  #: 4
   )
 
 
@@ -321,11 +321,11 @@ class ConfigSection(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'name', None, None,), # 1
-    (2, TType.STRING, 'description', None, None,), # 2
-    (3, TType.LIST, 'items', (TType.STRUCT, (ConfigItem, ConfigItem.thrift_spec)), None,), # 3
-    (4, TType.STRING, 'outline', None, None,), # 4
+    None,  #: 0
+    (1, TType.STRING, 'name', None, None,),  #: 1
+    (2, TType.STRING, 'description', None, None,),  #: 2
+    (3, TType.LIST, 'items', (TType.STRUCT, (ConfigItem, ConfigItem.thrift_spec)), None,),  #: 3
+    (4, TType.STRING, 'outline', None, None,),  #: 4
   )
 
 
@@ -367,18 +367,18 @@ class FileData(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'fid', None, None,), # 1
-    (2, TType.STRING, 'url', None, None,), # 2
-    (3, TType.STRING, 'name', None, None,), # 3
-    (4, TType.STRING, 'plugin', None, None,), # 4
-    (5, TType.I64, 'size', None, None,), # 5
-    (6, TType.STRING, 'format_size', None, None,), # 6
-    (7, TType.I32, 'status', None, None,), # 7
-    (8, TType.STRING, 'statusmsg', None, None,), # 8
-    (9, TType.I32, 'packageID', None, None,), # 9
-    (10, TType.STRING, 'error', None, None,), # 10
-    (11, TType.I16, 'order', None, None,), # 11
+    None,  #: 0
+    (1, TType.I32, 'fid', None, None,),  #: 1
+    (2, TType.STRING, 'url', None, None,),  #: 2
+    (3, TType.STRING, 'name', None, None,),  #: 3
+    (4, TType.STRING, 'plugin', None, None,),  #: 4
+    (5, TType.I64, 'size', None, None,),  #: 5
+    (6, TType.STRING, 'format_size', None, None,),  #: 6
+    (7, TType.I32, 'status', None, None,),  #: 7
+    (8, TType.STRING, 'statusmsg', None, None,),  #: 8
+    (9, TType.I32, 'packageID', None, None,),  #: 9
+    (10, TType.STRING, 'error', None, None,),  #: 10
+    (11, TType.I16, 'order', None, None,),  #: 11
   )
 
 
@@ -431,20 +431,20 @@ class PackageData(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
-    (2, TType.STRING, 'name', None, None,), # 2
-    (3, TType.STRING, 'folder', None, None,), # 3
-    (4, TType.STRING, 'site', None, None,), # 4
-    (5, TType.STRING, 'password', None, None,), # 5
-    (6, TType.I32, 'dest', None, None,), # 6
-    (7, TType.I16, 'order', None, None,), # 7
-    (8, TType.I16, 'linksdone', None, None,), # 8
-    (9, TType.I64, 'sizedone', None, None,), # 9
-    (10, TType.I64, 'sizetotal', None, None,), # 10
-    (11, TType.I16, 'linkstotal', None, None,), # 11
-    (12, TType.LIST, 'links', (TType.STRUCT, (FileData, FileData.thrift_spec)), None,), # 12
-    (13, TType.LIST, 'fids', (TType.I32, None), None,), # 13
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
+    (2, TType.STRING, 'name', None, None,),  #: 2
+    (3, TType.STRING, 'folder', None, None,),  #: 3
+    (4, TType.STRING, 'site', None, None,),  #: 4
+    (5, TType.STRING, 'password', None, None,),  #: 5
+    (6, TType.I32, 'dest', None, None,),  #: 6
+    (7, TType.I16, 'order', None, None,),  #: 7
+    (8, TType.I16, 'linksdone', None, None,),  #: 8
+    (9, TType.I64, 'sizedone', None, None,),  #: 9
+    (10, TType.I64, 'sizetotal', None, None,),  #: 10
+    (11, TType.I16, 'linkstotal', None, None,),  #: 11
+    (12, TType.LIST, 'links', (TType.STRUCT, (FileData, FileData.thrift_spec)), None,),  #: 12
+    (13, TType.LIST, 'fids', (TType.I32, None), None,),  #: 13
   )
 
 
@@ -491,16 +491,16 @@ class InteractionTask(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'iid', None, None,), # 1
-    (2, TType.I32, 'input', None, None,), # 2
-    (3, TType.LIST, 'structure', (TType.STRING, None), None,), # 3
-    (4, TType.LIST, 'preset', (TType.STRING, None), None,), # 4
-    (5, TType.I32, 'output', None, None,), # 5
-    (6, TType.LIST, 'data', (TType.STRING, None), None,), # 6
-    (7, TType.STRING, 'title', None, None,), # 7
-    (8, TType.STRING, 'description', None, None,), # 8
-    (9, TType.STRING, 'plugin', None, None,), # 9
+    None,  #: 0
+    (1, TType.I32, 'iid', None, None,),  #: 1
+    (2, TType.I32, 'input', None, None,),  #: 2
+    (3, TType.LIST, 'structure', (TType.STRING, None), None,),  #: 3
+    (4, TType.LIST, 'preset', (TType.STRING, None), None,),  #: 4
+    (5, TType.I32, 'output', None, None,),  #: 5
+    (6, TType.LIST, 'data', (TType.STRING, None), None,),  #: 6
+    (7, TType.STRING, 'title', None, None,),  #: 7
+    (8, TType.STRING, 'description', None, None,),  #: 8
+    (9, TType.STRING, 'plugin', None, None,),  #: 9
   )
 
 
@@ -533,11 +533,11 @@ class CaptchaTask(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I16, 'tid', None, None,), # 1
-    (2, TType.STRING, 'data', None, None,), # 2
-    (3, TType.STRING, 'type', None, None,), # 3
-    (4, TType.STRING, 'resultType', None, None,), # 4
+    None,  #: 0
+    (1, TType.I16, 'tid', None, None,),  #: 1
+    (2, TType.STRING, 'data', None, None,),  #: 2
+    (3, TType.STRING, 'type', None, None,),  #: 3
+    (4, TType.STRING, 'resultType', None, None,),  #: 4
   )
 
 
@@ -565,11 +565,11 @@ class EventInfo(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'eventname', None, None,), # 1
-    (2, TType.I32, 'id', None, None,), # 2
-    (3, TType.I32, 'type', None, None,), # 3
-    (4, TType.I32, 'destination', None, None,), # 4
+    None,  #: 0
+    (1, TType.STRING, 'eventname', None, None,),  #: 1
+    (2, TType.I32, 'id', None, None,),  #: 2
+    (3, TType.I32, 'type', None, None,),  #: 3
+    (4, TType.I32, 'destination', None, None,),  #: 4
   )
 
 
@@ -599,12 +599,12 @@ class UserData(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'name', None, None,), # 1
-    (2, TType.STRING, 'email', None, None,), # 2
-    (3, TType.I32, 'role', None, None,), # 3
-    (4, TType.I32, 'permission', None, None,), # 4
-    (5, TType.STRING, 'templateName', None, None,), # 5
+    None,  #: 0
+    (1, TType.STRING, 'name', None, None,),  #: 1
+    (2, TType.STRING, 'email', None, None,),  #: 2
+    (3, TType.I32, 'role', None, None,),  #: 3
+    (4, TType.I32, 'permission', None, None,),  #: 4
+    (5, TType.STRING, 'templateName', None, None,),  #: 5
   )
 
 
@@ -641,15 +641,15 @@ class AccountInfo(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I64, 'validuntil', None, None,), # 1
-    (2, TType.STRING, 'login', None, None,), # 2
-    (3, TType.MAP, 'options', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,), # 3
-    (4, TType.BOOL, 'valid', None, None,), # 4
-    (5, TType.I64, 'trafficleft', None, None,), # 5
-    (6, TType.I64, 'maxtraffic', None, None,), # 6
-    (7, TType.BOOL, 'premium', None, None,), # 7
-    (8, TType.STRING, 'type', None, None,), # 8
+    None,  #: 0
+    (1, TType.I64, 'validuntil', None, None,),  #: 1
+    (2, TType.STRING, 'login', None, None,),  #: 2
+    (3, TType.MAP, 'options', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,),  #: 3
+    (4, TType.BOOL, 'valid', None, None,),  #: 4
+    (5, TType.I64, 'trafficleft', None, None,),  #: 5
+    (6, TType.I64, 'maxtraffic', None, None,),  #: 6
+    (7, TType.BOOL, 'premium', None, None,),  #: 7
+    (8, TType.STRING, 'type', None, None,),  #: 8
   )
 
 
@@ -681,11 +681,11 @@ class ServiceCall(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'plugin', None, None,), # 1
-    (2, TType.STRING, 'func', None, None,), # 2
-    (3, TType.LIST, 'arguments', (TType.STRING, None), None,), # 3
-    (4, TType.BOOL, 'parseArguments', None, None,), # 4
+    None,  #: 0
+    (1, TType.STRING, 'plugin', None, None,),  #: 1
+    (2, TType.STRING, 'func', None, None,),  #: 2
+    (3, TType.LIST, 'arguments', (TType.STRING, None), None,),  #: 3
+    (4, TType.BOOL, 'parseArguments', None, None,),  #: 4
   )
 
 
@@ -715,12 +715,12 @@ class OnlineStatus(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'name', None, None,), # 1
-    (2, TType.STRING, 'plugin', None, None,), # 2
-    (3, TType.STRING, 'packagename', None, None,), # 3
-    (4, TType.I32, 'status', None, None,), # 4
-    (5, TType.I64, 'size', None, None,), # 5
+    None,  #: 0
+    (1, TType.STRING, 'name', None, None,),  #: 1
+    (2, TType.STRING, 'plugin', None, None,),  #: 2
+    (3, TType.STRING, 'packagename', None, None,),  #: 3
+    (4, TType.I32, 'status', None, None,),  #: 4
+    (5, TType.I64, 'size', None, None,),  #: 5
   )
 
 
@@ -745,9 +745,9 @@ class OnlineCheck(TBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'rid', None, None,), # 1
-    (2, TType.MAP, 'data', (TType.STRING, None, TType.STRUCT, (OnlineStatus, OnlineStatus.thrift_spec)), None,), # 2
+    None,  #: 0
+    (1, TType.I32, 'rid', None, None,),  #: 1
+    (2, TType.MAP, 'data', (TType.STRING, None, TType.STRUCT, (OnlineStatus, OnlineStatus.thrift_spec)), None,),  #: 2
   )
 
 
@@ -767,8 +767,8 @@ class PackageDoesNotExists(TExceptionBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'pid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'pid', None, None,),  #: 1
   )
 
 
@@ -791,8 +791,8 @@ class FileDoesNotExists(TExceptionBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.I32, 'fid', None, None,), # 1
+    None,  #: 0
+    (1, TType.I32, 'fid', None, None,),  #: 1
   )
 
 
@@ -817,9 +817,9 @@ class ServiceDoesNotExists(TExceptionBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'plugin', None, None,), # 1
-    (2, TType.STRING, 'func', None, None,), # 2
+    None,  #: 0
+    (1, TType.STRING, 'plugin', None, None,),  #: 1
+    (2, TType.STRING, 'func', None, None,),  #: 2
   )
 
 
@@ -843,8 +843,8 @@ class ServiceException(TExceptionBase):
    ]
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'msg', None, None,), # 1
+    None,  #: 0
+    (1, TType.STRING, 'msg', None, None,),  #: 1
   )
 
 
diff --git a/pyload/utils/__init__.py b/pyload/utils/__init__.py
index 22f92222e..648432c26 100644
--- a/pyload/utils/__init__.py
+++ b/pyload/utils/__init__.py
@@ -8,7 +8,7 @@ import re
 import sys
 import time
 
-#from gettext import gettext
+# from gettext import gettext
 import pylgettext as gettext
 from htmlentitydefs import name2codepoint
 from os.path import join
diff --git a/pyload/utils/pylgettext.py b/pyload/utils/pylgettext.py
index cab631cf4..0e3ebad80 100644
--- a/pyload/utils/pylgettext.py
+++ b/pyload/utils/pylgettext.py
@@ -56,5 +56,5 @@ def find(domain, localedir=None, languages=None, all=False):
     else:
         return results
 
-#Is there a smarter/cleaner pythonic way for this?
+# Is there a smarter/cleaner pythonic way for this?
 translation.func_globals['find'] = find
diff --git a/pyload/webui/app/api.py b/pyload/webui/app/api.py
index 1f335f82e..dd8521a07 100644
--- a/pyload/webui/app/api.py
+++ b/pyload/webui/app/api.py
@@ -68,7 +68,7 @@ def callApi(func, *args, **kwargs):
     return json.dumps(result, cls=TBaseEncoder)
 
 
-#post -> username, password
+# post -> username, password
 @route('/api/login', method='POST')
 def login():
     response.headers.replace("Content-type", "application/json")
diff --git a/pyload/webui/app/json.py b/pyload/webui/app/json.py
index b61f57a8c..700b310a0 100644
--- a/pyload/webui/app/json.py
+++ b/pyload/webui/app/json.py
@@ -278,7 +278,7 @@ def add_account():
 @route('/json/update_accounts', method='POST')
 @login_required("ACCOUNTS")
 def update_accounts():
-    deleted = [] #dont update deleted accs or they will be created again
+    deleted = []  #: dont update deleted accs or they will be created again
 
     for name, value in request.POST.iteritems():
         value = value.strip()
diff --git a/pyload/webui/servers/lighttpd_default.conf b/pyload/webui/servers/lighttpd_default.conf
index aa199b3f3..a821096c6 100644
--- a/pyload/webui/servers/lighttpd_default.conf
+++ b/pyload/webui/servers/lighttpd_default.conf
@@ -47,7 +47,7 @@ index-file.names               = ( "index.php", "index.html",
                                    "index.htm", "default.htm" )
 
 ## set the event-handler (read the performance section in the manual)
-# server.event-handler         = "freebsd-kqueue" # needed on OS X
+# server.event-handler         = "freebsd-kqueue"  #: needed on OS X
 
 # mimetype mapping
 mimetype.assign                = (
diff --git a/tests/APIExerciser.py b/tests/APIExerciser.py
index 5e84bfefe..38dd9fceb 100644
--- a/tests/APIExerciser.py
+++ b/tests/APIExerciser.py
@@ -18,7 +18,7 @@ def createURLs():
     for x in range(0, randint(20, 100)):
         name = "DEBUG_API"
         if randint(0, 5) == 5:
-            name = "" #this link will fail
+            name = ""  #: this link will fail
 
         urls.append(name + "".join(sample(string.ascii_letters, randint(10, 20))))
 
@@ -42,7 +42,7 @@ class APIExerciser(Thread):
         Thread.__init__(self)
         self.setDaemon(True)
         self.core = core
-        self.count = 0 #number of methods
+        self.count = 0  #: number of methods
         self.time = time()
 
         if thrift:
@@ -81,7 +81,7 @@ class APIExerciser(Thread):
             if not self.count % 1000:
                 out.flush()
 
-            if not sumCalled % 1000: #not thread safe
+            if not sumCalled % 1000:  #: not thread safe
                 self.core.log.info("Exercisers tested %d api calls" % sumCalled)
                 persec = sumCalled / (time() - self.time)
                 self.core.log.info("Approx. %.2f calls per second." % persec)