summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/hook
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugin/hook')
-rw-r--r--pyload/plugin/hook/Captcha9Kw.py5
-rw-r--r--pyload/plugin/hook/DeathByCaptcha.py6
-rw-r--r--pyload/plugin/hook/ExpertDecoders.py6
-rw-r--r--pyload/plugin/hook/ImageTyperz.py6
4 files changed, 11 insertions, 12 deletions
diff --git a/pyload/plugin/hook/Captcha9Kw.py b/pyload/plugin/hook/Captcha9Kw.py
index 9ceab4b2b..32aaba0f5 100644
--- a/pyload/plugin/hook/Captcha9Kw.py
+++ b/pyload/plugin/hook/Captcha9Kw.py
@@ -2,11 +2,10 @@
from __future__ import with_statement
+import base64
import re
import time
-from base64 import b64encode
-
from pyload.network.HTTPRequest import BadHeader
from pyload.network.RequestFactory import getURL
@@ -121,7 +120,7 @@ class Captcha9Kw(Hook):
'source' : "pyload",
'base64' : "1",
'mouse' : 1 if task.isPositional() else 0,
- 'file-upload-01': b64encode(data),
+ 'file-upload-01': base64.b64encode(data),
'action' : "usercaptchaupload"}
for _i in xrange(5):
diff --git a/pyload/plugin/hook/DeathByCaptcha.py b/pyload/plugin/hook/DeathByCaptcha.py
index 670807bf5..ddcdeae8a 100644
--- a/pyload/plugin/hook/DeathByCaptcha.py
+++ b/pyload/plugin/hook/DeathByCaptcha.py
@@ -2,11 +2,11 @@
from __future__ import with_statement
-import pycurl
+import base64
import re
import time
-from base64 import b64encode
+import pycurl
from pyload.utils import json_loads
from pyload.network.HTTPRequest import BadHeader
@@ -139,7 +139,7 @@ class DeathByCaptcha(Hook):
multipart = False
with open(captcha, 'rb') as f:
data = f.read()
- data = "base64:" + b64encode(data)
+ data = "base64:" + base64.b64encode(data)
res = self.api_response("captcha", {"captchafile": data}, multipart)
diff --git a/pyload/plugin/hook/ExpertDecoders.py b/pyload/plugin/hook/ExpertDecoders.py
index 0727c0407..2e05e7386 100644
--- a/pyload/plugin/hook/ExpertDecoders.py
+++ b/pyload/plugin/hook/ExpertDecoders.py
@@ -2,10 +2,10 @@
from __future__ import with_statement
-import pycurl
+import base64
import uuid
-from base64 import b64encode
+import pycurl
from pyload.network.HTTPRequest import BadHeader
from pyload.network.RequestFactory import getURL, getRequest
@@ -62,7 +62,7 @@ class ExpertDecoders(Hook):
result = req.load(self.API_URL,
post={'action' : "upload",
'key' : self.getConfig('passkey'),
- 'file' : b64encode(data),
+ 'file' : base64.b64encode(data),
'gen_task_id': ticket})
finally:
req.close()
diff --git a/pyload/plugin/hook/ImageTyperz.py b/pyload/plugin/hook/ImageTyperz.py
index 3f0147776..039710436 100644
--- a/pyload/plugin/hook/ImageTyperz.py
+++ b/pyload/plugin/hook/ImageTyperz.py
@@ -2,10 +2,10 @@
from __future__ import with_statement
-import pycurl
+import base64
import re
-from base64 import b64encode
+import pycurl
from pyload.network.RequestFactory import getURL, getRequest
from pyload.plugin.Hook import Hook, threaded
@@ -81,7 +81,7 @@ class ImageTyperz(Hook):
multipart = False
with open(captcha, 'rb') as f:
data = f.read()
- data = b64encode(data)
+ data = base64.b64encode(data)
res = req.load(self.SUBMIT_URL,
post={'action': "UPLOADCAPTCHA",