Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/hoster/RehostTo.py
	module/plugins/hoster/XVideosCom.py
	module/plugins/hoster/ZeveraCom.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/account/FilefactoryCom.py
	pyload/plugin/account/OneFichierCom.py
	pyload/plugin/account/WebshareCz.py
	pyload/plugin/addon/AntiVirus.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/container/CCF.py
	pyload/plugin/crypter/Go4UpCom.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/Ftp.py
	pyload/plugin/hoster/GigapetaCom.py
	pyload/plugin/hoster/MegaRapidCz.py
	pyload/plugin/hoster/MegaRapidoNet.py
	pyload/plugin/hoster/MultishareCz.py
	pyload/plugin/hoster/NarodRu.py
	pyload/plugin/hoster/QuickshareCz.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RapiduNet.py
	pyload/plugin/hoster/UnibytesCom.py
	pyload/plugin/hoster/UploadingCom.py
	pyload/plugin/hoster/WrzucTo.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSCrypter.py
	pyload/plugin/internal/XFSHoster.py

6 files changed, 21 insertions, 21 deletions

diff --git a/pyload/plugin/hook/BypassCaptcha.py b/pyload/plugin/hook/BypassCaptcha.py
index 95be5f3a6..8e8a27d8c 100644
--- a/pyload/plugin/hook/BypassCaptcha.py
+++ b/pyload/plugin/hook/BypassCaptcha.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from pycurl import FORM_FILE, LOW_SPEED_TIME
+import pycurl
 
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getURL, getRequest
@@ -58,14 +58,14 @@ class BypassCaptcha(Hook):
         req = getRequest()
 
         # raise timeout threshold
-        req.c.setopt(LOW_SPEED_TIME, 80)
+        req.c.setopt(pycurl.LOW_SPEED_TIME, 80)
 
         try:
             res = req.load(self.SUBMIT_URL,
                            post={'vendor_key': self.PYLOAD_KEY,
                                  'key': self.getConfig('passkey'),
                                  'gen_task_id': "1",
-                                 'file': (FORM_FILE, captcha)},
+                                 'file': (pycurl.FORM_FILE, captcha)},
                            multipart=True)
         finally:
             req.close()
diff --git a/pyload/plugin/hook/CaptchaBrotherhood.py b/pyload/plugin/hook/CaptchaBrotherhood.py
index 97e1ff25f..75c7d55b7 100644
--- a/pyload/plugin/hook/CaptchaBrotherhood.py
+++ b/pyload/plugin/hook/CaptchaBrotherhood.py
@@ -5,14 +5,13 @@ from __future__ import with_statement
 import StringIO
 import pycurl
 import time
+import urllib
 
 try:
     from PIL import Image
 except ImportError:
     import Image
 
-from urllib import urlencode
-
 from pyload.network.RequestFactory import getURL, getRequest
 from pyload.plugin.Hook import Hook, threaded
 
@@ -89,10 +88,10 @@ class CaptchaBrotherhood(Hook):
         req = getRequest()
 
         url = "%ssendNewCaptcha.aspx?%s" % (self.API_URL,
-                                            urlencode({'username'     : self.getConfig('username'),
-                                                       'password'     : self.getConfig('passkey'),
-                                                       'captchaSource': "pyLoad",
-                                                       'timeout'      : "80"}))
+                                            urllib.urlencode({'username'     : self.getConfig('username'),
+                                                              'password'     : self.getConfig('passkey'),
+                                                              'captchaSource': "pyLoad",
+                                                              'timeout'      : "80"}))
 
         req.c.setopt(pycurl.URL, url)
         req.c.setopt(pycurl.POST, 1)
diff --git a/pyload/plugin/hook/DeathByCaptcha.py b/pyload/plugin/hook/DeathByCaptcha.py
index 71d1ddb0a..670807bf5 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 re
 import time
 
 from base64 import b64encode
-from pycurl import FORM_FILE, HTTPHEADER
 
 from pyload.utils import json_loads
 from pyload.network.HTTPRequest import BadHeader
@@ -73,7 +73,7 @@ class DeathByCaptcha(Hook):
 
     def api_response(self, api="captcha", post=False, multipart=False):
         req = getRequest()
-        req.c.setopt(HTTPHEADER, ["Accept: application/json", "User-Agent: pyLoad %s" % self.core.version])
+        req.c.setopt(pycurl.HTTPHEADER, ["Accept: application/json", "User-Agent: pyLoad %s" % self.core.version])
 
         if post:
             if not isinstance(post, dict):
@@ -134,7 +134,7 @@ class DeathByCaptcha(Hook):
         #@NOTE: Workaround multipart-post bug in HTTPRequest.py
         if re.match("^\w*$", self.getConfig('passkey')):
             multipart = True
-            data = (FORM_FILE, captcha)
+            data = (pycurl.FORM_FILE, captcha)
         else:
             multipart = False
             with open(captcha, 'rb') as f:
diff --git a/pyload/plugin/hook/ExpertDecoders.py b/pyload/plugin/hook/ExpertDecoders.py
index 843c786bc..0727c0407 100644
--- a/pyload/plugin/hook/ExpertDecoders.py
+++ b/pyload/plugin/hook/ExpertDecoders.py
@@ -2,9 +2,10 @@
 
 from __future__ import with_statement
 
+import pycurl
+import uuid
+
 from base64 import b64encode
-from pycurl import LOW_SPEED_TIME
-from uuid import uuid4
 
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getURL, getRequest
@@ -47,7 +48,7 @@ class ExpertDecoders(Hook):
 
     @threaded
     def _processCaptcha(self, task):
-        task.data['ticket'] = ticket = uuid4()
+        task.data['ticket'] = ticket = uuid.uuid4()
         result = None
 
         with open(task.captchaFile, 'rb') as f:
@@ -55,7 +56,7 @@ class ExpertDecoders(Hook):
 
         req = getRequest()
         # raise timeout threshold
-        req.c.setopt(LOW_SPEED_TIME, 80)
+        req.c.setopt(pycurl.LOW_SPEED_TIME, 80)
 
         try:
             result = req.load(self.API_URL,
diff --git a/pyload/plugin/hook/ImageTyperz.py b/pyload/plugin/hook/ImageTyperz.py
index c134cdaeb..3f0147776 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 re
 
 from base64 import b64encode
-from pycurl import FORM_FILE, LOW_SPEED_TIME
 
 from pyload.network.RequestFactory import getURL, getRequest
 from pyload.plugin.Hook import Hook, threaded
@@ -70,13 +70,13 @@ class ImageTyperz(Hook):
     def submit(self, captcha, captchaType="file", match=None):
         req = getRequest()
         # raise timeout threshold
-        req.c.setopt(LOW_SPEED_TIME, 80)
+        req.c.setopt(pycurl.LOW_SPEED_TIME, 80)
 
         try:
             #@NOTE: Workaround multipart-post bug in HTTPRequest.py
             if re.match("^\w*$", self.getConfig('passkey')):
                 multipart = True
-                data = (FORM_FILE, captcha)
+                data = (pycurl.FORM_FILE, captcha)
             else:
                 multipart = False
                 with open(captcha, 'rb') as f:
diff --git a/pyload/plugin/hook/XFileSharingPro.py b/pyload/plugin/hook/XFileSharingPro.py
index 7fee029da..3c305c74b 100644
--- a/pyload/plugin/hook/XFileSharingPro.py
+++ b/pyload/plugin/hook/XFileSharingPro.py
@@ -8,7 +8,7 @@ from pyload.plugin.Hook import Hook
 class XFileSharingPro(Hook):
     __name    = "XFileSharingPro"
     __type    = "hook"
-    __version = "0.36"
+    __version = "0.37"
 
     __config = [("activated"       , "bool", "Activated"                     , True ),
                   ("use_hoster_list" , "bool", "Load listed hosters only"      , False),
@@ -35,7 +35,7 @@ class XFileSharingPro(Hook):
                        # NOT TESTED:
                        "101shared.com", "4upfiles.com", "filemaze.ws", "filenuke.com", "linkzhost.com", "mightyupload.com",
                        "rockdizfile.com", "sharebeast.com", "sharerepo.com", "shareswift.com", "uploadbaz.com", "uploadc.com",
-                       "vidbull.com", "zalaa.com", "zomgupload.com",
+                       "vidbull.com", "worldbytez.com", "zalaa.com", "zomgupload.com",
                        # NOT WORKING:
                        "amonshare.com", "banicrazy.info", "boosterking.com", "host4desi.com", "laoupload.com", "rd-fs.com"]
     CRYPTER_BUILTIN = ["junocloud.me", "rapidfileshare.net"]