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, 7 insertions, 10 deletions

diff --git a/pyload/plugin/internal/BasePlugin.py b/pyload/plugin/internal/BasePlugin.py
index c5fbde8bb..6be9880fc 100644
--- a/pyload/plugin/internal/BasePlugin.py
+++ b/pyload/plugin/internal/BasePlugin.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
 import re
-
-from urllib import unquote
-from urlparse import urljoin, urlparse
+import urllib
+import urlparse
 
 from pyload.network.HTTPRequest import BadHeader
 from pyload.plugin.internal.SimpleHoster import getFileURL
@@ -13,7 +12,7 @@ from pyload.plugin.Hoster import Hoster
 class BasePlugin(Hoster):
     __name    = "BasePlugin"
     __type    = "hoster"
-    __version = "0.42"
+    __version = "0.43"
 
     __pattern = r'^unmatchable$'
 
@@ -25,8 +24,8 @@ class BasePlugin(Hoster):
 
     @classmethod
     def getInfo(cls, url="", html=""):  #@TODO: Move to hoster class in 0.4.10
-        url   = unquote(url)
-        url_p = urlparse(url)
+        url   = urllib.unquote(url)
+        url_p = urlparse.urlparse(url)
         return {'name'  : (url_p.path.split('/')[-1]
                            or url_p.query.split('=', 1)[::-1][0].split('&', 1)[0]
                            or url_p.netloc.split('.', 1)[0]),
@@ -39,8 +38,6 @@ class BasePlugin(Hoster):
         self.chunkLimit     = -1
         self.multiDL        = True
         self.resumeDownload = True
-
-
     def process(self, pyfile):
         """main function"""
 
@@ -51,7 +48,7 @@ class BasePlugin(Hoster):
 
         for _i in xrange(5):
             try:
-                link = getFileURL(self, unquote(pyfile.url))
+                link = getFileURL(self, urllib.unquote(pyfile.url))
 
                 if link:
                     self.download(link, ref=False, disposition=True)
@@ -67,7 +64,7 @@ class BasePlugin(Hoster):
 
                     account = self.core.accountManager.getAccountPlugin('Http')
                     servers = [x['login'] for x in account.getAllAccounts()]
-                    server  = urlparse(pyfile.url).netloc
+                    server  = urlparse.urlparse(pyfile.url).netloc
 
                     if server in servers:
                         self.logDebug("Logging on to %s" % server)