summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/crypter
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugin/crypter')
-rw-r--r--pyload/plugin/crypter/DuckCryptInfo.py6
-rw-r--r--pyload/plugin/crypter/FilecryptCc.py4
-rw-r--r--pyload/plugin/crypter/HoerbuchIn.py4
-rw-r--r--pyload/plugin/crypter/LinkCryptWs.py4
-rw-r--r--pyload/plugin/crypter/NCryptIn.py4
-rw-r--r--pyload/plugin/crypter/RelinkUs.py5
-rw-r--r--pyload/plugin/crypter/SafelinkingNet.py4
-rw-r--r--pyload/plugin/crypter/ShareLinksBiz.py5
8 files changed, 19 insertions, 17 deletions
diff --git a/pyload/plugin/crypter/DuckCryptInfo.py b/pyload/plugin/crypter/DuckCryptInfo.py
index 3463d44f9..64d6568ce 100644
--- a/pyload/plugin/crypter/DuckCryptInfo.py
+++ b/pyload/plugin/crypter/DuckCryptInfo.py
@@ -2,7 +2,7 @@
import re
-from BeautifulSoup import BeautifulSoup
+import BeautifulSoup
from pyload.plugin.Crypter import Crypter
@@ -41,7 +41,7 @@ class DuckCryptInfo(Crypter):
m = re.match(self.__pattern, html)
self.logDebug("Redirectet to " + str(m.group(0)))
html = self.load(str(m.group(0)))
- soup = BeautifulSoup(html)
+ soup = BeautifulSoup.BeautifulSoup(html)
cryptlinks = soup.findAll("div", attrs={"class": "folderbox"})
self.logDebug("Redirectet to " + str(cryptlinks))
if not cryptlinks:
@@ -53,7 +53,7 @@ class DuckCryptInfo(Crypter):
def handleLink(self, url):
html = self.load(url)
- soup = BeautifulSoup(html)
+ soup = BeautifulSoup.BeautifulSoup(html)
self.urls = [soup.find("iframe")['src']]
if not self.urls:
self.logInfo(_("No link found"))
diff --git a/pyload/plugin/crypter/FilecryptCc.py b/pyload/plugin/crypter/FilecryptCc.py
index db939357a..0507a580b 100644
--- a/pyload/plugin/crypter/FilecryptCc.py
+++ b/pyload/plugin/crypter/FilecryptCc.py
@@ -7,7 +7,7 @@ import binascii
import re
import urlparse
-from Crypto.Cipher import AES
+import Crypto
from pyload.plugin.Crypter import Crypter
from pyload.plugin.captcha.ReCaptcha import ReCaptcha
@@ -169,7 +169,7 @@ class FilecryptCc(Crypter):
# Decrypt
Key = key
IV = key
- obj = AES.new(Key, AES.MODE_CBC, IV)
+ obj = Crypto.Cipher.AES.new(Key, Crypto.Cipher.AES.MODE_CBC, IV)
text = obj.decrypt(crypted.decode('base64'))
# Extract links
diff --git a/pyload/plugin/crypter/HoerbuchIn.py b/pyload/plugin/crypter/HoerbuchIn.py
index 500dad8cc..455d0abdf 100644
--- a/pyload/plugin/crypter/HoerbuchIn.py
+++ b/pyload/plugin/crypter/HoerbuchIn.py
@@ -2,7 +2,7 @@
import re
-from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
+import BeautifulSoup, BeautifulStoneSoup
from pyload.plugin.Crypter import Crypter
@@ -31,7 +31,7 @@ class HoerbuchIn(Crypter):
if self.article.match(pyfile.url):
html = self.load(pyfile.url)
- soup = BeautifulSoup(html, convertEntities=BeautifulStoneSoup.HTML_ENTITIES)
+ soup = BeautifulSoup.BeautifulSoup(html, convertEntities=BeautifulStoneSoup.HTML_ENTITIES)
abookname = soup.find("a", attrs={"rel": "bookmark"}).text
for a in soup.findAll("a", attrs={"href": self.protection}):
diff --git a/pyload/plugin/crypter/LinkCryptWs.py b/pyload/plugin/crypter/LinkCryptWs.py
index c997cbf9f..98a796aed 100644
--- a/pyload/plugin/crypter/LinkCryptWs.py
+++ b/pyload/plugin/crypter/LinkCryptWs.py
@@ -5,7 +5,7 @@ import re
import pycurl
-from Crypto.Cipher import AES
+import Crypto
from pyload.plugin.Crypter import Crypter
from pyload.utils import html_unescape
@@ -309,7 +309,7 @@ class LinkCryptWs(Crypter):
# Decrypt
Key = key
IV = key
- obj = AES.new(Key, AES.MODE_CBC, IV)
+ obj = Crypto.Cipher.AES.new(Key, Crypto.Cipher.AES.MODE_CBC, IV)
text = obj.decrypt(crypted.decode('base64'))
# Extract links
diff --git a/pyload/plugin/crypter/NCryptIn.py b/pyload/plugin/crypter/NCryptIn.py
index bc9702f21..2b357395b 100644
--- a/pyload/plugin/crypter/NCryptIn.py
+++ b/pyload/plugin/crypter/NCryptIn.py
@@ -3,7 +3,7 @@
import binascii
import re
-from Crypto.Cipher import AES
+import Crypto
from pyload.plugin.Crypter import Crypter
from pyload.plugin.captcha.ReCaptcha import ReCaptcha
@@ -298,7 +298,7 @@ class NCryptIn(Crypter):
# Decrypt
Key = key
IV = key
- obj = AES.new(Key, AES.MODE_CBC, IV)
+ obj = Crypto.Cipher.AES.new(Key, Crypto.Cipher.AES.MODE_CBC, IV)
text = obj.decrypt(crypted.decode('base64'))
# Extract links
diff --git a/pyload/plugin/crypter/RelinkUs.py b/pyload/plugin/crypter/RelinkUs.py
index 2b9a85401..3ffc33c12 100644
--- a/pyload/plugin/crypter/RelinkUs.py
+++ b/pyload/plugin/crypter/RelinkUs.py
@@ -6,7 +6,8 @@ import binascii
import re
import os
-from Crypto.Cipher import AES
+import Crypto
+
from pyload.plugin.Crypter import Crypter
from pyload.utils import fs_join
@@ -281,7 +282,7 @@ class RelinkUs(Crypter):
# Decrypt
Key = key
IV = key
- obj = AES.new(Key, AES.MODE_CBC, IV)
+ obj = Crypto.Cipher.AES.new(Key, Crypto.Cipher.AES.MODE_CBC, IV)
text = obj.decrypt(crypted.decode('base64'))
# Extract links
diff --git a/pyload/plugin/crypter/SafelinkingNet.py b/pyload/plugin/crypter/SafelinkingNet.py
index a949d17b1..71f41469b 100644
--- a/pyload/plugin/crypter/SafelinkingNet.py
+++ b/pyload/plugin/crypter/SafelinkingNet.py
@@ -2,7 +2,7 @@
import re
-from BeautifulSoup import BeautifulSoup
+import BeautifulSoup
from pyload.utils import json_loads
from pyload.plugin.Crypter import Crypter
@@ -66,7 +66,7 @@ class SafelinkingNet(Crypter):
break
pyfile.package().password = ""
- soup = BeautifulSoup(self.html)
+ soup = BeautifulSoup.BeautifulSoup(self.html)
scripts = soup.findAll("script")
for s in scripts:
if "d_links" in s.text:
diff --git a/pyload/plugin/crypter/ShareLinksBiz.py b/pyload/plugin/crypter/ShareLinksBiz.py
index 8add5214d..25e891f3b 100644
--- a/pyload/plugin/crypter/ShareLinksBiz.py
+++ b/pyload/plugin/crypter/ShareLinksBiz.py
@@ -3,7 +3,8 @@
import binascii
import re
-from Crypto.Cipher import AES
+import Crypto
+
from pyload.plugin.Crypter import Crypter
@@ -267,7 +268,7 @@ class ShareLinksBiz(Crypter):
# Decrypt
Key = key
IV = key
- obj = AES.new(Key, AES.MODE_CBC, IV)
+ obj = Crypto.Cipher.AES.new(Key, Crypto.Cipher.AES.MODE_CBC, IV)
text = obj.decrypt(crypted.decode('base64'))
# Extract links
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-14 12:24:01 +0100