diff options
Diffstat (limited to 'pyload/remote')
| -rw-r--r-- | pyload/remote/ClickNLoadBackend.py | 30 | ||||
| -rw-r--r-- | pyload/remote/ThriftBackend.py | 6 | ||||
| -rw-r--r-- | pyload/remote/socketbackend/create_ttypes.py | 21 | ||||
| -rw-r--r-- | pyload/remote/thriftbackend/Processor.py | 2 | ||||
| -rw-r--r-- | pyload/remote/thriftbackend/Socket.py | 4 | ||||
| -rw-r--r-- | pyload/remote/thriftbackend/ThriftClient.py | 4 | ||||
| -rw-r--r-- | pyload/remote/thriftbackend/ThriftTest.py | 6 |
7 files changed, 37 insertions, 36 deletions
diff --git a/pyload/remote/ClickNLoadBackend.py b/pyload/remote/ClickNLoadBackend.py index 5c08986a7..2d3e29dbc 100644 --- a/pyload/remote/ClickNLoadBackend.py +++ b/pyload/remote/ClickNLoadBackend.py @@ -62,20 +62,20 @@ class CNLHandler(BaseHTTPRequestHandler): def do_GET(self): path = self.path.strip("/").lower() - #self.wfile.write(path+"\n") + # self.wfile.write(path+"\n") - self.map = [ (r"add$", self.add), - (r"addcrypted$", self.addcrypted), - (r"addcrypted2$", self.addcrypted2), - (r"flashgot", self.flashgot), - (r"crossdomain\.xml", self.crossdomain), - (r"checkSupportForUrl", self.checksupport), - (r"jdcheck.js", self.jdcheck), - (r"", self.flash) ] + self.map = [(r"add$", self.add), + (r"addcrypted$", self.addcrypted), + (r"addcrypted2$", self.addcrypted2), + (r"flashgot", self.flashgot), + (r"crossdomain\.xml", self.crossdomain), + (r"checkSupportForUrl", self.checksupport), + (r"jdcheck.js", self.jdcheck), + (r"", self.flash)] func = None for r, f in self.map: - if re.match(r"(flash(got)?/?)?"+r, path): + if re.match(r"(flash(got)?/?)?" + r, path): func = f break @@ -94,11 +94,11 @@ class CNLHandler(BaseHTTPRequestHandler): def do_POST(self): form = FieldStorage( - fp=self.rfile, - headers=self.headers, - environ={'REQUEST_METHOD':'POST', - 'CONTENT_TYPE':self.headers['Content-Type'], - }) + fp=self.rfile, + headers=self.headers, + environ={'REQUEST_METHOD': 'POST', + 'CONTENT_TYPE': self.headers['Content-Type'], + }) self.post = {} for name in form.keys(): diff --git a/pyload/remote/ThriftBackend.py b/pyload/remote/ThriftBackend.py index a6f1841e2..f71e264e2 100644 --- a/pyload/remote/ThriftBackend.py +++ b/pyload/remote/ThriftBackend.py @@ -31,14 +31,14 @@ class ThriftBackend(BackendBase): transport = ServerSocket(port, host, key, cert) -# tfactory = TransportFactoryCompressed() + # tfactory = TransportFactoryCompressed() tfactory = TransportFactory() pfactory = ProtocolFactory() self.server = TServer.TThreadedServer(processor, transport, tfactory, pfactory) - #self.server = TNonblockingServer.TNonblockingServer(processor, transport, tfactory, pfactory) + # self.server = TNonblockingServer.TNonblockingServer(processor, transport, tfactory, pfactory) - #server = TServer.TThreadPoolServer(processor, transport, tfactory, pfactory) + # server = TServer.TThreadPoolServer(processor, transport, tfactory, pfactory) def serve(self): diff --git a/pyload/remote/socketbackend/create_ttypes.py b/pyload/remote/socketbackend/create_ttypes.py index 9b001f1bf..00752dc6b 100644 --- a/pyload/remote/socketbackend/create_ttypes.py +++ b/pyload/remote/socketbackend/create_ttypes.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +from __future__ import with_statement + import inspect import os import platform @@ -12,7 +14,6 @@ from pyload.remote.thriftbackend.thriftgen.pyload.Pyload import Iface def main(): - enums = [] classes = [] @@ -21,19 +22,19 @@ def main(): for name in dir(ttypes): klass = getattr(ttypes, name) - if name in ("TBase", "TExceptionBase") or name.startswith("_") or not (issubclass(klass, ttypes.TBase) or issubclass(klass, ttypes.TExceptionBase)): + if name in ("TBase", "TExceptionBase") or name.startswith("_") or not ( + issubclass(klass, ttypes.TBase) or issubclass(klass, ttypes.TExceptionBase)): continue if hasattr(klass, "thrift_spec"): - classes.append(klass) + classes.append(klass) else: enums.append(klass) - f = open(os.path.join(pypath, "pyload", "api", "types.py"), "wb") - - f.write( - """# -*- coding: utf-8 -*- + with open(os.path.join(pypath, "pyload", "api", "types.py"), "wb") as f: + f.write( +"""# -*- coding: utf-8 -*- # Autogenerated by pyload # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING @@ -43,7 +44,7 @@ class BaseObject(object): """) - ## generate enums + # generate enums for enum in enums: name = enum.__name__ f.write("class %s:\n" % name) @@ -59,10 +60,10 @@ class BaseObject(object): for klass in classes: name = klass.__name__ base = "Exception" if issubclass(klass, ttypes.TExceptionBase) else "BaseObject" - f.write("class %s(%s):\n" % (name, base)) + f.write("class %s(%s):\n" % (name, base)) f.write("\t__slots__ = %s\n\n" % klass.__slots__) - #create init + # create init args = ["self"] + ["%s=None" % x for x in klass.__slots__] f.write("\tdef __init__(%s):\n" % ", ".join(args)) diff --git a/pyload/remote/thriftbackend/Processor.py b/pyload/remote/thriftbackend/Processor.py index 7ccc2bee2..204047e2f 100644 --- a/pyload/remote/thriftbackend/Processor.py +++ b/pyload/remote/thriftbackend/Processor.py @@ -57,7 +57,7 @@ class Processor(Pyload.Processor): # api login self.authenticated[trans] = self._handler.checkAuth(args.username, args.password, trans.remoteaddr[0]) - result.success = True if self.authenticated[trans] else False + result.success = bool(self.authenticated[trans]) oprot.writeMessageBegin("login", Pyload.TMessageType.REPLY, seqid) result.write(oprot) oprot.writeMessageEnd() diff --git a/pyload/remote/thriftbackend/Socket.py b/pyload/remote/thriftbackend/Socket.py index 3d2435a92..0ca9ed178 100644 --- a/pyload/remote/thriftbackend/Socket.py +++ b/pyload/remote/thriftbackend/Socket.py @@ -68,7 +68,7 @@ class Socket(TSocket): else: self.handle = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - #errno 104 connection reset + # errno 104 connection reset self.handle.settimeout(self._timeout) self.handle.connect((self.host, self.port)) @@ -94,7 +94,7 @@ class Socket(TSocket): if e.args == (-1, 'Unexpected EOF'): buff = '' elif e.args == ([('SSL routines', 'SSL23_GET_CLIENT_HELLO', 'unknown protocol')],): - #a socket not using ssl tried to connect + # a socket not using ssl tried to connect buff = '' else: raise diff --git a/pyload/remote/thriftbackend/ThriftClient.py b/pyload/remote/thriftbackend/ThriftClient.py index 4f1c8dcc2..b018fbcc4 100644 --- a/pyload/remote/thriftbackend/ThriftClient.py +++ b/pyload/remote/thriftbackend/ThriftClient.py @@ -49,10 +49,10 @@ class ThriftClient(object): correct = self.client.login(user, password) except error, e: if e.args and e.args[0] == 104: - #connection reset by peer, probably wants ssl + # connection reset by peer, probably wants ssl try: self.createConnection(host, port, True) - #set timeout or a ssl socket will block when querying none ssl server + # set timeout or a ssl socket will block when querying none ssl server self.socket.setTimeout(10) except ImportError: diff --git a/pyload/remote/thriftbackend/ThriftTest.py b/pyload/remote/thriftbackend/ThriftTest.py index 0c5ea4783..c95e060b8 100644 --- a/pyload/remote/thriftbackend/ThriftTest.py +++ b/pyload/remote/thriftbackend/ThriftTest.py @@ -25,7 +25,7 @@ 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 xrange(0, 100)] e = time() try: print "%s: %f s" % (f._Method__name, e-s) @@ -74,8 +74,8 @@ try: bench(client.getServerVersion) bench(client.statusServer) bench(client.statusDownloads) - #bench(client.getQueue) - #bench(client.getCollector) + # bench(client.getQueue) + # bench(client.getCollector) print print client.getServerVersion() |