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

1 files changed, 5 insertions, 6 deletions

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)