Fix previous merge

43 files changed, 55 insertions, 157 deletions

diff --git a/pyload/plugins/Plugin.py b/pyload/plugins/Plugin.py
index 279986746..ec13c54f4 100644
--- a/pyload/plugins/Plugin.py
+++ b/pyload/plugins/Plugin.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import with_statement
+
 from time import time, sleep
 from random import randint
 
@@ -16,7 +18,7 @@ from itertools import islice
 from traceback import print_exc
 from urlparse import urlparse
 
-from pyload.utils import fs_decode, fs_encode, safe_join, safe_path
+from pyload.utils import fs_decode, fs_encode, safe_filename, safe_join
 
 
 def chunks(iterable, size):
diff --git a/pyload/plugins/account/KingfilesNet.py b/pyload/plugins/account/KingfilesNet.py
index 892027e52..d49c7a320 100644
--- a/pyload/plugins/account/KingfilesNet.py
+++ b/pyload/plugins/account/KingfilesNet.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugins.internal.CaptchaService import SolveMedia
+from pyload.plugins.internal.captcha import SolveMedia
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/module/plugins/accounts/RapiduNet.py b/pyload/plugins/account/RapiduNet.py
index 2fabb6120..6837f5c91 100644
--- a/module/plugins/accounts/RapiduNet.py
+++ b/pyload/plugins/account/RapiduNet.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Account import Account
-from module.common.json_layer import json_loads
+
+from pyload.plugins.internal.Account import Account
+from pyload.utils import json_loads
 
 
 class RapiduNet(Account):
diff --git a/module/plugins/accounts/SafesharingEu.py b/pyload/plugins/account/SafesharingEu.py
index 2e58d33b3..bdc43bec7 100644
--- a/module/plugins/accounts/SafesharingEu.py
+++ b/pyload/plugins/account/SafesharingEu.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSAccount import XFSAccount
+from pyload.plugins.internal.XFSAccount import XFSAccount
 
 
 class SafesharingEu(XFSAccount):
diff --git a/module/plugins/hooks/SkipRev.py b/pyload/plugins/addon/SkipRev.py
index 76a48a255..0c14282a1 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/pyload/plugins/addon/SkipRev.py
@@ -5,13 +5,13 @@ import re
 from urllib import unquote
 from urlparse import urljoin, urlparse
 
-from module.plugins.Hook import Hook
-from module.plugins.Plugin import SkipDownload
+from pyload.plugins.internal.Addon import Addon
+from pyload.plugins.Plugin import SkipDownload
 
 
-class SkipRev(Hook):
+class SkipRev(Adoon):
     __name__    = "SkipRev"
-    __type__    = "hook"
+    __type__    = "addon"
     __version__ = "0.13"
 
     __config__ = [("auto",   "bool", "Automatically keep all rev files needed by package", True),
diff --git a/pyload/plugins/crypter/FilecryptCc.py b/pyload/plugins/crypter/FilecryptCc.py
index 160253c06..ee8076b17 100644
--- a/pyload/plugins/crypter/FilecryptCc.py
+++ b/pyload/plugins/crypter/FilecryptCc.py
@@ -6,7 +6,7 @@ import re
 
 from Crypto.Cipher import AES
 
-from pyload.plugins.Crypter import Crypter
+from pyload.plugins.internal.Crypter import Crypter
 
 
 class FilecryptCc(Crypter):
diff --git a/module/plugins/crypter/Go4UpCom.py b/pyload/plugins/crypter/Go4UpCom.py
index 102bc32b5..f63695912 100644
--- a/module/plugins/crypter/Go4UpCom.py
+++ b/pyload/plugins/crypter/Go4UpCom.py
@@ -4,7 +4,7 @@ import re
 
 from urlparse import urljoin
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from pyload.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class Go4UpCom(SimpleCrypter):
diff --git a/pyload/plugins/crypter/NCryptIn.py b/pyload/plugins/crypter/NCryptIn.py
index b5b496a3f..15cfdaa03 100644
--- a/pyload/plugins/crypter/NCryptIn.py
+++ b/pyload/plugins/crypter/NCryptIn.py
@@ -7,7 +7,7 @@ import re
 from Crypto.Cipher import AES
 
 from pyload.plugins.internal.Crypter import Crypter
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 
 
 class NCryptIn(Crypter):
diff --git a/pyload/plugins/crypter/SafelinkingNet.py b/pyload/plugins/crypter/SafelinkingNet.py
index 38eb36ea5..681e07cd1 100644
--- a/pyload/plugins/crypter/SafelinkingNet.py
+++ b/pyload/plugins/crypter/SafelinkingNet.py
@@ -8,7 +8,7 @@ from BeautifulSoup import BeautifulSoup
 
 from pyload.utils import json_loads
 from pyload.plugins.internal.Crypter import Crypter
-from pyload.plugins.internal.CaptchaService import SolveMedia
+from pyload.plugins.internal.captcha import SolveMedia
 
 
 class SafelinkingNet(Crypter):
diff --git a/pyload/plugins/hoster/BitshareCom.py b/pyload/plugins/hoster/BitshareCom.py
index 02aa23036..0a6318c77 100644
--- a/pyload/plugins/hoster/BitshareCom.py
+++ b/pyload/plugins/hoster/BitshareCom.py
@@ -4,7 +4,7 @@ from __future__ import with_statement
 
 import re
 
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/CatShareNet.py b/pyload/plugins/hoster/CatShareNet.py
index 089e137a0..63a550bd4 100644
--- a/pyload/plugins/hoster/CatShareNet.py
+++ b/pyload/plugins/hoster/CatShareNet.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/CrockoCom.py b/pyload/plugins/hoster/CrockoCom.py
index 6d86741d2..ea87cce6d 100644
--- a/pyload/plugins/hoster/CrockoCom.py
+++ b/pyload/plugins/hoster/CrockoCom.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/DateiTo.py b/pyload/plugins/hoster/DateiTo.py
index d22a0a3ce..bcd99ab0c 100644
--- a/pyload/plugins/hoster/DateiTo.py
+++ b/pyload/plugins/hoster/DateiTo.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/DepositfilesCom.py b/pyload/plugins/hoster/DepositfilesCom.py
index 001fee199..e78e0bb27 100644
--- a/pyload/plugins/hoster/DepositfilesCom.py
+++ b/pyload/plugins/hoster/DepositfilesCom.py
@@ -4,7 +4,7 @@ import re
 
 from urllib import unquote
 
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/module/plugins/hoster/DodanePl.py b/pyload/plugins/hoster/DodanePl.py
index 58f1c02d8..3f1ea3d6d 100644
--- a/module/plugins/hoster/DodanePl.py
+++ b/pyload/plugins/hoster/DodanePl.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, parseFileInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class DodanePl(DeadHoster):
diff --git a/pyload/plugins/hoster/ExtabitCom.py b/pyload/plugins/hoster/ExtabitCom.py
index 6c0dbd185..04f78dafb 100644
--- a/pyload/plugins/hoster/ExtabitCom.py
+++ b/pyload/plugins/hoster/ExtabitCom.py
@@ -5,7 +5,7 @@ import re
 from pyload.utils import json_loads
 
 from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/FilecloudIo.py b/pyload/plugins/hoster/FilecloudIo.py
index 0c9f1b5ee..db1c0eee4 100644
--- a/pyload/plugins/hoster/FilecloudIo.py
+++ b/pyload/plugins/hoster/FilecloudIo.py
@@ -3,7 +3,7 @@
 import re
 
 from pyload.utils import json_loads
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/FilepostCom.py b/pyload/plugins/hoster/FilepostCom.py
index 5995b4aba..2948f3bc6 100644
--- a/pyload/plugins/hoster/FilepostCom.py
+++ b/pyload/plugins/hoster/FilepostCom.py
@@ -5,7 +5,7 @@ import re
 from time import time
 
 from pyload.utils import json_loads
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/FilerNet.py b/pyload/plugins/hoster/FilerNet.py
index d73467947..04b04219f 100644
--- a/pyload/plugins/hoster/FilerNet.py
+++ b/pyload/plugins/hoster/FilerNet.py
@@ -8,7 +8,7 @@ import re
 
 from urlparse import urljoin
 
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/FileserveCom.py b/pyload/plugins/hoster/FileserveCom.py
index 0d0833038..9be6e53ab 100644
--- a/pyload/plugins/hoster/FileserveCom.py
+++ b/pyload/plugins/hoster/FileserveCom.py
@@ -7,7 +7,7 @@ from pyload.network.RequestFactory import getURL
 from pyload.plugins.internal.Hoster import Hoster
 from pyload.plugins.Plugin import chunks
 from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.utils import parseFileSize
 
 
diff --git a/pyload/plugins/hoster/FreakshareCom.py b/pyload/plugins/hoster/FreakshareCom.py
index c298e5a24..ba4b7ddb0 100644
--- a/pyload/plugins/hoster/FreakshareCom.py
+++ b/pyload/plugins/hoster/FreakshareCom.py
@@ -4,7 +4,7 @@ import re
 
 from pyload.plugins.internal.Hoster import Hoster
 from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 
 
 class FreakshareCom(Hoster):
diff --git a/pyload/plugins/hoster/IfileIt.py b/pyload/plugins/hoster/IfileIt.py
index 75c2f115c..b96734159 100644
--- a/pyload/plugins/hoster/IfileIt.py
+++ b/pyload/plugins/hoster/IfileIt.py
@@ -3,7 +3,7 @@
 import re
 
 from pyload.utils import json_loads
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/Keep2shareCc.py b/pyload/plugins/hoster/Keep2shareCc.py
index 6fef901d8..44587c946 100644
--- a/pyload/plugins/hoster/Keep2shareCc.py
+++ b/pyload/plugins/hoster/Keep2shareCc.py
@@ -4,7 +4,7 @@ import re
 
 from urlparse import urljoin, urlparse
 
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import _isDirectLink, SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/LetitbitNet.py b/pyload/plugins/hoster/LetitbitNet.py
index cdd339eb9..e13fe8a66 100644
--- a/pyload/plugins/hoster/LetitbitNet.py
+++ b/pyload/plugins/hoster/LetitbitNet.py
@@ -13,7 +13,7 @@ from urlparse import urljoin
 
 from pyload.utils import json_loads, json_dumps
 from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugins/hoster/LoadTo.py b/pyload/plugins/hoster/LoadTo.py
index 3b7229a0b..af6c8b48e 100644
--- a/pyload/plugins/hoster/LoadTo.py
+++ b/pyload/plugins/hoster/LoadTo.py
@@ -6,7 +6,7 @@
 
 import re
 
-from pyload.plugins.internal.CaptchaService import SolveMedia
+from pyload.plugins.internal.captcha import SolveMedia
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/LuckyShareNet.py b/pyload/plugins/hoster/LuckyShareNet.py
index 9b418ccd4..a32ac6be9 100644
--- a/pyload/plugins/hoster/LuckyShareNet.py
+++ b/pyload/plugins/hoster/LuckyShareNet.py
@@ -4,7 +4,7 @@ import re
 
 from bottle import json_loads
 
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/hoster/MediafireCom.py b/pyload/plugins/hoster/MediafireCom.py
index 246a5c87e..00e1e83cd 100644
--- a/pyload/plugins/hoster/MediafireCom.py
+++ b/pyload/plugins/hoster/MediafireCom.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugins.internal.CaptchaService import SolveMedia
+from pyload.plugins.internal.captcha import SolveMedia
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
 from pyload.network.RequestFactory import getURL
 
diff --git a/pyload/plugins/hoster/NowDownloadEu.py b/pyload/plugins/hoster/NowDownloadEu.py
deleted file mode 100644
index 2b1b8bc0a..000000000
--- a/pyload/plugins/hoster/NowDownloadEu.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from pyload.utils import fixup
-
-
-class NowDownloadEu(SimpleHoster):
-    __name__    = "NowDownloadEu"
-    __type__    = "hoster"
-    __version__ = "0.05"
-
-    __pattern__ = r'http://(?:www\.)?nowdownload\.(at|ch|co|eu|sx)/(dl/|download\.php\?id=)\w+'
-
-    __description__ = """NowDownload.at hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("godofdream", "soilfiction@gmail.com"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    INFO_PATTERN = r'Downloading</span> <br> (?P<N>.*) (?P<S>[\d.,]+) (?P<U>[\w^_]+) </h4>'
-    OFFLINE_PATTERN = r'>This file does not exist'
-
-    TOKEN_PATTERN = r'"(/api/token\.php\?token=\w+)"'
-    CONTINUE_PATTERN = r'"(/dl2/\w+/\w+)"'
-    WAIT_PATTERN = r'\.countdown\(\{until: \+(\d+),'
-    LINK_PATTERN = r'"(http://f\d+\.nowdownload\.at/dl/\w+/\w+)'
-
-    NAME_REPLACEMENTS = [("&#?\w+;", fixup), (r'<[^>]*>', '')]
-
-
-    def setup(self):
-        self.multiDL = self.resumeDownload = True
-        self.chunkLimit = -1
-
-
-    def handleFree(self):
-        tokenlink = re.search(self.TOKEN_PATTERN, self.html)
-        continuelink = re.search(self.CONTINUE_PATTERN, self.html)
-        if tokenlink is None or continuelink is None:
-            self.error()
-
-        m = re.search(self.WAIT_PATTERN, self.html)
-        if m:
-            wait = int(m.group(1))
-        else:
-            wait = 60
-
-        baseurl = "http://www.nowdownload.at"
-        self.html = self.load(baseurl + str(tokenlink.group(1)))
-        self.wait(wait)
-
-        self.html = self.load(baseurl + str(continuelink.group(1)))
-
-        url = re.search(self.LINK_PATTERN, self.html)
-        if url is None:
-            self.error(_("Download link not found"))
-
-        self.download(str(url.group(1)))
-
-
-getInfo = create_getInfo(NowDownloadEu)
diff --git a/module/plugins/hoster/NowDownloadSx.py b/pyload/plugins/hoster/NowDownloadSx.py
index d2ae08954..1574de012 100644
--- a/module/plugins/hoster/NowDownloadSx.py
+++ b/pyload/plugins/hoster/NowDownloadSx.py
@@ -2,8 +2,8 @@
 
 import re
 
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.utils import fixup
+from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from pyload.utils import fixup
 
 
 class NowDownloadSx(SimpleHoster):
diff --git a/pyload/plugins/hoster/NowVideoAt.py b/pyload/plugins/hoster/NowVideoAt.py
deleted file mode 100644
index 1ac9d19a3..000000000
--- a/pyload/plugins/hoster/NowVideoAt.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-
-
-class NowVideoAt(SimpleHoster):
-    __name__    = "NowVideoAt"
-    __type__    = "hoster"
-    __version__ = "0.06"
-
-    __pattern__ = r'http://(?:www\.)?nowvideo\.(at|ch|co|eu|sx)/(video|mobile/#/videos)/(?P<ID>\w+)'
-
-    __description__ = """NowVideo.at hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.nowvideo.at/video/\g<ID>')]
-
-    NAME_PATTERN = r'<h4>(?P<N>.+?)<'
-    OFFLINE_PATTERN = r'>This file no longer exists'
-
-    LINK_FREE_PATTERN = r'<source src="(.+?)"'
-    LINK_PREMIUM_PATTERN = r'<div id="content_player" >\s*<a href="(.+?)"'
-
-
-    def setup(self):
-        self.multiDL = True
-        self.resumeDownload = True
-
-
-    def handleFree(self):
-        self.html = self.load("http://www.nowvideo.at/mobile/video.php", get={'id': self.info['ID']})
-
-        m = re.search(self.LINK_FREE_PATTERN, self.html)
-        if m is None:
-            self.error(_("Free download link not found"))
-
-        self.download(m.group(1))
-
-
-getInfo = create_getInfo(NowVideoAt)
diff --git a/module/plugins/hoster/NowVideoSx.py b/pyload/plugins/hoster/NowVideoSx.py
index b59bd79da..4de1bfad7 100644
--- a/module/plugins/hoster/NowVideoSx.py
+++ b/pyload/plugins/hoster/NowVideoSx.py
@@ -2,7 +2,7 @@
 
 import re
 
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class NowVideoSx(SimpleHoster):
diff --git a/pyload/plugins/hoster/OboomCom.py b/pyload/plugins/hoster/OboomCom.py
index db2c0597b..0e907ab7a 100644
--- a/pyload/plugins/hoster/OboomCom.py
+++ b/pyload/plugins/hoster/OboomCom.py
@@ -7,7 +7,7 @@ import re
 
 from pyload.utils import json_loads
 from pyload.plugins.internal.Hoster import Hoster
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 
 
 class OboomCom(Hoster):
diff --git a/pyload/plugins/hoster/RapidgatorNet.py b/pyload/plugins/hoster/RapidgatorNet.py
index 5deca9ddb..61efbcf20 100644
--- a/pyload/plugins/hoster/RapidgatorNet.py
+++ b/pyload/plugins/hoster/RapidgatorNet.py
@@ -7,7 +7,7 @@ from pycurl import HTTPHEADER
 from pyload.utils import json_loads
 from pyload.network.HTTPRequest import BadHeader
 from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight
-from pyload.plugins.internal.CaptchaService import AdsCaptcha, ReCaptcha, SolveMedia
+from pyload.plugins.internal.captcha import AdsCaptcha, ReCaptcha, SolveMedia
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/module/plugins/hoster/RapiduNet.py b/pyload/plugins/hoster/RapiduNet.py
index e14b18a4f..18e95804d 100644
--- a/module/plugins/hoster/RapiduNet.py
+++ b/pyload/plugins/hoster/RapiduNet.py
@@ -5,9 +5,9 @@ import re
 from pycurl import HTTPHEADER
 from time import time, altzone
 
-from module.common.json_layer import json_loads
-from module.plugins.internal.CaptchaService import ReCaptcha
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from pyload.utils import json_loads
+from pyload.plugins.captcha import ReCaptcha
+from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class RapiduNet(SimpleHoster):
diff --git a/pyload/plugins/hoster/RyushareCom.py b/pyload/plugins/hoster/RyushareCom.py
index ab6bf1017..8b08c9f51 100644
--- a/pyload/plugins/hoster/RyushareCom.py
+++ b/pyload/plugins/hoster/RyushareCom.py
@@ -6,7 +6,7 @@
 import re
 
 from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo
-from pyload.plugins.internal.CaptchaService import SolveMedia
+from pyload.plugins.internal.captcha import SolveMedia
 
 
 class RyushareCom(XFSHoster):
diff --git a/module/plugins/hoster/SafesharingEu.py b/pyload/plugins/hoster/SafesharingEu.py
index f0936b9e8..730bfc692 100644
--- a/module/plugins/hoster/SafesharingEu.py
+++ b/pyload/plugins/hoster/SafesharingEu.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
+from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 
 
 class SafesharingEu(XFSHoster):
diff --git a/pyload/plugins/hoster/ShareonlineBiz.py b/pyload/plugins/hoster/ShareonlineBiz.py
index 1cb651b12..df89f7bed 100644
--- a/pyload/plugins/hoster/ShareonlineBiz.py
+++ b/pyload/plugins/hoster/ShareonlineBiz.py
@@ -6,9 +6,9 @@ from time import time
 from urllib import unquote
 from urlparse import urlparse
 
-from module.network.RequestFactory import getURL
-from module.plugins.internal.CaptchaService import ReCaptcha
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from pyload.network.RequestFactory import getURL
+from pyload.plugins.captcha import ReCaptcha
+from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class ShareonlineBiz(SimpleHoster):
diff --git a/pyload/plugins/hoster/TurbobitNet.py b/pyload/plugins/hoster/TurbobitNet.py
index 70844cadb..adb9d21a7 100644
--- a/pyload/plugins/hoster/TurbobitNet.py
+++ b/pyload/plugins/hoster/TurbobitNet.py
@@ -10,7 +10,7 @@ from pycurl import HTTPHEADER
 from urllib import quote
 
 from pyload.network.RequestFactory import getURL
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, timestamp
 
 
diff --git a/module/plugins/hoster/UploadableCh.py b/pyload/plugins/hoster/UploadableCh.py
index 77b3d7d8a..0db7196bc 100644
--- a/module/plugins/hoster/UploadableCh.py
+++ b/pyload/plugins/hoster/UploadableCh.py
@@ -4,8 +4,8 @@ import re
 
 from time import sleep
 
-from module.plugins.internal.CaptchaService import ReCaptcha
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from pyload.plugins.captcha import ReCaptcha
+from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class UploadableCh(SimpleHoster):
diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py
index ea55c3398..016f2c9cf 100644
--- a/pyload/plugins/hoster/UploadedTo.py
+++ b/pyload/plugins/hoster/UploadedTo.py
@@ -11,7 +11,7 @@ from time import sleep
 from pyload.network.RequestFactory import getURL
 from pyload.plugins.internal.Hoster import Hoster
 from pyload.plugins.Plugin import chunks
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.utils import html_unescape, parseFileSize
 
 
diff --git a/pyload/plugins/hoster/UpstoreNet.py b/pyload/plugins/hoster/UpstoreNet.py
index 328b42b12..bd4241532 100644
--- a/pyload/plugins/hoster/UpstoreNet.py
+++ b/pyload/plugins/hoster/UpstoreNet.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
diff --git a/pyload/plugins/internal/Container.py b/pyload/plugins/internal/Container.py
index b7dd3aa20..3320217ae 100644
--- a/pyload/plugins/internal/Container.py
+++ b/pyload/plugins/internal/Container.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import with_statement
+
 import re
 
 from os import remove
diff --git a/pyload/plugins/internal/XFSHoster.py b/pyload/plugins/internal/XFSHoster.py
index a4e7339c5..b215b8211 100644
--- a/pyload/plugins/internal/XFSHoster.py
+++ b/pyload/plugins/internal/XFSHoster.py
@@ -8,7 +8,7 @@ from time import sleep
 from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
 
 from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight
-from pyload.plugins.internal.CaptchaService import ReCaptcha, SolveMedia
+from pyload.plugins.internal.captcha import ReCaptcha, SolveMedia
 from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 from pyload.utils import html_unescape