summaryrefslogtreecommitdiffstats
path: root/module/plugins/Plugin.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-11-15 23:10:26 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-11-15 23:10:26 +0100
commit6891645614426aab6fae1561ba925f81b214e993 (patch)
tree20cd3963d4e05af10fa0eae2b899181b699bc128 /module/plugins/Plugin.py
parentimproved plugin loader, import hook to always use newest plugin versions (diff)
downloadpyload-6891645614426aab6fae1561ba925f81b214e993.tar.xz
closed #420
Diffstat (limited to 'module/plugins/Plugin.py')
-rw-r--r--module/plugins/Plugin.py19
1 files changed, 4 insertions, 15 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py
index 7a7ecd974..1abf02bbe 100644
--- a/module/plugins/Plugin.py
+++ b/module/plugins/Plugin.py
@@ -17,17 +17,11 @@
@author: RaNaN, spoob, mkaay
"""
-from time import time
-from time import sleep
-
+from time import time, sleep
from random import randint
import os
-from os import remove
-from os import makedirs
-from os import chmod
-from os import stat
-from os import name as os_name
+from os import remove, makedirs, chmod, stat
from os.path import exists, join
if os.name != "nt":
@@ -37,7 +31,7 @@ if os.name != "nt":
from itertools import islice
-from module.utils import save_join, fs_encode, removeChars
+from module.utils import save_join, save_path, fs_encode
def chunks(iterable, size):
it = iter(iterable)
@@ -495,12 +489,7 @@ class Plugin(Base):
except Exception, e:
self.log.warning(_("Setting User and Group failed: %s") % str(e))
- name = self.pyfile.name
- if os_name == 'nt':
- #delete illegal characters
- name = removeChars(name, '/\\?%*:|"<>')
- else:
- name = removeChars(name, '/\\"')
+ name = save_path(self.pyfile.name)
filename = join(location, fs_encode(name))