wip

Author: JulienPalard

irc3/__init__.py

@@ -128,10 +128,8 @@ def __init__(self, *ini, **config):
                 self.log.fatal('realname = %(userinfo)s', self.config)
             import sys
             sys.exit(-1)
-        self.queue = None
-        if self.config.asynchronous:
-            self.queue = Queue(loop=self.loop)
-            self.awaiting_queue = self.create_task(self.process_queue())
+        self.queue = Queue(loop=self.loop)
+        self.awaiting_queue = self.create_task(self.process_queue())
         self._ip = self._dcc = None
         # auto include the sasl plugin if needed
         if 'sasl_username' in self.config and \
@@ -373,29 +371,25 @@ def dcc(self):
             self._dcc = DCCManager(self)
         return self._dcc
 
-    @asyncio.coroutine
-    def dcc_chat(self, mask, host=None, port=None):
+    async def dcc_chat(self, mask, host=None, port=None):
         """Open a DCC CHAT whith mask. If host/port are specified then connect
         to a server. Else create a server"""
         return self.dcc.create(
             'chat', mask, host=host, port=port).ready
 
-    @asyncio.coroutine
-    def dcc_get(self, mask, host, port, filepath, filesize=None):
+    async def dcc_get(self, mask, host, port, filepath, filesize=None):
         """DCC GET a file from mask. filepath must be an absolute path with an
         existing directory. filesize is the expected file size."""
         return self.dcc.create(
             'get', mask, filepath=filepath, filesize=filesize,
             host=host, port=port).ready
 
-    @asyncio.coroutine
-    def dcc_send(self, mask, filepath):
+    async def dcc_send(self, mask, filepath):
         """DCC SEND a file to mask. filepath must be an absolute path to
         existing file"""
         return self.dcc.create('send', mask, filepath=filepath).ready
 
-    @asyncio.coroutine
-    def dcc_accept(self, mask, filepath, port, pos):
+    async def dcc_accept(self, mask, filepath, port, pos):
         """accept a DCC RESUME for an axisting DCC SEND. filepath is the
         filename to sent.  port is the port opened on the server.
         pos is the expected offset"""
@@ -420,6 +414,11 @@ def cancel(self):
             except asyncio.CancelledError:
                 pass
 
+    def close(self):
+        self.cancel()
+        super().close()
+
+
 def run(argv=None):
     bots = {}
     bot = IrcBot.from_argv(argv, botnet=bots)

irc3/base.py

@@ -71,7 +71,6 @@ class IrcObject:
         port=6667,
         timeout=320,
         max_lag=60,
-        asynchronous=True,
         max_length=512,
         testing=False,
         ssl=False,
@@ -100,11 +99,12 @@ def __init__(self, *ini, **config):
         self.encoding = self.config['encoding']
 
         self.loop = self.config.loop
+        self._own_loop = None
         if self.loop is None:
             try:
                 self.loop = asyncio.get_event_loop()
             except RuntimeError:
-                self.loop = asyncio.new_event_loop()
+                self.loop = self._own_loop = asyncio.new_event_loop()
                 asyncio.set_event_loop(self.loop)
 
         # python 3.4.1 do not have a create_task method. check for it
@@ -273,7 +273,7 @@ def notify(self, event, exc=None, client=None):
     def dispatch(self, data, iotype='in', client=None):
         str = utils.IrcString
         create_task = self.create_task
-        call_soon = self.loop.call_soon
+        tasks = []
         for match, events in self.registry.get_event_matches(data, iotype):
             match = match.groupdict()
             for key, value in match.items():
@@ -288,9 +288,10 @@ def dispatch(self, data, iotype='in', client=None):
                 match['client'] = client
             for e in events:
                 if e.iscoroutine is True:
-                    create_task(e.callback(**match))
+                    tasks.append(create_task(e.callback(**match)))
                 else:
-                    call_soon(e.async_callback, match)
+                    tasks.append(create_task(e.async_callback(match)))
+        return tasks
 
     def call_many(self, callback, args):
         """callback is run with each arg but run a call per second"""
@@ -460,3 +461,8 @@ def from_argv(cls, argv=None, **kwargs):
             context.run(forever=not bool(kwargs))
         if kwargs or argv:
             return context
+
+    def close(self):
+        if self._own_loop is not None:
+            self._own_loop.stop()
+            self._own_loop.run_forever()

irc3/dec.py

@@ -54,7 +54,7 @@ def __init__(self, regexp, callback=None, iotype='in',
         if callback is not None:
             self.iscoroutine = asyncio.iscoroutinefunction(callback)
 
-    def async_callback(self, kwargs):  # pragma: no cover
+    async def async_callback(self, kwargs):  # pragma: no cover
         return self.callback(**kwargs)
 
     def compile(self, config):
@@ -103,7 +103,7 @@ def extend(func):
         >>> import sys
         >>> sys.path.append('examples')
         >>> from irc3 import IrcBot
-        >>> IrcBot.defaults.update(asynchronous=False, testing=True)
+        >>> IrcBot.defaults.update(testing=True)
 
     Now you can use those routine in your bot::
 

irc3/plugins/asynchronious.py

@@ -66,7 +66,7 @@ def do_whois(self):
 
 class Whois(AsyncEvents):
 
-    # the command will fail if we do not have a result after 30s
+    # the command will fail if we do not have a result after 20s
     timeout = 20
 
     # send this line before listening to events

irc3/plugins/command.py

@@ -66,6 +66,8 @@
     PRIVMSG #chan :!echo <words>...
     >>> bot.test(':gawel!user@host PRIVMSG #chan :!help nonexistant')
     PRIVMSG #chan :No such command. Try !help for an overview of all commands.
+    >>> bot.close()
+
 
 Guard
 =====

irc3/testing.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import asyncio
 from unittest import TestCase
 import irc3
 import irc3d
@@ -55,17 +56,7 @@ class IrcBot(irc3.IrcBot):
 
     def __init__(self, **config):
         self.check_required()
-        self._own_loop = None
-        if 'loop' not in config:
-            loop = asyncio.new_event_loop()
-            loop = mock.create_autospec(loop, spec_set=True)
-            loop.call_later = call_later
-            loop.call_soon = call_soon
-            loop.time.return_value = 10
-            config.update(testing=True, asynchronous=False, level=1000,
-                          loop=loop)
-        else:
-            config.update(testing=True, level=1000)
+        config.update(testing=True, level=1000)
         super(IrcBot, self).__init__(**config)
         self.protocol = irc3.IrcConnection()
         self.protocol.closed = False
@@ -83,7 +74,7 @@ def check_required(self):  # pragma: no cover
                 fd.write(passwd_ini)
 
     def test(self, data, show=True):
-        self.dispatch(data)
+        self.loop.run_until_complete(asyncio.wait(self.dispatch(data)))
         if show:
             for line in self.sent:  # pragma: no cover
                 print(line)
@@ -189,8 +180,7 @@ def __init__(self, **config):
         loop.call_soon = call_soon
         loop.time = MagicMock()
         loop.time.return_value = 10
-        config.update(testing=True, asynchronous=False, level=1000,
-                      loop=loop)
+        config.update(testing=True, level=1000, loop=loop)
         super(IrcServer, self).__init__(**config)
         print(self.clients)
 

tests/test_commands.py

@@ -201,8 +201,7 @@ def test_reconnect_command(self):
 
     @unittest.skip('')
     def test_antiflood(self):
-        bot = self.callFTU(asynchronous=True,
-                           **{self.name: dict(antiflood=True)})
+        bot = self.callFTU(**{self.name: dict(antiflood=True)})
         bot.dispatch(':bar!user@host PRIVMSG #chan :!help ping')
         self.assertSent(['PRIVMSG #chan :ping/pong', 'PRIVMSG #chan :!ping'])