diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-09-08 00:30:40 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-09-14 11:02:52 +0200 |
| commit | 25a6564b42c8e73843b63ca57357a3573ac48c9c (patch) | |
| tree | 36d2f2c3edbfa425e945c927757449c0060b18d6 /pyload/plugins | |
| parent | module -> pyload (diff) | |
| download | pyload-25a6564b42c8e73843b63ca57357a3573ac48c9c.tar.xz | |
[Lib] Update simplejson to v3.6.3 + one file wsgiserver + importing fixup
Diffstat (limited to 'pyload/plugins')
| -rw-r--r-- | pyload/plugins/PluginManager.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/accounts/OboomCom.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/container/CCF.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/crypter/DuckCryptInfo.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/crypter/HoerbuchIn.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/crypter/SafelinkingNet.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/crypter/SerienjunkiesOrg.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/hooks/Ev0InFetcher.py | 4 | ||||
| -rw-r--r-- | pyload/plugins/hoster/LuckyShareNet.py | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/pyload/plugins/PluginManager.py b/pyload/plugins/PluginManager.py index 1edc0f819..be467b41a 100644 --- a/pyload/plugins/PluginManager.py +++ b/pyload/plugins/PluginManager.py @@ -9,7 +9,7 @@ from os.path import isfile, join, exists, abspath from sys import version_info from traceback import print_exc -from pyload.lib.SafeEval import const_eval as literal_eval +from SafeEval import const_eval as literal_eval from pyload.ConfigParser import IGNORE diff --git a/pyload/plugins/accounts/OboomCom.py b/pyload/plugins/accounts/OboomCom.py index 5d30c5955..3ef6f9d58 100644 --- a/pyload/plugins/accounts/OboomCom.py +++ b/pyload/plugins/accounts/OboomCom.py @@ -2,7 +2,7 @@ import time -from pyload.lib.beaker.crypto.pbkdf2 import PBKDF2 +from beaker.crypto.pbkdf2 import PBKDF2 from pyload.common.json_layer import json_loads from pyload.plugins.Account import Account diff --git a/pyload/plugins/container/CCF.py b/pyload/plugins/container/CCF.py index 89ac90097..1e647b486 100644 --- a/pyload/plugins/container/CCF.py +++ b/pyload/plugins/container/CCF.py @@ -6,7 +6,7 @@ from os import makedirs from os.path import exists from urllib2 import build_opener -from pyload.lib.MultipartPostHandler import MultipartPostHandler +from MultipartPostHandler import MultipartPostHandler from pyload.plugins.Container import Container from pyload.utils import safe_join diff --git a/pyload/plugins/crypter/DuckCryptInfo.py b/pyload/plugins/crypter/DuckCryptInfo.py index a7afa2d22..63340f2ed 100644 --- a/pyload/plugins/crypter/DuckCryptInfo.py +++ b/pyload/plugins/crypter/DuckCryptInfo.py @@ -2,7 +2,7 @@ import re -from pyload.lib.BeautifulSoup import BeautifulSoup +from BeautifulSoup import BeautifulSoup from pyload.plugins.Crypter import Crypter diff --git a/pyload/plugins/crypter/HoerbuchIn.py b/pyload/plugins/crypter/HoerbuchIn.py index 7c934a6f2..fa8e1dc34 100644 --- a/pyload/plugins/crypter/HoerbuchIn.py +++ b/pyload/plugins/crypter/HoerbuchIn.py @@ -2,7 +2,7 @@ import re -from pyload.lib.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup +from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup from pyload.plugins.Crypter import Crypter diff --git a/pyload/plugins/crypter/SafelinkingNet.py b/pyload/plugins/crypter/SafelinkingNet.py index 62dcc6021..543fb32fb 100644 --- a/pyload/plugins/crypter/SafelinkingNet.py +++ b/pyload/plugins/crypter/SafelinkingNet.py @@ -4,7 +4,7 @@ import re from pycurl import FOLLOWLOCATION -from pyload.lib.BeautifulSoup import BeautifulSoup +from BeautifulSoup import BeautifulSoup from pyload.common.json_layer import json_loads from pyload.plugins.Crypter import Crypter diff --git a/pyload/plugins/crypter/SerienjunkiesOrg.py b/pyload/plugins/crypter/SerienjunkiesOrg.py index c7f7b1892..a1745c6c9 100644 --- a/pyload/plugins/crypter/SerienjunkiesOrg.py +++ b/pyload/plugins/crypter/SerienjunkiesOrg.py @@ -5,7 +5,7 @@ import re from time import sleep -from pyload.lib.BeautifulSoup import BeautifulSoup +from BeautifulSoup import BeautifulSoup from pyload.plugins.Crypter import Crypter from pyload.unescape import unescape diff --git a/pyload/plugins/hooks/Ev0InFetcher.py b/pyload/plugins/hooks/Ev0InFetcher.py index 5c2022bac..c3def8add 100644 --- a/pyload/plugins/hooks/Ev0InFetcher.py +++ b/pyload/plugins/hooks/Ev0InFetcher.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -from time import mktime, time +import feedparser -from pyload.lib import feedparser +from time import mktime, time from pyload.plugins.Hook import Hook diff --git a/pyload/plugins/hoster/LuckyShareNet.py b/pyload/plugins/hoster/LuckyShareNet.py index cafddb0a8..5cb15d49e 100644 --- a/pyload/plugins/hoster/LuckyShareNet.py +++ b/pyload/plugins/hoster/LuckyShareNet.py @@ -2,7 +2,7 @@ import re -from pyload.lib.bottle import json_loads +from bottle import json_loads from pyload.plugins.internal.CaptchaService import ReCaptcha from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo |