6 files changed, 9 insertions, 14 deletions
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py
index ee92beb9a..e6e8c4bb5 100644
--- a/module/plugins/container/CCF.py
+++ b/module/plugins/container/CCF.py
@@ -6,7 +6,7 @@ from os import makedirs
 from os.path import exists
 from urllib2 import build_opener
 
-from module.lib.MultipartPostHandler import MultipartPostHandler
+from MultipartPostHandler import MultipartPostHandler
 
 from module.plugins.Container import Container
 from module.utils import save_join
diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py
index 26b06c1c7..b278f2248 100644
--- a/module/plugins/crypter/DuckCryptInfo.py
+++ b/module/plugins/crypter/DuckCryptInfo.py
@@ -2,7 +2,7 @@
 
 import re
 
-from module.lib.BeautifulSoup import BeautifulSoup
+from BeautifulSoup import BeautifulSoup
 
 from module.plugins.Crypter import Crypter
 
@@ -23,12 +23,7 @@ class DuckCryptInfo(Crypter):
 
     def decrypt(self, pyfile):
         url = pyfile.url
-        # seems we don't need to wait
-        #src = self.req.load(str(url))
-        #m = re.search(self.TIMER_PATTERN, src)
-        #if m:
-        #    self.logDebug("Sleeping for" % m.group(1))
-        #    self.setWait(int(m.group(1)) ,False)
+
         m = re.match(self.__pattern__, url)
         if m is None:
             self.fail('Weird error in link')
diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py
index 924ce5d3a..a283ff823 100644
--- a/module/plugins/crypter/HoerbuchIn.py
+++ b/module/plugins/crypter/HoerbuchIn.py
@@ -2,7 +2,7 @@
 
 import re
 
-from module.lib.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
+from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
 
 from module.plugins.Crypter import Crypter
 
@@ -45,7 +45,7 @@ class HoerbuchIn(Crypter):
         url = m.group(0)
 
         self.pyfile.url = url
-        src = self.req.load(url, post={"viewed": "adpg"})
+        src = self.load(url, post={"viewed": "adpg"})
 
         links = []
         pattern = re.compile("http://www\.hoerbuch\.in/protection/(\w+)/(.*?)\"")
diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py
index e0c165705..d548bdf89 100644
--- a/module/plugins/crypter/SafelinkingNet.py
+++ b/module/plugins/crypter/SafelinkingNet.py
@@ -4,7 +4,7 @@ import re
 
 from pycurl import FOLLOWLOCATION
 
-from module.lib.BeautifulSoup import BeautifulSoup
+from BeautifulSoup import BeautifulSoup
 
 from module.common.json_layer import json_loads
 from module.plugins.Crypter import Crypter
diff --git a/module/plugins/hooks/Ev0InFetcher.py b/module/plugins/hooks/Ev0InFetcher.py
index 881cb36ef..35a5c207c 100644
--- a/module/plugins/hooks/Ev0InFetcher.py
+++ b/module/plugins/hooks/Ev0InFetcher.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from time import mktime, time
+import feedparser
 
-from module.lib import feedparser
+from time import mktime, time
 
 from module.plugins.Hook import Hook
 
diff --git a/module/plugins/hoster/LuckyShareNet.py b/module/plugins/hoster/LuckyShareNet.py
index 4780c7108..11e27d357 100644
--- a/module/plugins/hoster/LuckyShareNet.py
+++ b/module/plugins/hoster/LuckyShareNet.py
@@ -2,7 +2,7 @@
 
 import re
 
-from module.lib.bottle import json_loads
+from bottle import json_loads
 
 from module.plugins.internal.CaptchaService import ReCaptcha
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo