summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-31 07:37:10 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-31 07:37:10 +0200
commit8a8323f3fd86985a5ca876e8d54f1699e75b24a8 (patch)
tree08f5c2771a739c9e0e71cfcd4f15f8b61445ad33 /module
parentFix https://github.com/pyload/pyload/issues/1601 (diff)
downloadpyload-8a8323f3fd86985a5ca876e8d54f1699e75b24a8.tar.xz
Fix https://github.com/pyload/pyload/issues/1628
Diffstat (limited to 'module')
-rw-r--r--module/plugins/hooks/ExtractArchive.py5
-rw-r--r--module/plugins/internal/Hoster.py4
-rw-r--r--module/plugins/internal/Plugin.py6
3 files changed, 5 insertions, 10 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index a71ec0e98..eab196160 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -50,11 +50,6 @@ try:
except ImportError:
pass
-from copy import copy
-if os.name != "nt":
- from grp import getgrnam
- from pwd import getpwnam
-
from module.plugins.internal.Addon import Addon, Expose, threaded
from module.plugins.internal.Plugin import replace_patterns
from module.plugins.internal.Extractor import ArchiveError, CRCError, PasswordError
diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py
index c54adf4b3..4d69720ac 100644
--- a/module/plugins/internal/Hoster.py
+++ b/module/plugins/internal/Hoster.py
@@ -9,10 +9,6 @@ import time
import traceback
import urlparse
-if os.name != "nt":
- import grp
- import pwd
-
from module.plugins.internal.Captcha import Captcha
from module.plugins.internal.Plugin import (Plugin, Abort, Fail, Reconnect, Retry, Skip,
chunks, encode, exists, fixurl as _fixurl, replace_patterns,
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index 159668c28..fa0ccaadd 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -8,6 +8,10 @@ import os
import re
import urllib
+if os.name != "nt":
+ import grp
+ import pwd
+
from module.plugins.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload as Skip #@TODO: Remove in 0.4.10
from module.utils import fs_encode, fs_decode, html_unescape, save_join as fs_join
@@ -138,7 +142,7 @@ def chunks(iterable, size):
class Plugin(object):
__name__ = "Plugin"
__type__ = "hoster"
- __version__ = "0.21"
+ __version__ = "0.22"
__status__ = "testing"
__pattern__ = r'^unmatchable$'