Revert 486adc1874e463b1563ad2394b216faff388b10d

20 files changed, 146 insertions, 146 deletions

diff --git a/pyload/plugin/addon/AndroidPhoneNotify.py b/pyload/plugin/addon/AndroidPhoneNotify.py
index d3b390e6e..8332f668d 100644
--- a/pyload/plugin/addon/AndroidPhoneNotify.py
+++ b/pyload/plugin/addon/AndroidPhoneNotify.py
@@ -7,11 +7,11 @@ from pyload.plugin.Addon import Addon, Expose
 
 
 class AndroidPhoneNotify(Addon):
-    __name__    = "AndroidPhoneNotify"
-    __type__    = "addon"
-    __version__ = "0.07"
+    __name    = "AndroidPhoneNotify"
+    __type    = "addon"
+    __version = "0.07"
 
-    __config__ = [("apikey"         , "str" , "API key"                                  , ""   ),
+    __config = [("apikey"         , "str" , "API key"                                  , ""   ),
                   ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),
                   ("notifypackage"  , "bool", "Notify package finished"                  , True ),
                   ("notifyprocessed", "bool", "Notify packages processed"                , True ),
@@ -21,9 +21,9 @@ class AndroidPhoneNotify(Addon):
                   ("sendpermin"     , "int" , "Max notifications per minute"             , 12   ),
                   ("ignoreclient"   , "bool", "Send notifications if client is connected", False)]
 
-    __description__ = """Send push notifications to your Android Phone (using notifymyandroid.com)"""
-    __license__     = "GPLv3"
-    __authors__     = [("Steven Kosyra" , "steven.kosyra@gmail.com"),
+    __description = """Send push notifications to your Android Phone (using notifymyandroid.com)"""
+    __license     = "GPLv3"
+    __authors     = [("Steven Kosyra" , "steven.kosyra@gmail.com"),
                        ("Walter Purcaro", "vuolter@gmail.com"      )]
 
 
diff --git a/pyload/plugin/addon/AntiVirus.py b/pyload/plugin/addon/AntiVirus.py
index 6fae3b532..3866014ee 100644
--- a/pyload/plugin/addon/AntiVirus.py
+++ b/pyload/plugin/addon/AntiVirus.py
@@ -9,12 +9,12 @@ from pyload.utils import fs_encode, fs_join
 
 
 class AntiVirus(Addon):
-    __name__    = "AntiVirus"
-    __type__    = "addon"
-    __version__ = "0.07"
+    __name    = "AntiVirus"
+    __type    = "addon"
+    __version = "0.07"
 
     #@TODO: add trash option (use Send2Trash lib)
-    __config__ = [("action"    , "Antivirus default;Delete;Quarantine", "Manage infected files"                     , "Antivirus default"),
+    __config = [("action"    , "Antivirus default;Delete;Quarantine", "Manage infected files"                     , "Antivirus default"),
                   ("quardir"   , "folder"                             , "Quarantine folder"                         , ""                 ),
                   ("deltotrash", "bool"                               , "Move to trash (recycle bin) instead delete", True               ),
                   ("scanfailed", "bool"                               , "Scan incompleted files (failed downloads)" , False              ),
@@ -22,9 +22,9 @@ class AntiVirus(Addon):
                   ("cmdargs"   , "str"                                , "Scan options"                              , ""                 ),
                   ("ignore-err", "bool"                               , "Ignore scan errors"                        , False              )]
 
-    __description__ = """Scan downloaded files with antivirus program"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Scan downloaded files with antivirus program"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def setup(self):
diff --git a/pyload/plugin/addon/Checksum.py b/pyload/plugin/addon/Checksum.py
index 4b1380506..53b9b4e9f 100644
--- a/pyload/plugin/addon/Checksum.py
+++ b/pyload/plugin/addon/Checksum.py
@@ -38,20 +38,20 @@ def computeChecksum(local_file, algorithm):
 
 
 class Checksum(Addon):
-    __name__    = "Checksum"
-    __type__    = "addon"
-    __version__ = "0.16"
+    __name    = "Checksum"
+    __type    = "addon"
+    __version = "0.16"
 
-    __config__ = [("activated"     , "bool"              , "Activated"                                            , True   ),
+    __config = [("activated"     , "bool"              , "Activated"                                            , True   ),
                 ("check_checksum", "bool"              , "Check checksum? (If False only size will be verified)", True   ),
                 ("check_action"  , "fail;retry;nothing", "What to do if check fails?"                           , "retry"),
                 ("max_tries"     , "int"               , "Number of retries"                                    , 2      ),
                 ("retry_action"  , "fail;nothing"      , "What to do if all retries fail?"                      , "fail" ),
                 ("wait_time"     , "int"               , "Time to wait before each retry (seconds)"             , 1      )]
 
-    __description__ = """Verify downloaded file size and checksum"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
+    __description = """Verify downloaded file size and checksum"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg"      , "zoidberg@mujmail.cz"),
                        ("Walter Purcaro", "vuolter@gmail.com"  ),
                        ("stickell"      , "l.stickell@yahoo.it")]
 
diff --git a/pyload/plugin/addon/ClickAndLoad.py b/pyload/plugin/addon/ClickAndLoad.py
index 73976d7e2..1e420fa8e 100644
--- a/pyload/plugin/addon/ClickAndLoad.py
+++ b/pyload/plugin/addon/ClickAndLoad.py
@@ -22,17 +22,17 @@ def forward(source, destination):
 
 #@TODO: IPv6 support
 class ClickAndLoad(Addon):
-    __name__    = "ClickAndLoad"
-    __type__    = "addon"
-    __version__ = "0.41"
+    __name    = "ClickAndLoad"
+    __type    = "addon"
+    __version = "0.41"
 
-    __config__ = [("activated", "bool", "Activated"                             , True),
+    __config = [("activated", "bool", "Activated"                             , True),
                   ("port"     , "int" , "Port"                                  , 9666),
                   ("extern"   , "bool", "Listen on the public network interface", True)]
 
-    __description__ = """Click'n'Load addon plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"         , "RaNaN@pyload.de"  ),
+    __description = """Click'n'Load addon plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"         , "RaNaN@pyload.de"  ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/addon/DeleteFinished.py b/pyload/plugin/addon/DeleteFinished.py
index 801e48ed6..f8f42da1e 100644
--- a/pyload/plugin/addon/DeleteFinished.py
+++ b/pyload/plugin/addon/DeleteFinished.py
@@ -5,16 +5,16 @@ from pyload.plugin.Addon import Addon
 
 
 class DeleteFinished(Addon):
-    __name__    = "DeleteFinished"
-    __type__    = "addon"
-    __version__ = "1.12"
+    __name    = "DeleteFinished"
+    __type    = "addon"
+    __version = "1.12"
 
-    __config__ = [("interval"  , "int" , "Check interval in hours"          , 72   ),
+    __config = [("interval"  , "int" , "Check interval in hours"          , 72   ),
                   ("deloffline", "bool", "Delete package with offline links", False)]
 
-    __description__ = """Automatically delete all finished packages from queue"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Automatically delete all finished packages from queue"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     # event_list = ["pluginConfigChanged"]
diff --git a/pyload/plugin/addon/DownloadScheduler.py b/pyload/plugin/addon/DownloadScheduler.py
index de961cc1f..62cee31c5 100644
--- a/pyload/plugin/addon/DownloadScheduler.py
+++ b/pyload/plugin/addon/DownloadScheduler.py
@@ -7,16 +7,16 @@ from pyload.plugin.Addon import Addon
 
 
 class DownloadScheduler(Addon):
-    __name__    = "DownloadScheduler"
-    __type__    = "addon"
-    __version__ = "0.22"
+    __name    = "DownloadScheduler"
+    __type    = "addon"
+    __version = "0.22"
 
-    __config__ = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)"      , "0:00 full, 7:00 250, 10:00 0, 17:00 150"),
+    __config = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)"      , "0:00 full, 7:00 250, 10:00 0, 17:00 150"),
                 ("abort"    , "bool", "Abort active downloads when start period with speed 0", False                                    )]
 
-    __description__ = """Download Scheduler"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Download Scheduler"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/addon/ExternalScripts.py b/pyload/plugin/addon/ExternalScripts.py
index 05b1d7b65..519023603 100644
--- a/pyload/plugin/addon/ExternalScripts.py
+++ b/pyload/plugin/addon/ExternalScripts.py
@@ -8,16 +8,16 @@ from pyload.utils import fs_encode, fs_join
 
 
 class ExternalScripts(Addon):
-    __name__    = "ExternalScripts"
-    __type__    = "addon"
-    __version__ = "0.39"
+    __name    = "ExternalScripts"
+    __type    = "addon"
+    __version = "0.39"
 
-    __config__ = [("activated", "bool", "Activated"         , True ),
+    __config = [("activated", "bool", "Activated"         , True ),
                   ("waitend"  , "bool", "Wait script ending", False)]
 
-    __description__ = """Run external scripts"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay"         , "mkaay@mkaay.de"   ),
+    __description = """Run external scripts"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay"         , "mkaay@mkaay.de"   ),
                        ("RaNaN"         , "ranan@pyload.org" ),
                        ("spoob"         , "spoob@pyload.org" ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py
index 07b388ecd..d94c0ca18 100644
--- a/pyload/plugin/addon/ExtractArchive.py
+++ b/pyload/plugin/addon/ExtractArchive.py
@@ -104,11 +104,11 @@ class ArchiveQueue(object):
 
 
 class ExtractArchive(Addon):
-    __name__    = "ExtractArchive"
-    __type__    = "addon"
-    __version__ = "1.41"
+    __name    = "ExtractArchive"
+    __type    = "addon"
+    __version = "1.41"
 
-    __config__ = [("activated"      , "bool"              , "Activated"                                 , True                                                                     ),
+    __config = [("activated"      , "bool"              , "Activated"                                 , True                                                                     ),
                   ("fullpath"       , "bool"              , "Extract with full paths"                   , True                                                                     ),
                   ("overwrite"      , "bool"              , "Overwrite files"                           , False                                                                    ),
                   ("keepbroken"     , "bool"              , "Try to extract broken archives"            , False                                                                    ),
@@ -126,9 +126,9 @@ class ExtractArchive(Addon):
                   ("waitall"        , "bool"              , "Run after all downloads was processed"     , False                                                                    ),
                   ("renice"         , "int"               , "CPU priority"                              , 0                                                                        )]
 
-    __description__ = """Extract different kind of archives"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
+    __description = """Extract different kind of archives"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),
                        ("Immenz"        , "immenz@gmx.net"   )]
 
 
@@ -183,7 +183,7 @@ class ExtractArchive(Addon):
                     traceback.print_exc()
 
         if self.extractors:
-            self.logDebug(*["Found %s %s" % (Extractor.__name__, Extractor.VERSION) for Extractor in self.extractors])
+            self.logDebug(*["Found %s %s" % (Extractor.__name, Extractor.VERSION) for Extractor in self.extractors])
             self.extractQueued()  #: Resume unfinished extractions
         else:
             self.logInfo(_("No Extract plugins activated"))
diff --git a/pyload/plugin/addon/HotFolder.py b/pyload/plugin/addon/HotFolder.py
index 0137514a8..14d0a7ce3 100644
--- a/pyload/plugin/addon/HotFolder.py
+++ b/pyload/plugin/addon/HotFolder.py
@@ -12,18 +12,18 @@ from pyload.utils import fs_encode, fs_join
 
 
 class HotFolder(Addon):
-    __name__    = "HotFolder"
-    __type__    = "addon"
-    __version__ = "0.14"
+    __name    = "HotFolder"
+    __type    = "addon"
+    __version = "0.14"
 
-    __config__ = [("folder"    , "str" , "Folder to observe"    , "container"),
+    __config = [("folder"    , "str" , "Folder to observe"    , "container"),
                 ("watch_file", "bool", "Observe link file"    , False      ),
                 ("keep"      , "bool", "Keep added containers", True       ),
                 ("file"      , "str" , "Link file"            , "links.txt")]
 
-    __description__ = """Observe folder and file for changes and add container and links"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.de")]
+    __description = """Observe folder and file for changes and add container and links"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.de")]
 
 
     def setup(self):
diff --git a/pyload/plugin/addon/IRCInterface.py b/pyload/plugin/addon/IRCInterface.py
index 170055ee8..1246c91fa 100644
--- a/pyload/plugin/addon/IRCInterface.py
+++ b/pyload/plugin/addon/IRCInterface.py
@@ -17,11 +17,11 @@ from pyload.utils import formatSize
 
 
 class IRCInterface(Thread, Addon):
-    __name__    = "IRCInterface"
-    __type__    = "addon"
-    __version__ = "0.13"
+    __name    = "IRCInterface"
+    __type    = "addon"
+    __version = "0.13"
 
-    __config__ = [("host"     , "str" , "IRC-Server Address"                           , "Enter your server here!"),
+    __config = [("host"     , "str" , "IRC-Server Address"                           , "Enter your server here!"),
                 ("port"     , "int" , "IRC-Server Port"                              , 6667                     ),
                 ("ident"    , "str" , "Clients ident"                                , "pyload-irc"             ),
                 ("realname" , "str" , "Realname"                                     , "pyload-irc"             ),
@@ -32,9 +32,9 @@ class IRCInterface(Thread, Addon):
                 ("info_pack", "bool", "Inform about every package finished"          , True                     ),
                 ("captcha"  , "bool", "Send captcha requests"                        , True                     )]
 
-    __description__ = """Connect to irc and let owner perform different tasks"""
-    __license__     = "GPLv3"
-    __authors__     = [("Jeix", "Jeix@hasnomail.com")]
+    __description = """Connect to irc and let owner perform different tasks"""
+    __license     = "GPLv3"
+    __authors     = [("Jeix", "Jeix@hasnomail.com")]
 
 
     def __init__(self, core, manager):
diff --git a/pyload/plugin/addon/JustPremium.py b/pyload/plugin/addon/JustPremium.py
index b878f302d..03a2b9261 100644
--- a/pyload/plugin/addon/JustPremium.py
+++ b/pyload/plugin/addon/JustPremium.py
@@ -6,16 +6,16 @@ from pyload.plugin.Addon import Addon
 
 
 class JustPremium(Addon):
-    __name__    = "JustPremium"
-    __type__    = "addon"
-    __version__ = "0.22"
+    __name    = "JustPremium"
+    __type    = "addon"
+    __version = "0.22"
 
-    __config__ = [("excluded", "str", "Exclude hosters (comma separated)", ""),
+    __config = [("excluded", "str", "Exclude hosters (comma separated)", ""),
                   ("included", "str", "Include hosters (comma separated)", "")]
 
-    __description__ = """Remove not-premium links from added urls"""
-    __license__     = "GPLv3"
-    __authors__     = [("mazleu"        , "mazleica@gmail.com"),
+    __description = """Remove not-premium links from added urls"""
+    __license     = "GPLv3"
+    __authors     = [("mazleu"        , "mazleica@gmail.com"),
                        ("Walter Purcaro", "vuolter@gmail.com" ),
                        ("immenz"        , "immenz@gmx.net"    )]
 
diff --git a/pyload/plugin/addon/MergeFiles.py b/pyload/plugin/addon/MergeFiles.py
index ee6a86d9f..dfc5f41d4 100644
--- a/pyload/plugin/addon/MergeFiles.py
+++ b/pyload/plugin/addon/MergeFiles.py
@@ -11,15 +11,15 @@ from pyload.utils import fs_join
 
 
 class MergeFiles(Addon):
-    __name__    = "MergeFiles"
-    __type__    = "addon"
-    __version__ = "0.14"
+    __name    = "MergeFiles"
+    __type    = "addon"
+    __version = "0.14"
 
-    __config__ = [("activated", "bool", "Activated", True)]
+    __config = [("activated", "bool", "Activated", True)]
 
-    __description__ = """Merges parts splitted with hjsplit"""
-    __license__     = "GPLv3"
-    __authors__     = [("and9000", "me@has-no-mail.com")]
+    __description = """Merges parts splitted with hjsplit"""
+    __license     = "GPLv3"
+    __authors     = [("and9000", "me@has-no-mail.com")]
 
 
     BUFFER_SIZE = 4096
diff --git a/pyload/plugin/addon/MultiHome.py b/pyload/plugin/addon/MultiHome.py
index 03974d6c6..458ddbeca 100644
--- a/pyload/plugin/addon/MultiHome.py
+++ b/pyload/plugin/addon/MultiHome.py
@@ -6,15 +6,15 @@ from pyload.plugin.Addon import Addon
 
 
 class MultiHome(Addon):
-    __name__    = "MultiHome"
-    __type__    = "addon"
-    __version__ = "0.12"
+    __name    = "MultiHome"
+    __type    = "addon"
+    __version = "0.12"
 
-    __config__ = [("interfaces", "str", "Interfaces", "None")]
+    __config = [("interfaces", "str", "Interfaces", "None")]
 
-    __description__ = """Ip address changer"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+    __description = """Ip address changer"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def setup(self):
diff --git a/pyload/plugin/addon/RestartFailed.py b/pyload/plugin/addon/RestartFailed.py
index 0b8f4d077..695ebb154 100644
--- a/pyload/plugin/addon/RestartFailed.py
+++ b/pyload/plugin/addon/RestartFailed.py
@@ -4,16 +4,16 @@ from pyload.plugin.Addon import Addon
 
 
 class RestartFailed(Addon):
-    __name__    = "RestartFailed"
-    __type__    = "addon"
-    __version__ = "1.58"
+    __name    = "RestartFailed"
+    __type    = "addon"
+    __version = "1.58"
 
-    __config__ = [("activated", "bool", "Activated"                , True),
+    __config = [("activated", "bool", "Activated"                , True),
                 ("interval" , "int" , "Check interval in minutes", 90  )]
 
-    __description__ = """Restart all the failed downloads in queue"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Restart all the failed downloads in queue"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     # event_list = ["pluginConfigChanged"]
diff --git a/pyload/plugin/addon/SkipRev.py b/pyload/plugin/addon/SkipRev.py
index 1c42ddfd8..5209da615 100644
--- a/pyload/plugin/addon/SkipRev.py
+++ b/pyload/plugin/addon/SkipRev.py
@@ -12,16 +12,16 @@ from pyload.plugin.Plugin import SkipDownload
 
 
 class SkipRev(Addon):
-    __name__    = "SkipRev"
-    __type__    = "addon"
-    __version__ = "0.29"
+    __name    = "SkipRev"
+    __type    = "addon"
+    __version = "0.29"
 
-    __config__ = [("mode"     , "Auto;Manual", "Choose recovery archives to skip"               , "Auto"),
+    __config = [("mode"     , "Auto;Manual", "Choose recovery archives to skip"               , "Auto"),
                   ("revtokeep", "int"        , "Number of recovery archives to keep for package", 0     )]
 
-    __description__ = """Skip recovery archives (.rev)"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Skip recovery archives (.rev)"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     @staticmethod
diff --git a/pyload/plugin/addon/UnSkipOnFail.py b/pyload/plugin/addon/UnSkipOnFail.py
index f81066daa..b7496de0b 100644
--- a/pyload/plugin/addon/UnSkipOnFail.py
+++ b/pyload/plugin/addon/UnSkipOnFail.py
@@ -5,15 +5,15 @@ from pyload.plugin.Addon import Addon
 
 
 class UnSkipOnFail(Addon):
-    __name__    = "UnSkipOnFail"
-    __type__    = "addon"
-    __version__ = "0.05"
+    __name    = "UnSkipOnFail"
+    __type    = "addon"
+    __version = "0.05"
 
-    __config__ = [("activated", "bool", "Activated", True)]
+    __config = [("activated", "bool", "Activated", True)]
 
-    __description__ = """Restart skipped duplicates when download fails"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Restart skipped duplicates when download fails"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def downloadFailed(self, pyfile):
diff --git a/pyload/plugin/addon/UpdateManager.py b/pyload/plugin/addon/UpdateManager.py
index 0837918d3..023884029 100644
--- a/pyload/plugin/addon/UpdateManager.py
+++ b/pyload/plugin/addon/UpdateManager.py
@@ -28,11 +28,11 @@ def exists(path):
 
 
 class UpdateManager(Addon):
-    __name__    = "UpdateManager"
-    __type__    = "addon"
-    __version__ = "0.50"
+    __name    = "UpdateManager"
+    __type    = "addon"
+    __version = "0.50"
 
-    __config__  = [("activated", "bool", "Activated", False),
+    __config  = [("activated", "bool", "Activated", False),
                  ("checkinterval", "int", "Check interval in hours", 8),
                  ("autorestart", "bool",
                   "Auto-restart pyLoad when required", True),
@@ -43,9 +43,9 @@ class UpdateManager(Addon):
                   "Monitor plugin code changes in debug mode", True),
                  ("nodebugupdate", "bool", "Don't update plugins in debug mode", False)]
 
-    __description__ = """ Check for updates """
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """ Check for updates """
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
     SERVER_URL         = "http://updatemanager.pyload.org" if release_status == 5 else None
     MIN_CHECK_INTERVAL = 3 * 60 * 60  #: 3 hours
@@ -83,15 +83,15 @@ class UpdateManager(Addon):
     def autoreloadPlugins(self):
         """ reload and reindex all modified plugins """
         modules = filter(
-            lambda m: m and (m.__name__.startswith("pyload.plugin.") or
-                             m.__name__.startswith("userplugins.")) and
-            m.__name__.count(".") >= 2, sys.modules.itervalues()
+            lambda m: m and (m.__name.startswith("pyload.plugin.") or
+                             m.__name.startswith("userplugins.")) and
+            m.__name.count(".") >= 2, sys.modules.itervalues()
         )
 
         reloads = []
 
         for m in modules:
-            root, type, name = m.__name__.rsplit(".", 2)
+            root, type, name = m.__name.rsplit(".", 2)
             id = (type, name)
             if type in self.core.pluginManager.plugins:
                 f = m.__file__.replace(".pyc", ".py")
@@ -165,7 +165,7 @@ class UpdateManager(Addon):
         url    = data[0]
         schema = data[1].split('|')
 
-        VERSION = re.compile(r'__version__.*=.*("|\')([\d.]+)')
+        VERSION = re.compile(r'__version.*=.*("|\')([\d.]+)')
 
         if "BLACKLIST" in data:
             blacklist  = data[data.index('BLACKLIST') + 1:]
diff --git a/pyload/plugin/addon/UserAgentSwitcher.py b/pyload/plugin/addon/UserAgentSwitcher.py
index 46807da67..ec1640e63 100644
--- a/pyload/plugin/addon/UserAgentSwitcher.py
+++ b/pyload/plugin/addon/UserAgentSwitcher.py
@@ -11,18 +11,18 @@ from pyload.utils import fs_encode
 
 
 class UserAgentSwitcher(Addon):
-    __name__    = "UserAgentSwitcher"
-    __type__    = "addon"
-    __version__ = "0.04"
+    __name    = "UserAgentSwitcher"
+    __type    = "addon"
+    __version = "0.04"
 
-    __config__ = [("activated", "bool", "Activated"               , True                                                                      ),
+    __config = [("activated", "bool", "Activated"               , True                                                                      ),
                   ("uaf"      , "file", "Random user-agents file" , ""                                                                        ),
                   ("uar"      , "bool", "Random user-agent"       , False                                                                     ),
                   ("uas"      , "str" , "Custom user-agent string", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:37.0) Gecko/20100101 Firefox/37.0")]
 
-    __description__ = """Custom user-agent"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Custom user-agent"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def setup(self):
diff --git a/pyload/plugin/addon/WindowsPhoneNotify.py b/pyload/plugin/addon/WindowsPhoneNotify.py
index 341e682b2..b1d1c8b0f 100644
--- a/pyload/plugin/addon/WindowsPhoneNotify.py
+++ b/pyload/plugin/addon/WindowsPhoneNotify.py
@@ -7,11 +7,11 @@ from pyload.plugin.Addon import Addon, Expose
 
 
 class WindowsPhoneNotify(Addon):
-    __name__    = "WindowsPhoneNotify"
-    __type__    = "addon"
-    __version__ = "0.09"
+    __name    = "WindowsPhoneNotify"
+    __type    = "addon"
+    __version = "0.09"
 
-    __config__ = [("id"             , "str" , "Push ID"                                  , ""   ),
+    __config = [("id"             , "str" , "Push ID"                                  , ""   ),
                   ("url"            , "str" , "Push url"                                 , ""   ),
                   ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),
                   ("notifypackage"  , "bool", "Notify package finished"                  , True ),
@@ -22,9 +22,9 @@ class WindowsPhoneNotify(Addon):
                   ("sendpermin"     , "int" , "Max notifications per minute"             , 12   ),
                   ("ignoreclient"   , "bool", "Send notifications if client is connected", False)]
 
-    __description__ = """Send push notifications to Windows Phone"""
-    __license__     = "GPLv3"
-    __authors__     = [("Andy Voigt"    , "phone-support@hotmail.de"),
+    __description = """Send push notifications to Windows Phone"""
+    __license     = "GPLv3"
+    __authors     = [("Andy Voigt"    , "phone-support@hotmail.de"),
                        ("Walter Purcaro", "vuolter@gmail.com"       )]
 
 
diff --git a/pyload/plugin/addon/XMPPInterface.py b/pyload/plugin/addon/XMPPInterface.py
index c0c31c738..2733cfde0 100644
--- a/pyload/plugin/addon/XMPPInterface.py
+++ b/pyload/plugin/addon/XMPPInterface.py
@@ -10,11 +10,11 @@ from pyload.plugin.addon.IRCInterface import IRCInterface
 
 
 class XMPPInterface(IRCInterface, JabberClient):
-    __name__    = "XMPPInterface"
-    __type__    = "addon"
-    __version__ = "0.11"
+    __name    = "XMPPInterface"
+    __type    = "addon"
+    __version = "0.11"
 
-    __config__ = [("jid"      , "str" , "Jabber ID"                           , "user@exmaple-jabber-server.org"         ),
+    __config = [("jid"      , "str" , "Jabber ID"                           , "user@exmaple-jabber-server.org"         ),
                 ("pw"       , "str" , "Password"                            , ""                                       ),
                 ("tls"      , "bool", "Use TLS"                             , False                                    ),
                 ("owners"   , "str" , "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"),
@@ -22,9 +22,9 @@ class XMPPInterface(IRCInterface, JabberClient):
                 ("info_pack", "bool", "Inform about every package finished" , True                                     ),
                 ("captcha"  , "bool", "Send captcha requests"               , True                                     )]
 
-    __description__ = """Connect to jabber and let owner perform different tasks"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __description = """Connect to jabber and let owner perform different tasks"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     implements(IMessageHandlersProvider)