From 9973f09a616900ab0900974da77d22b566598b5f Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 14 May 2011 15:37:58 +0200 Subject: improved some code style issues --- module/plugins/crypter/LinkSaveIn.py | 4 ++-- module/plugins/crypter/NCryptIn.py | 6 +++--- module/plugins/crypter/NetfolderIn.py | 4 ++-- module/plugins/crypter/RelinkUs.py | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index d77556b0d..03c385cb3 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -49,7 +49,7 @@ class LinkSaveIn(Crypter): name = self.pyfile.package().name folder = self.pyfile.package().folder self.log.debug("%s: Default to pyfile name [%s] and folder [%s] for package" % (self.__name__, name, folder)) - return (name, folder) + return name, folder def handleCaptcha(self): if "Captcha:" in self.html: @@ -73,7 +73,7 @@ class LinkSaveIn(Crypter): # Log and return self.log.debug("%s: Javascript cipher key function [%s]" % (self.__name__, jk)) - return (crypted, jk) + return crypted, jk def getLinks(self, crypted, jk): diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 438ee9d0d..d2438b285 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -89,7 +89,7 @@ class NCryptIn(Crypter): name = self.package.name folder = self.package.folder self.log.debug("%s: Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (self.__name__, name, folder)) - return (name, folder) + return name, folder def unlockProtection(self): @@ -152,7 +152,7 @@ class NCryptIn(Crypter): try: url = link.replace("link-", "frame-") link = self.load(url, just_header=True)['location'] - except Exception as e: + except Exception, e: self.log.debug("%s: Error decrypting Web link %s, %s" % (self.__name__, link, e)) package_links.append(link) return package_links @@ -196,7 +196,7 @@ class NCryptIn(Crypter): # Log and return self.log.debug("%s: Detected %d crypted blocks" % (self.__name__, len(vcrypted))) - return (vcrypted, vjk) + return vcrypted, vjk def _getLinks(self, crypted, jk): diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py index 9d27c33d6..995eb4d4c 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -71,12 +71,12 @@ class NetfolderIn(Crypter): if m is not None: name = folder = m.group('title') self.log.debug("%s: Found name [%s] and folder [%s] in package info" % (self.__name__, name, folder)) - return (name, folder) + return name, folder else: name = self.pyfile.package().name folder = self.pyfile.package().folder self.log.debug("%s: Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (self.__name__, name, folder)) - return (name, folder) + return name, folder def getLinks(self): diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index 8391deeb4..64fbb9214 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -96,12 +96,12 @@ class RelinkUs(Crypter): if m is not None: name = folder = m.group('title') self.log.debug("%s: Found name [%s] and folder [%s] in package info" % (self.__name__, name, folder)) - return (name, folder) + return name, folder else: name = self.package.name folder = self.package.folder self.log.debug("%s: Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (self.__name__, name, folder)) - return (name, folder) + return name, folder def getCipherParams(self): @@ -120,7 +120,7 @@ class RelinkUs(Crypter): # Log and return self.log.debug("%s: Javascript cipher key function [%s]" % (self.__name__, jk)) - return (crypted, jk) + return crypted, jk def getLinks(self, crypted, jk): -- cgit v1.2.3