Handle unicode decode errors as NetworkError

Author: Galarzaa90

tests/tests_enums.py

@@ -0,0 +1,14 @@
+import unittest
+
+from tests.tests_tibiapy import TestCommons
+from tibiapy.enums import *
+
+
+class TestEnums(TestCommons, unittest.TestCase):
+    def test_vocation_filter_from_name(self):
+        """Testing getting a VocationFilter entry from a vocation's name"""
+        self.assertEqual(VocationFilter.KNIGHTS, VocationFilter.from_name("elite knight"))
+        self.assertEqual(VocationFilter.KNIGHTS, VocationFilter.from_name("knight"))
+        self.assertEqual(VocationFilter.KNIGHTS, VocationFilter.from_name("knights"))
+        self.assertEqual(VocationFilter.ALL, VocationFilter.from_name("anything"))
+        self.assertIsNone(VocationFilter.from_name("anything", all_fallback=False))

tibiapy/client.py

@@ -18,7 +18,8 @@
 CACHE_LIMIT = 300
 
 
-class TibiaResponse:
+# This class is not used in this release.
+class _TibiaResponse:  # pragma: no cover
     def __init__(self, data=None, cache_limit=CACHE_LIMIT, **kwargs):
         self.data = None
         self.cached = kwargs.get("cached")
@@ -59,7 +60,7 @@ def __init__(self, loop=None, session=None, *, proxy_url=None):
 
     async def _initialize_session(self, proxy_url=None):
         headers = {
-            'User-Agent': "Tibia.py/%s (+https://github.com/Galarzaa90/tibia.py" % tibiapy.__version__,
+            'User-Agent': "Tibia.py/%s (+https://github.com/Galarzaa90/tibia.py)" % tibiapy.__version__,
             'Accept-Encoding': "deflate, gzip"
         }
         connector = aiohttp_socks.SocksConnector.from_url(proxy_url) if proxy_url else None
@@ -105,6 +106,8 @@ async def _get(self, url):
             raise NetworkError("aiohttp.ClientError: %s" % e, e)
         except aiohttp_socks.SocksConnectionError as e:
             raise NetworkError("aiohttp_socks.SocksConnectionError: %s" % e, e)
+        except UnicodeDecodeError as e:
+            raise NetworkError('UnicodeDecodeError: %s' % e, e)
 
     async def _post(self, url, data):
         """Base POST request, handling possible error statuses.
@@ -127,6 +130,10 @@ async def _post(self, url, data):
                 return await resp.text()
         except aiohttp.ClientError as e:
             raise NetworkError("aiohttp.ClientError: %s" % e, e)
+        except aiohttp_socks.SocksConnectionError as e:
+            raise NetworkError("aiohttp_socks.SocksConnectionError: %s" % e, e)
+        except UnicodeDecodeError as e:
+            raise NetworkError('UnicodeDecodeError: %s' % e, e)
 
     async def fetch_boosted_creature(self):
         """Fetches today's boosted creature.
@@ -420,9 +427,9 @@ async def fetch_news_archive(self, begin_date, end_date, categories=None, types=
         if begin_date > end_date:
             raise ValueError("begin_date can't be more recent than end_date")
         if not categories:
-            categories = NewsCategory.items()
+            categories = list(NewsCategory)
         if not types:
-            types = NewsType.items()
+            types = list(NewsType)
         data = {
             "filter_begin_day": begin_date.day,
             "filter_begin_month": begin_date.month,

tibiapy/enums.py

@@ -26,10 +26,6 @@ def __str__(self):
     def __repr__(self):
         return "%s.%s" % (self.__class__.__name__, self.name)
 
-    @classmethod
-    def items(cls):
-        return [i for i in cls]
-
 
 class AccountStatus(BaseEnum):
     """Possible account statuses."""