Merge pull request #3 from vuolter/0.4.10

merge vuolter HEAD

13 files changed, 109 insertions, 85 deletions

diff --git a/pyload/remote/ClickNLoadBackend.py b/pyload/remote/ClickNLoadBackend.py
index 31678ab8b..5c08986a7 100644
--- a/pyload/remote/ClickNLoadBackend.py
+++ b/pyload/remote/ClickNLoadBackend.py
@@ -18,6 +18,7 @@ from pyload.manager.Remote import BackendBase
 core = None
 js = None
 
+
 class ClickNLoadBackend(BackendBase):
 
     def setup(self, host, port):
@@ -31,6 +32,7 @@ class ClickNLoadBackend(BackendBase):
         while self.enabled:
             self.httpd.handle_request()
 
+
 class CNLHandler(BaseHTTPRequestHandler):
 
     def add_package(self, name, urls, queue=0):
diff --git a/pyload/remote/SocketBackend.py b/pyload/remote/SocketBackend.py
index 6b88663f8..8b74d19ff 100644
--- a/pyload/remote/SocketBackend.py
+++ b/pyload/remote/SocketBackend.py
@@ -4,6 +4,7 @@ import SocketServer
 
 from pyload.manager.Remote import BackendBase
 
+
 class RequestHandler(SocketServer.BaseRequestHandler):
 
     def setup(self):
@@ -11,15 +12,13 @@ class RequestHandler(SocketServer.BaseRequestHandler):
 
 
     def handle(self):
-
         print self.request.recv(1024)
 
 
-
 class SocketBackend(BackendBase):
 
     def setup(self, host, port):
-        #local only
+        # local only
         self.server = SocketServer.ThreadingTCPServer(("localhost", port), RequestHandler)
 
 
diff --git a/pyload/remote/ThriftBackend.py b/pyload/remote/ThriftBackend.py
index 0ac7f1bb5..a6f1841e2 100644
--- a/pyload/remote/ThriftBackend.py
+++ b/pyload/remote/ThriftBackend.py
@@ -13,6 +13,7 @@ from pyload.remote.thriftbackend.Transport import TransportFactory
 
 from thrift.server import TServer
 
+
 class ThriftBackend(BackendBase):
 
     def setup(self, host, port):
diff --git a/pyload/remote/socketbackend/create_ttypes.py b/pyload/remote/socketbackend/create_ttypes.py
index 72bc4c231..9b001f1bf 100644
--- a/pyload/remote/socketbackend/create_ttypes.py
+++ b/pyload/remote/socketbackend/create_ttypes.py
@@ -37,6 +37,7 @@ def main():
 # Autogenerated by pyload
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 
+
 class BaseObject(object):
 \t__slots__ = []
 
@@ -48,7 +49,8 @@ class BaseObject(object):
         f.write("class %s:\n" % name)
 
         for attr in dir(enum):
-            if attr.startswith("_") or attr in ("read", "write"): continue
+            if attr.startswith("_") or attr in ("read", "write"):
+                continue
 
             f.write("\t%s = %s\n" % (attr, getattr(enum, attr)))
 
@@ -72,7 +74,8 @@ class BaseObject(object):
     f.write("class Iface(object):\n")
 
     for name in dir(Iface):
-        if name.startswith("_"): continue
+        if name.startswith("_"):
+            continue
 
         func = inspect.getargspec(getattr(Iface, name))
 
diff --git a/pyload/remote/thriftbackend/Processor.py b/pyload/remote/thriftbackend/Processor.py
index 24a0c05b6..7ccc2bee2 100644
--- a/pyload/remote/thriftbackend/Processor.py
+++ b/pyload/remote/thriftbackend/Processor.py
@@ -2,6 +2,7 @@
 
 from pyload.remote.thriftbackend.thriftgen.pyload import Pyload
 
+
 class Processor(Pyload.Processor):
 
     def __init__(self, *args, **kwargs):
@@ -66,7 +67,7 @@ class Processor(Pyload.Processor):
             self._processMap[name](self, seqid, iprot, oprot)
 
         else:
-            #no permission
+            # no permission
             iprot.skip(Pyload.TType.STRUCT)
             iprot.readMessageEnd()
             # 21 - Not authorized
diff --git a/pyload/remote/thriftbackend/Protocol.py b/pyload/remote/thriftbackend/Protocol.py
index c020e7a23..ecf0680ad 100644
--- a/pyload/remote/thriftbackend/Protocol.py
+++ b/pyload/remote/thriftbackend/Protocol.py
@@ -2,12 +2,13 @@
 
 from thrift.protocol import TBinaryProtocol
 
+
 class Protocol(TBinaryProtocol.TBinaryProtocol):
 
     def writeString(self, str):
         try:
             str = str.encode("utf8", "ignore")
-        except Exception, e:
+        except Exception:
             pass
 
         self.writeI32(len(str))
diff --git a/pyload/remote/thriftbackend/Socket.py b/pyload/remote/thriftbackend/Socket.py
index 7d078ab93..3d2435a92 100644
--- a/pyload/remote/thriftbackend/Socket.py
+++ b/pyload/remote/thriftbackend/Socket.py
@@ -10,32 +10,33 @@ from thrift.transport.TSocket import TSocket, TServerSocket, TTransportException
 
 WantReadError = Exception  #: overwritten when ssl is used
 
+
 class SecureSocketConnection(object):
 
     def __init__(self, connection):
-        self.__dict__["connection"] = connection
+        self.__dict__['connection'] = connection
 
 
     def __getattr__(self, name):
-        return getattr(self.__dict__["connection"], name)
+        return getattr(self.__dict__['connection'], name)
 
 
     def __setattr__(self, name, value):
-        setattr(self.__dict__["connection"], name, value)
+        setattr(self.__dict__['connection'], name, value)
 
 
     def shutdown(self, how=1):
-        self.__dict__["connection"].shutdown()
+        self.__dict__['connection'].shutdown()
 
 
     def accept(self):
-        connection, address = self.__dict__["connection"].accept()
+        connection, address = self.__dict__['connection'].accept()
         return SecureSocketConnection(connection), address
 
 
     def send(self, buff):
         try:
-            return self.__dict__["connection"].send(buff)
+            return self.__dict__['connection'].send(buff)
         except WantReadError:
             sleep(0.1)
             return self.send(buff)
@@ -43,11 +44,12 @@ class SecureSocketConnection(object):
 
     def recv(self, buff):
         try:
-            return self.__dict__["connection"].recv(buff)
+            return self.__dict__['connection'].recv(buff)
         except WantReadError:
             sleep(0.1)
             return self.recv(buff)
 
+
 class Socket(TSocket):
 
     def __init__(self, host='localhost', port=7228, ssl=False):
diff --git a/pyload/remote/thriftbackend/ThriftClient.py b/pyload/remote/thriftbackend/ThriftClient.py
index 60a4e9ca9..4f1c8dcc2 100644
--- a/pyload/remote/thriftbackend/ThriftClient.py
+++ b/pyload/remote/thriftbackend/ThriftClient.py
@@ -18,15 +18,19 @@ from pyload.remote.thriftbackend.thriftgen.pyload.ttypes import *
 
 ConnectionClosed = TTransport.TTransportException
 
+
 class WrongLogin(Exception):
     pass
 
+
 class NoConnection(Exception):
     pass
 
+
 class NoSSL(Exception):
     pass
 
+
 class ThriftClient(object):
 
     def __init__(self, host="localhost", port=7227, user="", password=""):
diff --git a/pyload/remote/thriftbackend/ThriftTest.py b/pyload/remote/thriftbackend/ThriftTest.py
index fb8dd03c9..0c5ea4783 100644
--- a/pyload/remote/thriftbackend/ThriftTest.py
+++ b/pyload/remote/thriftbackend/ThriftTest.py
@@ -22,9 +22,10 @@ from time import time
 
 import xmlrpclib
 
+
 def bench(f, *args, **kwargs):
     s = time()
-    ret = [f(*args, **kwargs) for i in range(0, 100)]
+    ret = [f(*args, **kwargs) for _i in range(0, 100)]
     e = time()
     try:
         print "%s: %f s" % (f._Method__name, e-s)
diff --git a/pyload/remote/thriftbackend/Transport.py b/pyload/remote/thriftbackend/Transport.py
index 7ecb16746..1d3d81718 100644
--- a/pyload/remote/thriftbackend/Transport.py
+++ b/pyload/remote/thriftbackend/Transport.py
@@ -3,6 +3,7 @@
 from thrift.transport.TTransport import TBufferedTransport
 from thrift.transport.TZlibTransport import TZlibTransport
 
+
 class Transport(TBufferedTransport):
     DEFAULT_BUFFER = 4096
 
@@ -12,6 +13,7 @@ class Transport(TBufferedTransport):
         self.handle = trans.handle
         self.remoteaddr = trans.handle.getpeername()
 
+
 class TransportCompressed(TZlibTransport):
     DEFAULT_BUFFER = 4096
 
@@ -21,12 +23,14 @@ class TransportCompressed(TZlibTransport):
         self.handle = trans.handle
         self.remoteaddr = trans.handle.getpeername()
 
+
 class TransportFactory(object):
 
     def getTransport(self, trans):
         buffered = Transport(trans)
         return buffered
 
+
 class TransportFactoryCompressed(object):
     _last_trans = None
     _last_z = None
diff --git a/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py b/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py
index a5e730c35..1ba11dbb6 100644
--- a/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py
+++ b/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py
@@ -2705,76 +2705,76 @@ class Processor(Iface, TProcessor):
   def __init__(self, handler):
     self._handler = handler
     self._processMap = {}
-    self._processMap["getConfigValue"] = Processor.process_getConfigValue
-    self._processMap["setConfigValue"] = Processor.process_setConfigValue
-    self._processMap["getConfig"] = Processor.process_getConfig
-    self._processMap["getPluginConfig"] = Processor.process_getPluginConfig
-    self._processMap["pauseServer"] = Processor.process_pauseServer
-    self._processMap["unpauseServer"] = Processor.process_unpauseServer
-    self._processMap["togglePause"] = Processor.process_togglePause
-    self._processMap["statusServer"] = Processor.process_statusServer
-    self._processMap["freeSpace"] = Processor.process_freeSpace
-    self._processMap["getServerVersion"] = Processor.process_getServerVersion
-    self._processMap["kill"] = Processor.process_kill
-    self._processMap["restart"] = Processor.process_restart
-    self._processMap["getLog"] = Processor.process_getLog
-    self._processMap["isTimeDownload"] = Processor.process_isTimeDownload
-    self._processMap["isTimeReconnect"] = Processor.process_isTimeReconnect
-    self._processMap["toggleReconnect"] = Processor.process_toggleReconnect
-    self._processMap["generatePackages"] = Processor.process_generatePackages
-    self._processMap["checkURLs"] = Processor.process_checkURLs
-    self._processMap["parseURLs"] = Processor.process_parseURLs
-    self._processMap["checkOnlineStatus"] = Processor.process_checkOnlineStatus
-    self._processMap["checkOnlineStatusContainer"] = Processor.process_checkOnlineStatusContainer
-    self._processMap["pollResults"] = Processor.process_pollResults
-    self._processMap["statusDownloads"] = Processor.process_statusDownloads
-    self._processMap["getPackageData"] = Processor.process_getPackageData
-    self._processMap["getPackageInfo"] = Processor.process_getPackageInfo
-    self._processMap["getFileData"] = Processor.process_getFileData
-    self._processMap["getQueue"] = Processor.process_getQueue
-    self._processMap["getCollector"] = Processor.process_getCollector
-    self._processMap["getQueueData"] = Processor.process_getQueueData
-    self._processMap["getCollectorData"] = Processor.process_getCollectorData
-    self._processMap["getPackageOrder"] = Processor.process_getPackageOrder
-    self._processMap["getFileOrder"] = Processor.process_getFileOrder
-    self._processMap["generateAndAddPackages"] = Processor.process_generateAndAddPackages
-    self._processMap["addPackage"] = Processor.process_addPackage
-    self._processMap["addFiles"] = Processor.process_addFiles
-    self._processMap["uploadContainer"] = Processor.process_uploadContainer
-    self._processMap["deleteFiles"] = Processor.process_deleteFiles
-    self._processMap["deletePackages"] = Processor.process_deletePackages
-    self._processMap["pushToQueue"] = Processor.process_pushToQueue
-    self._processMap["pullFromQueue"] = Processor.process_pullFromQueue
-    self._processMap["restartPackage"] = Processor.process_restartPackage
-    self._processMap["restartFile"] = Processor.process_restartFile
-    self._processMap["recheckPackage"] = Processor.process_recheckPackage
-    self._processMap["stopAllDownloads"] = Processor.process_stopAllDownloads
-    self._processMap["stopDownloads"] = Processor.process_stopDownloads
-    self._processMap["setPackageName"] = Processor.process_setPackageName
-    self._processMap["movePackage"] = Processor.process_movePackage
-    self._processMap["moveFiles"] = Processor.process_moveFiles
-    self._processMap["orderPackage"] = Processor.process_orderPackage
-    self._processMap["orderFile"] = Processor.process_orderFile
-    self._processMap["setPackageData"] = Processor.process_setPackageData
-    self._processMap["deleteFinished"] = Processor.process_deleteFinished
-    self._processMap["restartFailed"] = Processor.process_restartFailed
-    self._processMap["getEvents"] = Processor.process_getEvents
-    self._processMap["getAccounts"] = Processor.process_getAccounts
-    self._processMap["getAccountTypes"] = Processor.process_getAccountTypes
-    self._processMap["updateAccount"] = Processor.process_updateAccount
-    self._processMap["removeAccount"] = Processor.process_removeAccount
-    self._processMap["login"] = Processor.process_login
-    self._processMap["getUserData"] = Processor.process_getUserData
-    self._processMap["getAllUserData"] = Processor.process_getAllUserData
-    self._processMap["getServices"] = Processor.process_getServices
-    self._processMap["hasService"] = Processor.process_hasService
-    self._processMap["call"] = Processor.process_call
-    self._processMap["getAllInfo"] = Processor.process_getAllInfo
-    self._processMap["getInfoByPlugin"] = Processor.process_getInfoByPlugin
-    self._processMap["isCaptchaWaiting"] = Processor.process_isCaptchaWaiting
-    self._processMap["getCaptchaTask"] = Processor.process_getCaptchaTask
-    self._processMap["getCaptchaTaskStatus"] = Processor.process_getCaptchaTaskStatus
-    self._processMap["setCaptchaResult"] = Processor.process_setCaptchaResult
+    self._processMap['getConfigValue'] = Processor.process_getConfigValue
+    self._processMap['setConfigValue'] = Processor.process_setConfigValue
+    self._processMap['getConfig'] = Processor.process_getConfig
+    self._processMap['getPluginConfig'] = Processor.process_getPluginConfig
+    self._processMap['pauseServer'] = Processor.process_pauseServer
+    self._processMap['unpauseServer'] = Processor.process_unpauseServer
+    self._processMap['togglePause'] = Processor.process_togglePause
+    self._processMap['statusServer'] = Processor.process_statusServer
+    self._processMap['freeSpace'] = Processor.process_freeSpace
+    self._processMap['getServerVersion'] = Processor.process_getServerVersion
+    self._processMap['kill'] = Processor.process_kill
+    self._processMap['restart'] = Processor.process_restart
+    self._processMap['getLog'] = Processor.process_getLog
+    self._processMap['isTimeDownload'] = Processor.process_isTimeDownload
+    self._processMap['isTimeReconnect'] = Processor.process_isTimeReconnect
+    self._processMap['toggleReconnect'] = Processor.process_toggleReconnect
+    self._processMap['generatePackages'] = Processor.process_generatePackages
+    self._processMap['checkURLs'] = Processor.process_checkURLs
+    self._processMap['parseURLs'] = Processor.process_parseURLs
+    self._processMap['checkOnlineStatus'] = Processor.process_checkOnlineStatus
+    self._processMap['checkOnlineStatusContainer'] = Processor.process_checkOnlineStatusContainer
+    self._processMap['pollResults'] = Processor.process_pollResults
+    self._processMap['statusDownloads'] = Processor.process_statusDownloads
+    self._processMap['getPackageData'] = Processor.process_getPackageData
+    self._processMap['getPackageInfo'] = Processor.process_getPackageInfo
+    self._processMap['getFileData'] = Processor.process_getFileData
+    self._processMap['getQueue'] = Processor.process_getQueue
+    self._processMap['getCollector'] = Processor.process_getCollector
+    self._processMap['getQueueData'] = Processor.process_getQueueData
+    self._processMap['getCollectorData'] = Processor.process_getCollectorData
+    self._processMap['getPackageOrder'] = Processor.process_getPackageOrder
+    self._processMap['getFileOrder'] = Processor.process_getFileOrder
+    self._processMap['generateAndAddPackages'] = Processor.process_generateAndAddPackages
+    self._processMap['addPackage'] = Processor.process_addPackage
+    self._processMap['addFiles'] = Processor.process_addFiles
+    self._processMap['uploadContainer'] = Processor.process_uploadContainer
+    self._processMap['deleteFiles'] = Processor.process_deleteFiles
+    self._processMap['deletePackages'] = Processor.process_deletePackages
+    self._processMap['pushToQueue'] = Processor.process_pushToQueue
+    self._processMap['pullFromQueue'] = Processor.process_pullFromQueue
+    self._processMap['restartPackage'] = Processor.process_restartPackage
+    self._processMap['restartFile'] = Processor.process_restartFile
+    self._processMap['recheckPackage'] = Processor.process_recheckPackage
+    self._processMap['stopAllDownloads'] = Processor.process_stopAllDownloads
+    self._processMap['stopDownloads'] = Processor.process_stopDownloads
+    self._processMap['setPackageName'] = Processor.process_setPackageName
+    self._processMap['movePackage'] = Processor.process_movePackage
+    self._processMap['moveFiles'] = Processor.process_moveFiles
+    self._processMap['orderPackage'] = Processor.process_orderPackage
+    self._processMap['orderFile'] = Processor.process_orderFile
+    self._processMap['setPackageData'] = Processor.process_setPackageData
+    self._processMap['deleteFinished'] = Processor.process_deleteFinished
+    self._processMap['restartFailed'] = Processor.process_restartFailed
+    self._processMap['getEvents'] = Processor.process_getEvents
+    self._processMap['getAccounts'] = Processor.process_getAccounts
+    self._processMap['getAccountTypes'] = Processor.process_getAccountTypes
+    self._processMap['updateAccount'] = Processor.process_updateAccount
+    self._processMap['removeAccount'] = Processor.process_removeAccount
+    self._processMap['login'] = Processor.process_login
+    self._processMap['getUserData'] = Processor.process_getUserData
+    self._processMap['getAllUserData'] = Processor.process_getAllUserData
+    self._processMap['getServices'] = Processor.process_getServices
+    self._processMap['hasService'] = Processor.process_hasService
+    self._processMap['call'] = Processor.process_call
+    self._processMap['getAllInfo'] = Processor.process_getAllInfo
+    self._processMap['getInfoByPlugin'] = Processor.process_getInfoByPlugin
+    self._processMap['isCaptchaWaiting'] = Processor.process_isCaptchaWaiting
+    self._processMap['getCaptchaTask'] = Processor.process_getCaptchaTask
+    self._processMap['getCaptchaTaskStatus'] = Processor.process_getCaptchaTaskStatus
+    self._processMap['setCaptchaResult'] = Processor.process_setCaptchaResult
 
 
   def process(self, iprot, oprot):
@@ -3652,6 +3652,7 @@ class Processor(Iface, TProcessor):
 
 # HELPER FUNCTIONS AND STRUCTURES
 
+
 class getConfigValue_args(TBase):
   """
   Attributes:
diff --git a/pyload/remote/thriftbackend/thriftgen/pyload/constants.py b/pyload/remote/thriftbackend/thriftgen/pyload/constants.py
index 3bdd64cc1..e0a811c8a 100644
--- a/pyload/remote/thriftbackend/thriftgen/pyload/constants.py
+++ b/pyload/remote/thriftbackend/thriftgen/pyload/constants.py
@@ -8,3 +8,4 @@
 
 from thrift.Thrift import TType, TMessageType, TException
 from ttypes import *
+
diff --git a/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py b/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py
index 1c18f6421..8abd775a9 100644
--- a/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py
+++ b/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py
@@ -64,6 +64,7 @@ class DownloadStatus(TBase):
     "Unknown": 14,
   }
 
+
 class Destination(TBase):
   Collector = 0
   Queue = 1
@@ -78,6 +79,7 @@ class Destination(TBase):
     "Queue": 1,
   }
 
+
 class ElementType(TBase):
   Package = 0
   File = 1
@@ -92,6 +94,7 @@ class ElementType(TBase):
     "File": 1,
   }
 
+
 class Input(TBase):
   NONE = 0
   TEXT = 1
@@ -130,6 +133,7 @@ class Input(TBase):
     "TABLE": 9,
   }
 
+
 class Output(TBase):
   CAPTCHA = 1
   QUESTION = 2