Merge branch 'testing' of github.com:slackhead/Limnoria into testing

plugins/Config/plugin.py

@@ -239,6 +239,18 @@ class Config(callbacks.Plugin):
             s = group.help()
             if s:
                 if hasattr(group, 'value') and not group._private:
+                    channel = msg.args[0]
+                    if irc.isChannel(channel) and \
+                            channel in group._children:
+                        globvalue = str(group)
+                        chanvalue = str(group.get(channel))
+                        if chanvalue != globvalue:
+                            s += _('  (Current global value: %s;  '
+                                    'current channel value: %s)') % \
+                                            (globvalue, chanvalue)
+                        else:
+                            s += _('  (Current value: %s)') % group
+                    else:
                         s += _('  (Current value: %s)') % group
                 irc.reply(s)
             else:

plugins/PluginDownloader/plugin.py

@@ -301,6 +301,10 @@ repositories = {
                                                    'GLolol',
                                                    'SupyPlugins',
                                                    ),
+               'Iota':             GithubRepository(
+                                                   'IotaSpencer',
+                                                   'supyplugins',
+                                                   ),
                }
 
 class PluginDownloader(callbacks.Plugin):

src/httpserver.py

@@ -361,15 +361,15 @@ class Favicon(SupyHTTPServerCallback):
         file_path = conf.supybot.servers.http.favicon()
         found = False
         if file_path:
+            response = None
             try:
-                icon = open(file_path, 'r')
+                icon = open(file_path, 'rb')
-                found = True
+                response = icon.read()
             except IOError:
                 pass
             finally:
                 icon.close()
-        if found:
+        if response is not None:
-            response = icon.read()
             filename = file_path.rsplit(os.sep, 1)[1]
             if '.' in filename:
                 ext = filename.rsplit('.', 1)[1]

src/log.py

@@ -208,8 +208,11 @@ class ValidLogLevel(registry.String):
     minimumLevel = -1
     def set(self, s):
         s = s.upper()
+        try:
             try:
                 level = logging._levelNames[s]
+            except AttributeError:
+                level = logging._nameToLevel[s]
         except KeyError:
             try:
                 level = int(s)