From 282362c01b67f83ff5cf677ba125a41a6d594f2c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 15 Nov 2014 17:15:29 +0100
Subject: Update plugins 2

---
 pyload/plugins/addon/IRCInterface.py            | 2 +-
 pyload/plugins/addon/UpdateManager.py           | 8 +-------
 pyload/plugins/addon/WindowsPhoneToastNotify.py | 4 ----
 3 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'pyload/plugins/addon')

diff --git a/pyload/plugins/addon/IRCInterface.py b/pyload/plugins/addon/IRCInterface.py
index d06dad07f..cbb97038b 100644
--- a/pyload/plugins/addon/IRCInterface.py
+++ b/pyload/plugins/addon/IRCInterface.py
@@ -89,7 +89,7 @@ class IRCInterface(Thread, Addon):
         self.sock.connect((host, self.getConfig("port")))
 
         if self.getConfig("ssl"):
-            self.sock = ssl.wrap_socket(self.sock, cert_reqs=ssl.CERT_NONE)  #@TODO: support certificate
+            self.sock = ssl.wrap_socket(self.sock, cert_reqs=ssl.CERT_NONE)  #@TODO: support custom certificate
 
         nick = self.getConfig("nick")
         self.sock.send("NICK %s\r\n" % nick)
diff --git a/pyload/plugins/addon/UpdateManager.py b/pyload/plugins/addon/UpdateManager.py
index 651cdde80..4a7fa736a 100644
--- a/pyload/plugins/addon/UpdateManager.py
+++ b/pyload/plugins/addon/UpdateManager.py
@@ -187,7 +187,7 @@ class UpdateManager(Addon):
 
         for plugin in upgradable:
             filename = plugin['name']
-            prefix   = plugin['type']
+            type     = plugin['type']
             version  = plugin['version']
 
             if filename.endswith(".pyc"):
@@ -195,12 +195,6 @@ class UpdateManager(Addon):
             else:
                 name = filename.replace(".py", "")
 
-            #@TODO: obsolete after 0.4.10
-            if prefix.endswith("s"):
-                type = prefix[:-1]
-            else:
-                type = prefix
-
             plugins = getattr(self.core.pluginManager, "%sPlugins" % type)
 
             oldver = float(plugins[name]['v']) if name in plugins else None
diff --git a/pyload/plugins/addon/WindowsPhoneToastNotify.py b/pyload/plugins/addon/WindowsPhoneToastNotify.py
index abcd6c55c..4c57ff72c 100644
--- a/pyload/plugins/addon/WindowsPhoneToastNotify.py
+++ b/pyload/plugins/addon/WindowsPhoneToastNotify.py
@@ -21,10 +21,6 @@ class WindowsPhoneToastNotify(Addon):
     __authors__     = [("Andy Voigt", "phone-support@hotmail.de")]
 
 
-    def setup(self):
-        self.info = {}  #@TODO: Remove in 0.4.10
-
-
     def getXmlData(self):
         myxml = ("<?xml version='1.0' encoding='utf-8'?> <wp:Notification xmlns:wp='WPNotification'> "
                  "<wp:Toast> <wp:Text1>Pyload Mobile</wp:Text1> <wp:Text2>Captcha waiting!</wp:Text2> "
-- 
cgit v1.2.3