summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pavement.py3
-rw-r--r--pyload/plugins/Plugin.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/pavement.py b/pavement.py
index ea6775b1a..10b431cc4 100644
--- a/pavement.py
+++ b/pavement.py
@@ -66,7 +66,7 @@ module_replace = [
('from module.common.json_layer import json_dumps', 'from pyload.utils import json_dumps'),
('from module.utils import parseFileSize', 'from pyload.utils import parseFileSize'),
('from module.utils import save_join, save_path',
- 'from pyload.utils.fs import save_join, save_filename as save_path'),
+ 'from pyload.utils.fs import save_join, safe_filename as save_path'),
('from module.utils import save_join, fs_encode', 'from pyload.utils.fs import save_join, fs_encode'),
('from module.utils import save_join', 'from pyload.utils.fs import save_join'),
('from module.utils import fs_encode', 'from pyload.utils.fs import fs_encode'),
@@ -77,6 +77,7 @@ module_replace = [
('self.account.getAccountInfo(self.user)', 'self.account.getAccountData()'),
('self.account.accounts[self.user]["password"]', 'self.account.password'),
("self.account.accounts[self.user]['password']", 'self.account.password'),
+ (".canUse()", '.isUsable(self)'),
('from module.', 'from pyload.') # This should be always the last one
]
diff --git a/pyload/plugins/Plugin.py b/pyload/plugins/Plugin.py
index 0abb2644f..56dc59638 100644
--- a/pyload/plugins/Plugin.py
+++ b/pyload/plugins/Plugin.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
print "Deprecated usage of plugins.Plugin -> use plugins.Base"
-from .Base import *
+from Base import *
from pyload.utils import chunks
Plugin = Base