Merge branch 'development' into master

MANIFEST

@@ -25,8 +25,10 @@ ameliabot/plugins/help.py
 ameliabot/plugins/ircadm.py
 ameliabot/plugins/join.py
 ameliabot/plugins/keep_alive.py
+ameliabot/plugins/latex.py
 ameliabot/plugins/lichess.py
 ameliabot/plugins/logmsg.py
+ameliabot/plugins/mathb.py
 ameliabot/plugins/note.py
 ameliabot/plugins/pipe.py
 ameliabot/plugins/polyglot.py

ameliabot/plugins/dcc_send.py

@@ -15,7 +15,7 @@
 
 from quickirc import DccServer, send_msg
 from untwisted.iputils import ip_to_long
-from untwisted.event import DONE, ACCEPT_ERR, TIMEOUT, CLOSE
+from untwisted.event import DONE, TIMEOUT, CLOSE
 from os.path import getsize, join
 from socket import error
 from ameliabot.cmd import command
@@ -49,7 +49,6 @@ def is_done(dccserv, client, msg):
 
             dccserv.add_map(DONE, is_done, 'Done.')
             dccserv.add_map(CLOSE, lambda dccserv, client, err: is_done(dccserv, client, 'Failed.'))
-            dccserv.add_map(ACCEPT_ERR, lambda dccserv, err: is_done(dccserv, None, "Accept error."))
 
             # TIMEOUT is an event that occurs in the dccsev ssock
             # instance not in the client instance.

requirements.txt

@@ -1,4 +1,4 @@
-untwisted>=3.0.0
+untwisted>=3.2.1
 quickirc>=1.2.0
 ehp==2.0.1
 pytio

setup.py

@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup(name="ameliabot",
-      version="2.1.0",
+      version="2.1.1",
       packages=["ameliabot", 
                 "ameliabot.plugins",
                 'ameliabot.plugins.quote'],