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/hoster/Ftp.py b/pyload/plugin/hoster/Ftp.py
index 1ebfdebd0..d26e3ad0b 100644
--- a/pyload/plugin/hoster/Ftp.py
+++ b/pyload/plugin/hoster/Ftp.py
@@ -2,9 +2,8 @@
 
 import pycurl
 import re
-
-from urllib import quote, unquote
-from urlparse import urlparse
+import urllib
+import urlparse
 
 from pyload.plugin.Hoster import Hoster
 
@@ -12,7 +11,7 @@ from pyload.plugin.Hoster import Hoster
 class Ftp(Hoster):
     __name    = "Ftp"
     __type    = "hoster"
-    __version = "0.50"
+    __version = "0.51"
 
     __pattern = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+'
 
@@ -26,15 +25,13 @@ class Ftp(Hoster):
     def setup(self):
         self.chunkLimit = -1
         self.resumeDownload = True
-
-
     def process(self, pyfile):
-        parsed_url = urlparse(pyfile.url)
+        parsed_url = urlparse.urlparse(pyfile.url)
         netloc = parsed_url.netloc
 
         pyfile.name = parsed_url.path.rpartition('/')[2]
         try:
-            pyfile.name = unquote(str(pyfile.name)).decode('utf8')
+            pyfile.name = urllib.unquote(str(pyfile.name)).decode('utf8')
         except Exception:
             pass
 
@@ -67,11 +64,11 @@ class Ftp(Hoster):
             # Naive ftp directory listing
             if re.search(r'^25\d.*?"', self.req.http.header, re.M):
                 pyfile.url = pyfile.url.rstrip('/')
-                pkgname = "/".join(pyfile.package().name, urlparse(pyfile.url).path.rpartition('/')[2])
+                pkgname = "/".join(pyfile.package().name, urlparse.urlparse(pyfile.url).path.rpartition('/')[2])
                 pyfile.url += '/'
                 self.req.http.c.setopt(48, 1)  #: CURLOPT_DIRLISTONLY
                 res = self.load(pyfile.url, decode=False)
-                links = [pyfile.url + quote(x) for x in res.splitlines()]
+                links = [pyfile.url + urllib.quote(x) for x in res.splitlines()]
                 self.logDebug("LINKS", links)
                 self.core.api.addPackage(pkgname, links)
             else: