Merge pull request #141 from TotallyNotRobots/gonzobot+fix-warnings

Fix warnings in tests and plugins

Author: linuxdaemon

cloudbot/hook.py

@@ -117,7 +117,7 @@ def add_hook(self, regex_param, kwargs):
             # we only use regex.search anyways, so this is a good determiner
             self.regexes.append(regex_param)
         else:
-            assert isinstance(regex_param, collections.Iterable)
+            assert isinstance(regex_param, collections.abc.Iterable)
             # if the parameter is a list, add each one
             for re_to_match in regex_param:
                 if isinstance(re_to_match, str):

plugins/core/chan_track.py

@@ -9,7 +9,8 @@
 import logging
 import time
 import weakref
-from collections import Mapping, Iterable, namedtuple
+from collections.abc import Mapping, Iterable
+from collections import namedtuple
 from contextlib import suppress
 from numbers import Number
 from operator import attrgetter

tests/core_tests/test_client.py

@@ -8,7 +8,7 @@ class Bot(MagicMock):
     loop = asyncio.get_event_loop()
 
 
-class TestClient(Client):  # pylint: disable=abstract-method
+class MockClient(Client):  # pylint: disable=abstract-method
     _connected = False
 
     def __init__(self, bot, *args, **kwargs):
@@ -23,7 +23,7 @@ async def connect(self, timeout=None):
         self._connected = True
 
 
-class FailingTestClient(TestClient):  # pylint: disable=abstract-method
+class FailingMockClient(MockClient):  # pylint: disable=abstract-method
     def __init__(self, *args, fail_count=None, **kwargs):
         super().__init__(*args, **kwargs)
         self.fail_count = fail_count
@@ -35,14 +35,14 @@ async def connect(self, timeout=None):
 
 
 def test_client_no_config():
-    client = TestClient(
+    client = MockClient(
         Bot(), 'foo', 'foobot', channels=['#foo']
     )
     assert client.config.get('a') is None
 
 
 def test_client():
-    client = TestClient(
+    client = MockClient(
         Bot(), 'foo', 'foobot', channels=['#foo'], config={'name': 'foo'}
     )
 
@@ -60,15 +60,15 @@ def test_client():
 
 def test_client_connect_exc():
     with patch('random.randrange', return_value=1):
-        client = FailingTestClient(
+        client = FailingMockClient(
             Bot(), 'foo', 'foobot', channels=['#foo'], config={'name': 'foo'},
             fail_count=1
         )
         client.loop.run_until_complete(client.try_connect())
 
 
 def test_auto_reconnect():
-    client = TestClient(
+    client = MockClient(
         Bot(), 'foo', 'foobot', channels=['#foo'], config={'name': 'foo'}
     )
 

tests/plugin_tests/test_core_misc.py

@@ -12,7 +12,7 @@ class Bot(MagicMock):
     loop = asyncio.get_event_loop()
 
 
-class TestClient(Client):  # pylint: disable=abstract-method
+class MockClient(Client):  # pylint: disable=abstract-method
     def __init__(self, bot, *args, **kwargs):
         super().__init__(bot, 'TestClient', *args, **kwargs)
         self.active = True
@@ -21,7 +21,7 @@ def __init__(self, bot, *args, **kwargs):
 
 
 async def test_do_joins():
-    client = TestClient(
+    client = MockClient(
         Bot(), 'foo', 'foobot', channels=['#foo']
     )
     from plugins.core import core_misc

tests/plugin_tests/test_cryptocurrency.py

@@ -1,3 +1,4 @@
+import re
 from datetime import datetime, timedelta
 from typing import Dict, List
 from unittest.mock import MagicMock
@@ -239,7 +240,7 @@ def test_schema_unknown_fields():
     input_data = {'a': {'a': 'hello', 'b': 'world'}, 'c': 1}
     with pytest.warns(
         UserWarning,
-        match=r"Unknown fields: \['c'\] while parsing schema 'NestedSchema'",
+        match=re.escape("Unknown fields: ['c'] while parsing schema 'NestedSchema'"),
     ):
         cryptocurrency.read_data(input_data, NestedSchema)