diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-12-29 16:32:22 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-12-29 16:32:22 +0100 |
| commit | b4fb06728834a445c1e1d212dc8eab95fafba099 (patch) | |
| tree | 07a9208a49a14092e7c536c5a3cdada02c8aefd8 /module | |
| parent | [Plugin] Fix https://github.com/pyload/pyload/issues/2229 (diff) | |
| download | pyload-b4fb06728834a445c1e1d212dc8eab95fafba099.tar.xz | |
Tiny code cosmetics
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/hooks/ExtractArchive.py | 2 | ||||
| -rw-r--r-- | module/plugins/hoster/Ftp.py | 5 | ||||
| -rw-r--r-- | module/plugins/internal/MultiHoster.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py index b72eb4c22..28286d02c 100644 --- a/module/plugins/hooks/ExtractArchive.py +++ b/module/plugins/hooks/ExtractArchive.py @@ -51,7 +51,7 @@ except ImportError: from module.plugins.internal.Addon import Addon, Expose, threaded from module.plugins.internal.Extractor import ArchiveError, CRCError, PasswordError -from module.plugins.internal.misc import encode, exists, fsjoin, replace_patterns, uniqify +from module.plugins.internal.misc import encode, exists, fsjoin, uniqify class ArchiveQueue(object): diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py index c6449629f..623879dd8 100644 --- a/module/plugins/hoster/Ftp.py +++ b/module/plugins/hoster/Ftp.py @@ -5,13 +5,14 @@ import urlparse import pycurl -from module.plugins.internal.Hoster import Hoster, parse_name +from module.plugins.internal.Hoster import Hoster +from module.plugins.internal.misc import parse_name class Ftp(Hoster): __name__ = "Ftp" __type__ = "hoster" - __version__ = "0.58" + __version__ = "0.59" __status__ = "testing" __pattern__ = r'(?:ftps?|sftp)://([\w\-.]+(:[\w\-.]+)?@)?[\w\-.]+(:\d+)?/.+' diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 5bd4527ae..a38230b9d 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -4,7 +4,7 @@ import re from module.plugins.internal.Plugin import Fail from module.plugins.internal.SimpleHoster import SimpleHoster -from module.plugins.internal.misc import encode, replace_patterns, set_cookie, set_cookies +from module.plugins.internal.misc import encode class MultiHoster(SimpleHoster): diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index ad2728f63..07760d8ba 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -5,7 +5,7 @@ import re from module.network.HTTPRequest import BadHeader from module.network.RequestFactory import getURL as get_url from module.plugins.internal.Crypter import Crypter -from module.plugins.internal.misc import parse_name, replace_patterns, set_cookie, set_cookies +from module.plugins.internal.misc import parse_name, replace_patterns class SimpleCrypter(Crypter): |