From 29b39ec6020ec8be623687f03bdf48172a612a66 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 6 Nov 2014 04:32:37 +0100 Subject: Code cosmetics --- module/plugins/PluginManager.py | 2 +- module/plugins/crypter/EasybytezComFolder.py | 2 +- module/plugins/hooks/UpdateManager.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins') diff --git a/module/plugins/PluginManager.py b/module/plugins/PluginManager.py index ae8333c0e..a74c01ec0 100644 --- a/module/plugins/PluginManager.py +++ b/module/plugins/PluginManager.py @@ -314,7 +314,7 @@ class PluginManager: """ reloads and reindexes plugins """ if not type_plugins: return False - self.log.debug("Request reload of plugins: %s" % type_plugins) + self.log.debug("Request reload of plugins: %s" % ", ".join(type_plugins)) as_dict = {} for t,n in type_plugins: diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index f53c8c8b2..fa3e6165c 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -8,7 +8,7 @@ class EasybytezComFolder(XFSCrypter): __type__ = "crypter" __version__ = "0.10" - __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' + __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py index 022300c7a..c2fdd412e 100644 --- a/module/plugins/hooks/UpdateManager.py +++ b/module/plugins/hooks/UpdateManager.py @@ -259,7 +259,7 @@ class UpdateManager(Hook): if not type_plugins: return - self.logDebug("Requested deletion of plugins", type_plugins) + self.logDebug("Requested deletion of plugins", ", ".join(type_plugins)) removed = [] @@ -273,7 +273,7 @@ class UpdateManager(Hook): try: remove(filename) except Exception, e: - self.logDebug("Error deleting", path.basename(filename), str(e)) + self.logDebug("Error removing: %s" % path.basename(filename), str(e)) err = True filename += "c" @@ -283,7 +283,7 @@ class UpdateManager(Hook): self.manager.deactivateHook(name) remove(filename) except Exception, e: - self.logDebug("Error deleting", path.basename(filename), str(e)) + self.logDebug("Error removing: %s" % path.basename(filename), str(e)) err = True if not err: -- cgit v1.2.3