Spare code cosmetics

4 files changed, 11 insertions, 13 deletions

diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py
index 456e48a32..5336a0d03 100644
--- a/module/plugins/crypter/EmbeduploadCom.py
+++ b/module/plugins/crypter/EmbeduploadCom.py
@@ -30,7 +30,7 @@ class EmbeduploadCom(Crypter):
 
         m = re.findall(self.LINK_PATTERN, self.html)
         if m:
-            prefered_set = set(self.getConfig("preferedHoster").split('|'))
+            prefered_set = set(self.getConfig('preferedHoster').split('|'))
             prefered_set = map(lambda s: s.lower().split('.')[0], prefered_set)
 
             self.logDebug("PF: %s" % prefered_set)
@@ -39,7 +39,7 @@ class EmbeduploadCom(Crypter):
             self.urls = self.getLocation(tmp_links)
 
             if not self.urls:
-                ignored_set = set(self.getConfig("ignoredHoster").split('|'))
+                ignored_set = set(self.getConfig('ignoredHoster').split('|'))
                 ignored_set = map(lambda s: s.lower().split('.')[0], ignored_set)
 
                 self.logDebug("IG: %s" % ignored_set)
diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py
index d15d2ae4b..baea8886b 100644
--- a/module/plugins/crypter/FilecryptCc.py
+++ b/module/plugins/crypter/FilecryptCc.py
@@ -39,7 +39,7 @@ class FilecryptCc(Crypter):
 
 
     def decrypt(self, pyfile):
-        self.html = self.load(pyfile.url, cookies=True)
+        self.html = self.load(pyfile.url)
 
         if "content notfound" in self.html:  #@NOTE: "content notfound" is NOT a typo
             self.offline()
@@ -64,7 +64,7 @@ class FilecryptCc(Crypter):
         self.logInfo(_("Found %d mirrors") % len(mirror))
 
         for i in mirror[1:]:
-            self.siteWithLinks = self.siteWithLinks + self.load(i, cookies=True).decode("utf-8", "replace")
+            self.siteWithLinks = self.siteWithLinks + self.load(i).decode("utf-8", "replace")
 
 
     def handlePasswordProtection(self):
@@ -78,7 +78,7 @@ class FilecryptCc(Crypter):
         if not password:
             self.fail(_("Please enter the password in package section and try again"))
 
-        self.html = self.load(self.pyfile.url, post={"password": password}, cookies=True)
+        self.html = self.load(self.pyfile.url, post={"password": password})
 
 
     def handleCaptcha(self):
@@ -94,7 +94,6 @@ class FilecryptCc(Crypter):
 
             self.siteWithLinks = self.load(self.pyfile.url,
                                            post={'recaptcha_response_field': captcha_code},
-                                           cookies=True,
                                            decode=True)
         elif m2:  #: circle captcha
             self.logDebug("Captcha-URL: %s" % m2.group(1))
@@ -106,7 +105,6 @@ class FilecryptCc(Crypter):
 
             self.siteWithLinks = self.load(self.pyfile.url,
                                            post={'button.x': captcha_code[0], 'button.y': captcha_code[1]},
-                                           cookies=True,
                                            decode=True)
 
         else:
@@ -142,9 +140,9 @@ class FilecryptCc(Crypter):
             weblinks = re.findall(self.WEBLINK_PATTERN, self.siteWithLinks)
 
             for link in weblinks:
-                res   = self.load("http://filecrypt.cc/Link/%s.html" % link, cookies=True)
+                res   = self.load("http://filecrypt.cc/Link/%s.html" % link)
                 link2 = re.search('<iframe noresize src="(.*)"></iframe>', res)
-                res2  = self.load(link2.group(1), just_header=True, cookies=True)
+                res2  = self.load(link2.group(1), just_header=True)
                 self.links.append(res2['location'])
 
         except Exception, e:
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index 7f24784c7..7dc174d66 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -34,7 +34,7 @@ class LinkdecrypterCom(Crypter):
         retries = 5
 
         post_dict = {"link_cache": "on", "pro_links": pyfile.url, "modo_links": "text"}
-        self.html = self.load('http://linkdecrypter.com/', post=post_dict, cookies=True, decode=True)
+        self.html = self.load('http://linkdecrypter.com/', post=post_dict, decode=True)
 
         while retries:
             m = re.search(self.TEXTAREA_PATTERN, self.html, flags=re.S)
@@ -65,4 +65,4 @@ class LinkdecrypterCom(Crypter):
 
             else:
                 retries -= 1
-                self.html = self.load('http://linkdecrypter.com/', cookies=True, decode=True)
+                self.html = self.load('http://linkdecrypter.com/', decode=True)
diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 55f424f36..006408c4b 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -34,9 +34,9 @@ class MultiloadCz(Crypter):
         else:
             m = re.findall(self.LINK_PATTERN, self.html)
             if m:
-                prefered_set = set(self.getConfig("usedHoster").split('|'))
+                prefered_set = set(self.getConfig('usedHoster').split('|'))
                 self.urls.extend(x[1] for x in m if x[0] in prefered_set)
 
                 if not self.urls:
-                    ignored_set = set(self.getConfig("ignoredHoster").split('|'))
+                    ignored_set = set(self.getConfig('ignoredHoster').split('|'))
                     self.urls.extend(x[1] for x in m if x[0] not in ignored_set)