diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2015-02-16 03:40:45 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2015-02-16 03:40:45 +0100 |
| commit | fcead1870013b6a970eca7878a66dbe783c80ea3 (patch) | |
| tree | 9837d3b2cacba2f5d1a4c620b1cd02f26571b454 /pyload/manager | |
| parent | Init cosmetics (diff) | |
| download | pyload-fcead1870013b6a970eca7878a66dbe783c80ea3.tar.xz | |
Partially revert acc46fc3497a66a427b795b4a22c6e71d69185a1
Diffstat (limited to 'pyload/manager')
| -rw-r--r-- | pyload/manager/Account.py | 2 | ||||
| -rw-r--r-- | pyload/manager/Addon.py | 14 | ||||
| -rw-r--r-- | pyload/manager/Plugin.py | 8 | ||||
| -rw-r--r-- | pyload/manager/Thread.py | 2 | ||||
| -rw-r--r-- | pyload/manager/thread/Plugin.py | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/pyload/manager/Account.py b/pyload/manager/Account.py index 2631e1c7d..3acf70311 100644 --- a/pyload/manager/Account.py +++ b/pyload/manager/Account.py @@ -176,7 +176,7 @@ class AccountManager(object): if self.accounts[p]: p = self.getAccountPlugin(p) if p: - data[p.__name] = p.getAllAccounts(force) + data[p.__name__] = p.getAllAccounts(force) else: #@NOTE: When an account has been skipped, p is None data[p] = [] else: diff --git a/pyload/manager/Addon.py b/pyload/manager/Addon.py index 164068634..d293109c7 100644 --- a/pyload/manager/Addon.py +++ b/pyload/manager/Addon.py @@ -105,7 +105,7 @@ class AddonManager(object): for pluginname in self.core.pluginManager.addonPlugins: try: - # hookClass = getattr(plugin, plugin.__name) + # hookClass = getattr(plugin, plugin.__name__) if self.core.config.getPlugin(pluginname, "activated"): pluginClass = self.core.pluginManager.loadClass("addon", pluginname) if not pluginClass: @@ -113,9 +113,9 @@ class AddonManager(object): plugin = pluginClass(self.core, self) plugins.append(plugin) - self.pluginMap[pluginClass.__name] = plugin + self.pluginMap[pluginClass.__name__] = plugin if plugin.isActivated(): - active.append(pluginClass.__name) + active.append(pluginClass.__name__) else: deactive.append(pluginname) @@ -141,7 +141,7 @@ class AddonManager(object): def activateAddon(self, pluginname): # check if already loaded for inst in self.plugins: - if inst.__name == pluginname: + if inst.__name__ == pluginname: return pluginClass = self.core.pluginManager.loadClass("addon", pluginname) @@ -153,14 +153,14 @@ class AddonManager(object): addon = pluginClass(self.core, self) self.plugins.append(addon) - self.pluginMap[pluginClass.__name] = addon + self.pluginMap[pluginClass.__name__] = addon addon.activate() def deactivateAddon(self, pluginname): for plugin in self.plugins: - if plugin.__name == pluginname: + if plugin.__name__ == pluginname: addon = plugin break else: @@ -174,7 +174,7 @@ class AddonManager(object): self.core.log.debug("Removed callback: %s" % self.core.scheduler.removeJob(addon.cb)) self.plugins.remove(addon) - del self.pluginMap[addon.__name] + del self.pluginMap[addon.__name__] @try_catch diff --git a/pyload/manager/Plugin.py b/pyload/manager/Plugin.py index 71a7131c4..879430be2 100644 --- a/pyload/manager/Plugin.py +++ b/pyload/manager/Plugin.py @@ -20,10 +20,10 @@ class PluginManager(object): USERROOT = "userplugins." TYPES = ["account", "addon", "container", "crypter", "hook", "hoster", "internal", "ocr"] - PATTERN = re.compile(r'__pattern\s*=\s*u?r("|\')([^"\']+)') - VERSION = re.compile(r'__version\s*=\s*("|\')([\d.]+)') - CONFIG = re.compile(r'__config\s*=\s*\[([^\]]+)', re.M) - DESC = re.compile(r'__description\s*=\s*("|"""|\')([^"\']+)') + PATTERN = re.compile(r'__pattern__\s*=\s*u?r("|\')([^"\']+)') + VERSION = re.compile(r'__version__\s*=\s*("|\')([\d.]+)') + CONFIG = re.compile(r'__config__\s*=\s*\[([^\]]+)', re.M) + DESC = re.compile(r'__description__\s*=\s*("|"""|\')([^"\']+)') def __init__(self, core): diff --git a/pyload/manager/Thread.py b/pyload/manager/Thread.py index 6c9304e87..2ace9c789 100644 --- a/pyload/manager/Thread.py +++ b/pyload/manager/Thread.py @@ -266,7 +266,7 @@ class ThreadManager(object): job.release() return - if job.plugin.__type == "hoster": + if job.plugin.__type__ == "hoster": spaceLeft = freeSpace(self.core.config["general"]["download_folder"]) / 1024 / 1024 if spaceLeft < self.core.config["general"]["min_free_space"]: self.core.log.warning(_("Not enough space left on device")) diff --git a/pyload/manager/thread/Plugin.py b/pyload/manager/thread/Plugin.py index 70ee747a8..20d57c933 100644 --- a/pyload/manager/thread/Plugin.py +++ b/pyload/manager/thread/Plugin.py @@ -72,7 +72,7 @@ class PluginThread(Thread): def getDebugDump(self, pyfile): dump = "pyLoad %s Debug Report of %s %s \n\nTRACEBACK:\n %s \n\nFRAMESTACK:\n" % ( - self.m.core.api.getServerVersion(), pyfile.pluginname, pyfile.plugin.__version, format_exc()) + self.m.core.api.getServerVersion(), pyfile.pluginname, pyfile.plugin.__version__, format_exc()) tb = exc_info()[2] stack = [] |