Merge branch 'gonzobot' into gonzobot+clean-up-func-launches

Author: linuxdaemon

.travis.yml

@@ -4,6 +4,10 @@ python:
   - "3.5"
   - "3.6"
   - "3.7-dev"
+  - "nightly"
+  - "pypy3"
+
+cache: pip
 
 install:
   - "sudo apt-get update -q"
@@ -18,3 +22,9 @@ after_success:
 
 env:
   - PYTHONPATH=.
+  - PYTHONPATH=. PYTHONASYNCIODEBUG=1
+
+matrix:
+  allow_failures:
+    - python: "3.7-dev"
+    - python: "nightly"

cloudbot/bot.py

@@ -314,7 +314,7 @@ def add_hook(hook, _event, _run_before=False):
                             add_hook(command_hook, command_event)
                         else:
                             event.notice("Possible matches: {}".format(
-                                formatting.get_text_list([command for command, plugin in potential_matches])))
+                                formatting.get_text_list(sorted([command for command, plugin in potential_matches]))))
 
         if event.type in (EventType.message, EventType.action):
             # Regex hooks

cloudbot/client.py

@@ -79,7 +79,7 @@ def try_connect(self):
             try:
                 yield from self.connect(timeout)
             except Exception:
-                logger.exception("[%s] Error occurred while connecting.")
+                logger.exception("[%s] Error occurred while connecting.", self.name)
             else:
                 break
 

cloudbot/clients/irc.py

@@ -126,11 +126,13 @@ def connect(self, timeout=None):
             return
 
         if self._connected:
+            self._connected = False
             logger.info("[{}] Reconnecting".format(self.name))
-            self._transport.close()
+            if self._transport:
+                self._transport.close()
         else:
-            self._connected = True
             logger.info("[{}] Connecting".format(self.name))
+
         optional_params = {}
         if self.local_bind:
             optional_params["local_addr"] = self.local_bind
@@ -144,6 +146,8 @@ def connect(self, timeout=None):
 
         self._transport, self._protocol = yield from coro
 
+        self._connected = True
+
         tasks = [
             self.bot.plugin_manager.launch(hook, Event(bot=self.bot, conn=self, hook=hook))
             for hook in self.bot.plugin_manager.connect_hooks
@@ -303,14 +307,14 @@ def connection_lost(self, exc):
             # we've been closed intentionally, so don't reconnect
             return
         logger.error("[{}] Connection lost: {}".format(self.conn.name, exc))
-        async_util.wrap_future(self.conn.connect(), loop=self.loop)
+        async_util.wrap_future(self.conn.try_connect(), loop=self.loop)
 
     def eof_received(self):
         self._connected = False
         # create a new connected_future for when we are connected.
         self._connected_future = async_util.create_future(self.loop)
         logger.info("[{}] EOF received.".format(self.conn.name))
-        async_util.wrap_future(self.conn.connect(), loop=self.loop)
+        async_util.wrap_future(self.conn.try_connect(), loop=self.loop)
         return True
 
     @asyncio.coroutine

cloudbot/util/formatting.py

@@ -47,6 +47,7 @@
 import copy
 import html.entities
 import re
+import warnings
 from html.parser import HTMLParser
 
 from cloudbot.util.colors import strip_irc
@@ -247,11 +248,65 @@ def pluralize(num=0, text=''):
     Takes a number and a string, and pluralizes that string using the number and combines the results.
     :rtype: str
     """
-    return "{:,} {}{}".format(num, text, "s"[num == 1:])
+    warnings.warn(
+        "formatting.pluralize() is deprecated, please use one of the other formatting.pluralize_*() functions",
+        DeprecationWarning
+    )
+    return pluralize_suffix(num, text)
 
 
-# alternate form
-pluralise = pluralize
+def pluralise(num=0, text=''):
+    """
+    Takes a number and a string, and pluralizes that string using the number and combines the results.
+    :rtype: str
+    """
+    warnings.warn(
+        "formatting.pluralise() is deprecated, please use one of the other formatting.pluralise_*() functions",
+        DeprecationWarning
+    )
+    return pluralise_suffix(num, text)
+
+
+def pluralize_suffix(num=0, text='', suffix='s'):
+    """
+    Takes a number and a string, and pluralizes that string using the number and combines the results.
+    :rtype: str
+    """
+    return pluralize_select(num, text, text + suffix)
+
+
+pluralise_suffix = pluralize_suffix
+
+
+def pluralize_select(count, single, plural):
+    return "{:,} {}".format(count, single if count == 1 else plural)
+
+
+pluralise_select = pluralize_select
+
+
+def pluralize_auto(count, thing):
+    if thing.endswith(('s', 'ss', 'sh', 'ch', 'x', 'z')):
+        return pluralize_suffix(count, thing, 'es')
+    elif thing.endswith(('f', 'fe')):
+        return pluralize_select(count, thing, thing.rsplit('f', 1)[0] + 'ves')
+    elif thing.endswith('y') and thing[-2:-1].lower() not in "aeiou":
+        return pluralize_select(count, thing, thing[:-1] + 'ies')
+    elif thing.endswith('y') and thing[-2:-1].lower() in "aeiou":
+        return pluralize_suffix(count, thing)
+    elif thing.endswith('o'):
+        return pluralize_suffix(count, thing, 'es')
+    elif thing.endswith('us'):
+        return pluralize_select(count, thing, thing[:-2] + 'i')
+    elif thing.endswith('is'):
+        return pluralize_select(count, thing, thing[:-2] + 'es')
+    elif thing.endswith('on'):
+        return pluralize_select(count, thing, thing[:-2] + 'a')
+    else:
+        return pluralize_suffix(count, thing)
+
+
+pluralise_auto = pluralize_auto
 
 
 def dict_format(args, formats):

cloudbot/util/test/test_formatting.py

@@ -1,5 +1,6 @@
-from cloudbot.util.formatting import munge, dict_format, pluralize, strip_colors, truncate, truncate_str, \
-    strip_html, multi_replace, multiword_replace, truncate_words, smart_split, get_text_list, ireplace, chunk_str
+from cloudbot.util.formatting import munge, dict_format, strip_colors, truncate, truncate_str, \
+    strip_html, multi_replace, multiword_replace, truncate_words, smart_split, get_text_list, ireplace, chunk_str, \
+    pluralize_suffix
 
 test_munge_input = "The quick brown fox jumps over the lazy dog"
 test_munge_count = 3
@@ -55,8 +56,8 @@ def test_dict_format():
 
 
 def test_pluralize():
-    assert pluralize(test_pluralize_num_a, test_pluralize_text) == test_pluralize_result_a
-    assert pluralize(test_pluralize_num_b, test_pluralize_text) == test_pluralize_result_b
+    assert pluralize_suffix(test_pluralize_num_a, test_pluralize_text) == test_pluralize_result_a
+    assert pluralize_suffix(test_pluralize_num_b, test_pluralize_text) == test_pluralize_result_b
 
 
 def test_strip_colors():

cloudbot/util/web.py

@@ -87,7 +87,12 @@ def try_shorten(self, url, custom=None, key=None):
             return url
 
     def expand(self, url):
-        r = requests.get(url, allow_redirects=False)
+        try:
+            r = requests.get(url, allow_redirects=False)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
 
         if 'location' in r.headers:
             return r.headers['location']
@@ -127,7 +132,13 @@ def _decorate(impl):
 class Isgd(Shortener):
     def shorten(self, url, custom=None, key=None):
         p = {'url': url, 'shorturl': custom, 'format': 'json'}
-        r = requests.get('http://is.gd/create.php', params=p)
+        try:
+            r = requests.get('http://is.gd/create.php', params=p)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
+
         j = r.json()
 
         if 'shorturl' in j:
@@ -137,7 +148,13 @@ def shorten(self, url, custom=None, key=None):
 
     def expand(self, url):
         p = {'shorturl': url, 'format': 'json'}
-        r = requests.get('http://is.gd/forward.php', params=p)
+        try:
+            r = requests.get('http://is.gd/forward.php', params=p)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
+
         j = r.json()
 
         if 'url' in j:
@@ -152,7 +169,13 @@ def shorten(self, url, custom=None, key=None):
         h = {'content-type': 'application/json'}
         k = {'key': key}
         p = {'longUrl': url}
-        r = requests.post('https://www.googleapis.com/urlshortener/v1/url', params=k, data=json.dumps(p), headers=h)
+        try:
+            r = requests.post('https://www.googleapis.com/urlshortener/v1/url', params=k, data=json.dumps(p), headers=h)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
+
         j = r.json()
 
         if 'error' not in j:
@@ -162,7 +185,13 @@ def shorten(self, url, custom=None, key=None):
 
     def expand(self, url):
         p = {'shortUrl': url}
-        r = requests.get('https://www.googleapis.com/urlshortener/v1/url', params=p)
+        try:
+            r = requests.get('https://www.googleapis.com/urlshortener/v1/url', params=p)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
+
         j = r.json()
 
         if 'error' not in j:
@@ -175,7 +204,12 @@ def expand(self, url):
 class Gitio(Shortener):
     def shorten(self, url, custom=None, key=None):
         p = {'url': url, 'code': custom}
-        r = requests.post('http://git.io', data=p)
+        try:
+            r = requests.post('http://git.io', data=p)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
 
         if r.status_code == requests.codes.created:
             s = r.headers['location']
@@ -190,13 +224,19 @@ def shorten(self, url, custom=None, key=None):
 @_pastebin('hastebin')
 class Hastebin(Pastebin):
     def paste(self, data, ext):
-        r = requests.post(HASTEBIN_SERVER + '/documents', data=data)
-        j = r.json()
-
-        if r.status_code is requests.codes.ok:
-            return '{}/{}.{}'.format(HASTEBIN_SERVER, j['key'], ext)
+        try:
+            r = requests.post(HASTEBIN_SERVER + '/documents', data=data)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
         else:
-            raise ServiceError(j['message'], r)
+            j = r.json()
+
+            if r.status_code is requests.codes.ok:
+                return '{}/{}.{}'.format(HASTEBIN_SERVER, j['key'], ext)
+            else:
+                raise ServiceError(j['message'], r)
 
 
 @_pastebin('snoonet')
@@ -207,10 +247,10 @@ def paste(self, data, ext):
             'expire': '1d'
         }
         try:
-            r = requests.post(SNOONET_PASTE + '/paste/new', params=params)
+            r = requests.post(SNOONET_PASTE + '/paste/new', data=params)
             r.raise_for_status()
         except RequestException as e:
             r = e.response
-            return ServiceError(r.status_code, r)
+            raise ServiceError(r.status_code, r)
         else:
             return '{}'.format(r.url)