Partially revert acc46fc3497a66a427b795b4a22c6e71d69185a1

17 files changed, 130 insertions, 130 deletions

diff --git a/pyload/plugin/addon/Checksum.py b/pyload/plugin/addon/Checksum.py
index f3f98d0f8..0589bd55a 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.15"
+    __name__    = "Checksum"
+    __type__    = "addon"
+    __version__ = "0.15"
 
-    __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 8a05ca85e..5fe6e4bec 100644
--- a/pyload/plugin/addon/ClickAndLoad.py
+++ b/pyload/plugin/addon/ClickAndLoad.py
@@ -18,17 +18,17 @@ def forward(source, destination):
 
 
 class ClickAndLoad(Addon):
-    __name    = "ClickAndLoad"
-    __type    = "addon"
-    __version = "0.23"
+    __name__    = "ClickAndLoad"
+    __type__    = "addon"
+    __version__ = "0.23"
 
-    __config = [("activated", "bool", "Activated"                 , True ),
+    __config__ = [("activated", "bool", "Activated"                 , True ),
                 ("port"     , "int" , "Port"                      , 9666 ),
                 ("extern"   , "bool", "Allow external link adding", False)]
 
-    __description = """Click'N'Load hook plugin"""
-    __license     = "GPLv3"
-    __authors     = [("RaNaN", "RaNaN@pyload.de"),
+    __description__ = """Click'N'Load hook plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.de"),
                        ("mkaay", "mkaay@mkaay.de"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
diff --git a/pyload/plugin/addon/DeleteFinished.py b/pyload/plugin/addon/DeleteFinished.py
index 045f58d61..59f2e3321 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.11"
+    __name__    = "DeleteFinished"
+    __type__    = "addon"
+    __version__ = "1.11"
 
-    __config = [('interval'  , 'int' , 'Delete every (hours)'              , '72'   ),
+    __config__ = [('interval'  , 'int' , 'Delete every (hours)'              , '72'   ),
                 ('deloffline', 'bool', 'Delete packages 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"]
@@ -45,7 +45,7 @@ class DeleteFinished(Addon):
     def activate(self):
         self.info = {'sleep': True}
         interval = self.getConfig('interval')
-        self.pluginConfigChanged(self.__name, 'interval', interval)
+        self.pluginConfigChanged(self.__name__, 'interval', interval)
         self.addEvent('packageFinished', self.wakeup)
 
 
diff --git a/pyload/plugin/addon/DownloadScheduler.py b/pyload/plugin/addon/DownloadScheduler.py
index 7f05d89f4..e5e25e389 100644
--- a/pyload/plugin/addon/DownloadScheduler.py
+++ b/pyload/plugin/addon/DownloadScheduler.py
@@ -8,16 +8,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 030b44ae1..31283afc2 100644
--- a/pyload/plugin/addon/ExternalScripts.py
+++ b/pyload/plugin/addon/ExternalScripts.py
@@ -11,15 +11,15 @@ from pyload.utils import safe_join
 
 
 class ExternalScripts(Addon):
-    __name    = "ExternalScripts"
-    __type    = "addon"
-    __version = "0.25"
+    __name__    = "ExternalScripts"
+    __type__    = "addon"
+    __version__ = "0.25"
 
-    __config = [("activated", "bool", "Activated", True)]
+    __config__ = [("activated", "bool", "Activated", True)]
 
-    __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 478fb954e..b24bb37a2 100644
--- a/pyload/plugin/addon/ExtractArchive.py
+++ b/pyload/plugin/addon/ExtractArchive.py
@@ -57,11 +57,11 @@ from pyload.utils import safe_join, fs_encode
 
 
 class ExtractArchive(Addon):
-    __name    = "ExtractArchive"
-    __type    = "addon"
-    __version = "0.19"
+    __name__    = "ExtractArchive"
+    __type__    = "addon"
+    __version__ = "0.19"
 
-    __config = [("activated"    , "bool"  , "Activated"                                    , True                  ),
+    __config__ = [("activated"    , "bool"  , "Activated"                                    , True                  ),
                 ("fullpath"     , "bool"  , "Extract full path"                            , True                  ),
                 ("overwrite"    , "bool"  , "Overwrite files"                              , True                  ),
                 ("passwordfile" , "file"  , "password file"                                , "archive_password.txt"),
@@ -73,9 +73,9 @@ class ExtractArchive(Addon):
                 ("queue"        , "bool"  , "Wait for all downloads to be finished"        , True                  ),
                 ("renice"       , "int"   , "CPU Priority"                                 , 0                     )]
 
-    __description = """Extract different kind of archives"""
-    __license     = "GPLv3"
-    __authors     = [("RaNaN", "ranan@pyload.org"),
+    __description__ = """Extract different kind of archives"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "ranan@pyload.org"),
                      ("AndroKev", ""),
                      ("Walter Purcaro", "vuolter@gmail.com")]
 
@@ -189,7 +189,7 @@ class ExtractArchive(Addon):
                 for plugin in self.plugins:
                     targets = plugin.getTargets(files_ids)
                     if targets:
-                        self.logDebug("Targets for %s: %s" % (plugin.__name, targets))
+                        self.logDebug("Targets for %s: %s" % (plugin.__name__, targets))
                         matched = True
                     for target, fid in targets:
                         if target in processed:
diff --git a/pyload/plugin/addon/HotFolder.py b/pyload/plugin/addon/HotFolder.py
index 5eb15ab4f..3bbafd5ed 100644
--- a/pyload/plugin/addon/HotFolder.py
+++ b/pyload/plugin/addon/HotFolder.py
@@ -13,18 +13,18 @@ from pyload.utils import fs_encode, safe_join
 
 
 class HotFolder(Addon):
-    __name    = "HotFolder"
-    __type    = "addon"
-    __version = "0.12"
+    __name__    = "HotFolder"
+    __type__    = "addon"
+    __version__ = "0.12"
 
-    __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 3596b72ab..a4d466319 100644
--- a/pyload/plugin/addon/IRCInterface.py
+++ b/pyload/plugin/addon/IRCInterface.py
@@ -18,11 +18,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"             ),
@@ -33,9 +33,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/MergeFiles.py b/pyload/plugin/addon/MergeFiles.py
index 72dfd583d..18836f6ac 100644
--- a/pyload/plugin/addon/MergeFiles.py
+++ b/pyload/plugin/addon/MergeFiles.py
@@ -12,15 +12,15 @@ from pyload.utils import safe_join, fs_encode
 
 
 class MergeFiles(Addon):
-    __name    = "MergeFiles"
-    __type    = "addon"
-    __version = "0.13"
+    __name__    = "MergeFiles"
+    __type__    = "addon"
+    __version__ = "0.13"
 
-    __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 1bf78d2db..84b1e6ab7 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 5611cc791..2fe5f13bf 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.57"
+    __name__    = "RestartFailed"
+    __type__    = "addon"
+    __version__ = "1.57"
 
-    __config = [("activated", "bool", "Activated"                , True),
+    __config__ = [("activated", "bool", "Activated"                , True),
                 ("interval" , "int" , "Check interval in minutes", 90  )]
 
-    __description = """Periodically restart all failed downloads in queue"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Periodically restart all failed downloads in queue"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     # event_list = ["pluginConfigChanged"]
@@ -42,4 +42,4 @@ class RestartFailed(Addon):
 
 
     def activate(self):
-        self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval"))
+        self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval"))
diff --git a/pyload/plugin/addon/RestartSlow.py b/pyload/plugin/addon/RestartSlow.py
index 8005abaea..8621ed80d 100644
--- a/pyload/plugin/addon/RestartSlow.py
+++ b/pyload/plugin/addon/RestartSlow.py
@@ -6,19 +6,19 @@ from pyload.plugin.Addon import Addon
 
 
 class RestartSlow(Addon):
-    __name    = "RestartSlow"
-    __type    = "addon"
-    __version = "0.02"
+    __name__    = "RestartSlow"
+    __type__    = "addon"
+    __version__ = "0.02"
 
-    __config = [("free_limit"   , "int" ,  "Transfer speed threshold in kilobytes"                     , 100 ),
+    __config__ = [("free_limit"   , "int" ,  "Transfer speed threshold in kilobytes"                     , 100 ),
                 ("free_time"    , "int" ,  "Sample interval in minutes"                                , 5   ),
                 ("premium_limit", "int" ,  "Transfer speed threshold for premium download in kilobytes", 300 ),
                 ("premium_time" , "int" ,  "Sample interval for premium download in minutes"           , 2   ),
                 ("safe_mode"    , "bool",  "Don't restart if download is not resumable"                , True)]
 
-    __description = """Restart slow downloads"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Restart slow downloads"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     event_map = {'download-start': "downloadStarts"}
diff --git a/pyload/plugin/addon/SkipRev.py b/pyload/plugin/addon/SkipRev.py
index 6ff590792..d6908614d 100644
--- a/pyload/plugin/addon/SkipRev.py
+++ b/pyload/plugin/addon/SkipRev.py
@@ -8,15 +8,15 @@ from pyload.plugin.Plugin import SkipDownload
 
 
 class SkipRev(Adoon):
-    __name    = "SkipRev"
-    __type    = "addon"
-    __version = "0.15"
+    __name__    = "SkipRev"
+    __type__    = "addon"
+    __version__ = "0.15"
 
-    __config = [("tokeep", "int", "Number of rev files to keep for package (-1 to auto)", -1)]
+    __config__ = [("tokeep", "int", "Number of rev files to keep for package (-1 to auto)", -1)]
 
-    __description = """Skip files ending with extension rev"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Skip files ending with extension rev"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def _setup(self):
diff --git a/pyload/plugin/addon/UnSkipOnFail.py b/pyload/plugin/addon/UnSkipOnFail.py
index b640c7daa..bdbd4a5df 100644
--- a/pyload/plugin/addon/UnSkipOnFail.py
+++ b/pyload/plugin/addon/UnSkipOnFail.py
@@ -8,15 +8,15 @@ from pyload.utils import fs_encode
 
 
 class UnSkipOnFail(Addon):
-    __name    = "UnSkipOnFail"
-    __type    = "addon"
-    __version = "0.02"
+    __name__    = "UnSkipOnFail"
+    __type__    = "addon"
+    __version__ = "0.02"
 
-    __config = [("activated", "bool", "Activated", True)]
+    __config__ = [("activated", "bool", "Activated", True)]
 
-    __description = """When a download fails, restart skipped duplicates"""
-    __license     = "GPLv3"
-    __authors     = [("hagg", "")]
+    __description__ = """When a download fails, restart skipped duplicates"""
+    __license__     = "GPLv3"
+    __authors__     = [("hagg", "")]
 
 
     def downloadFailed(self, pyfile):
diff --git a/pyload/plugin/addon/UpdateManager.py b/pyload/plugin/addon/UpdateManager.py
index c5c34d1c8..e31612c23 100644
--- a/pyload/plugin/addon/UpdateManager.py
+++ b/pyload/plugin/addon/UpdateManager.py
@@ -14,26 +14,26 @@ from pyload.utils import safe_join
 
 
 class UpdateManager(Addon):
-    __name    = "UpdateManager"
-    __type    = "addon"
-    __version = "0.42"
+    __name__    = "UpdateManager"
+    __type__    = "addon"
+    __version__ = "0.42"
 
-    __config = [("activated"    , "bool"                         , "Activated"                                     , True              ),
+    __config__ = [("activated"    , "bool"                         , "Activated"                                     , True              ),
                 ("mode"         , "pyLoad + plugins;plugins only", "Check updates for"                             , "pyLoad + plugins"),
                 ("interval"     , "int"                          , "Check interval in hours"                       , 8                 ),
                 ("autorestart"  , "bool"                         , "Automatically restart pyLoad when required"    , True              ),
                 ("reloadplugins", "bool"                         , "Monitor plugins for code changes in debug mode", True              ),
                 ("nodebugupdate", "bool"                         , "Don't check for updates in debug mode"         , True              )]
 
-    __description = """Check for updates"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Check for updates"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     # event_list = ["pluginConfigChanged"]
 
     SERVER_URL   = "http://updatemanager.pyload.org"
-    VERSION      = re.compile(r'__version.*=.*("|\')([\d.]+)')
+    VERSION      = re.compile(r'__version__.*=.*("|\')([\d.]+)')
     MIN_INTERVAL = 3 * 60 * 60  #: 3h minimum check interval (value is in seconds)
 
 
@@ -55,13 +55,13 @@ class UpdateManager(Addon):
 
 
     def activate(self):
-        self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval"))
-        x = lambda: self.pluginConfigChanged(self.__name, "reloadplugins", self.getConfig("reloadplugins"))
+        self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval"))
+        x = lambda: self.pluginConfigChanged(self.__name__, "reloadplugins", self.getConfig("reloadplugins"))
         self.core.scheduler.addJob(10, x, threaded=False)
 
 
     def deactivate(self):
-        self.pluginConfigChanged(self.__name, "reloadplugins", False)
+        self.pluginConfigChanged(self.__name__, "reloadplugins", False)
 
 
     def setup(self):
@@ -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")
diff --git a/pyload/plugin/addon/WindowsPhoneToastNotify.py b/pyload/plugin/addon/WindowsPhoneToastNotify.py
index fadc17d04..0ac6719e1 100644
--- a/pyload/plugin/addon/WindowsPhoneToastNotify.py
+++ b/pyload/plugin/addon/WindowsPhoneToastNotify.py
@@ -7,18 +7,18 @@ from pyload.plugin.Addon import Addon
 
 
 class WindowsPhoneToastNotify(Addon):
-    __name    = "WindowsPhoneToastNotify"
-    __type    = "addon"
-    __version = "0.03"
+    __name__    = "WindowsPhoneToastNotify"
+    __type__    = "addon"
+    __version__ = "0.03"
 
-    __config = [("force"      , "bool", "Force even if client is connected"       , False),
+    __config__ = [("force"      , "bool", "Force even if client is connected"       , False),
                 ("pushId"     , "str" , "pushId"                                  , ""   ),
                 ("pushUrl"    , "str" , "pushUrl"                                 , ""   ),
                 ("pushTimeout", "int" , "Timeout between notifications in seconds", 0    )]
 
-    __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")]
 
 
     def getXmlData(self):
diff --git a/pyload/plugin/addon/XMPPInterface.py b/pyload/plugin/addon/XMPPInterface.py
index 8baffe284..77a49af6f 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)