Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Valentin Lorentz 2011-06-30 09:57:44 +02:00
parent f0571e434b 3b5d2cb48b
commit 5ddbba4152
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Herald/plugin.py
View File

@ -149,7 +149,7 @@ class Herald(callbacks.Plugin):
""" """
if optlist and text: if optlist and text:
raise callbacks.ArgumentError raise callbacks.ArgumentError
for (option, _) in optlist: for (option, foo) in optlist:
if option == 'remove': if option == 'remove':
self.setRegistryValue('default', '', channel) self.setRegistryValue('default', '', channel)
irc.replySuccess() irc.replySuccess()

4
src/utils/httpserver.py
View File

@ -132,7 +132,7 @@ class SupyHTTPServerCallback:
message, it probably means you are developping a plugin, and you have message, it probably means you are developping a plugin, and you have
neither overriden this message or defined an handler for this query.""") neither overriden this message or defined an handler for this query.""")
def doGet(self, handler, path): def doGet(self, handler, path, *args, **kwargs):
handler.send_response(400) handler.send_response(400)
self.send_header('Content_type', 'text/plain') self.send_header('Content_type', 'text/plain')
self.send_header('Content-Length', len(self.defaultResponse)) self.send_header('Content-Length', len(self.defaultResponse))
@ -153,7 +153,7 @@ class Supy404(SupyHTTPServerCallback):
if I don't know what to serve. if I don't know what to serve.
What I'm saying is you just triggered a 404 Not Found, and I am not What I'm saying is you just triggered a 404 Not Found, and I am not
trained to help you in such a case.""") trained to help you in such a case.""")
def doGet(self, handler, path): def doGet(self, handler, path, *args, **kwargs):
handler.send_response(404) handler.send_response(404)
self.send_header('Content_type', 'text/plain') self.send_header('Content_type', 'text/plain')
self.send_header('Content-Length', len(self.response)) self.send_header('Content-Length', len(self.response))