From 20226f8cc5889efbefa61209e1adf6184d42cd00 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Apr 2015 01:21:41 +0200 Subject: Spare code cosmetics (3) --- pyload/remote/thriftbackend/Socket.py | 14 +-- .../thriftbackend/thriftgen/pyload/Pyload.py | 140 ++++++++++----------- 2 files changed, 77 insertions(+), 77 deletions(-) (limited to 'pyload/remote') diff --git a/pyload/remote/thriftbackend/Socket.py b/pyload/remote/thriftbackend/Socket.py index 7d078ab93..4dd66e368 100644 --- a/pyload/remote/thriftbackend/Socket.py +++ b/pyload/remote/thriftbackend/Socket.py @@ -13,29 +13,29 @@ 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,7 +43,7 @@ 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) diff --git a/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py b/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py index a5e730c35..350fe4bc7 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): -- cgit v1.2.3