Merge branch 'master' into dev

Author: Galarzaa90

CHANGELOG.rst

@@ -6,6 +6,13 @@ Changelog
     Due to this library relying on external content, older versions are not guaranteed to work.
     Try to always use the latest version.
 
+.. _v2.4.3:
+
+2.4.3 (2020-04-22)
+==================
+- Fixed an error when trying to parse a character with more deaths than what can be displayed in Tibia.com
+    - ``Character.deaths_truncated`` field was added to keep track of this case.
+
 .. _v2.4.2:
 
 2.4.2 (2020-02-26)

serve.py

@@ -144,7 +144,7 @@ async def middleware_handler(request):
 
 
 async def init_client(app):
-    app["tibiapy"] = tibiapy.Client(proxy_url='socks5://127.0.0.1:7744')
+    app["tibiapy"] = tibiapy.Client()
 
 if __name__ == "__main__":
     app = web.Application(middlewares=[error_middleware])

tests/resources/README.md

@@ -12,6 +12,7 @@ deaths by summons, players, assisted deaths, etcetera.
 - [tibiacom_title_badges.txt](character/tibiacom_title_badges.txt) - A character with unlocked titles and badges.
 - [tibiacom_no_badges_selected.txt](character/tibiacom_no_badges_selected.txt) - A character with no selected badges.
 - [tibiacom_multiple_houses.txt](character/tibiacom_multiple_houses.txt) - A character with two houses.
+- [tibiacom_truncated_deaths.txt](character/tibiacom_truncated_deaths.txt) - A character with too many deaths to be displayed.
 - [tibiadata.json](character/tibiadata.json) - A character on TibiaData, also showing Pvp deaths with assists.
 - [tibiadata_deleted.json](character/tibiadata_deleted.json) - A character scheduled for deletion on TibiaData.
 - [tibiadata_not_found.json](character/tibiadata_not_found.json) - The response of a character not found on TibiaData.

tests/resources/character/tibiacom_truncated_deaths.txt

@@ -16,6 +16,7 @@
 FILE_CHARACTER_TITLE_BADGES = "character/tibiacom_title_badges.txt"
 FILE_CHARACTER_NO_BADGES_SELECTED = "character/tibiacom_no_badges_selected.txt"
 FILE_CHARACTER_MULTIPLE_HOUSES = "character/tibiacom_multiple_houses.txt"
+FILE_CHARACTER_TRUNCATED_DEATHS = "character/tibiacom_truncated_deaths.txt"
 
 FILE_CHARACTER_TIBIADATA = "character/tibiadata.json"
 FILE_CHARACTER_TIBIADATA_UNHIDDEN = "character/tibiadata_unhidden.json"
@@ -143,6 +144,14 @@ def test_character_from_content_multiple_houses(self):
         self.assertEqual("Edron", first_house.town)
         self.assertEqual("Rathleton", second_house.town)
 
+    def test_character_from_content_truncated_deaths(self):
+        """Testing parsing a character with truncated daths"""
+        content = self._load_resource(FILE_CHARACTER_TRUNCATED_DEATHS)
+        char = Character.from_content(content)
+        self.assertEqual("Godlike Terror", char.name)
+        self.assertEqual(51, len(char.deaths))
+        self.assertTrue(char.deaths_truncated)
+
     def test_character_from_content_unrelated(self):
         """Testing parsing an unrelated tibia.com section"""
         content = self._load_resource(self.FILE_UNRELATED_SECTION)

tests/tests_character.py

@@ -14,7 +14,7 @@
 from tibiapy.tournament import *
 from tibiapy.client import *
 
-__version__ = '2.4.2'
+__version__ = '2.4.3'
 
 from logging import NullHandler
 

tibiapy/__init__.py

@@ -177,10 +177,15 @@ class Character(abc.BaseCharacter):
         The achievements chosen to be displayed.
     deaths: :class:`list` of :class:`Death`
         The character's recent deaths.
+    deaths_truncated: :class:`bool`
+        Whether the character's deaths are truncated or not.
+
+        In some cases, there are more deaths in the last 30 days than what can be displayed.
     account_information: :class:`AccountInformation`, optional
         The character's account information, if visible.
     other_characters: :class:`list` of :class:`OtherCharacter`
         Other characters in the same account.
+
         It will be empty if the character is hidden, otherwise, it will contain at least the character itself.
     """
     __slots__ = (
@@ -204,6 +209,7 @@ class Character(abc.BaseCharacter):
         "account_badges",
         "achievements",
         "deaths",
+        "deaths_truncated",
         "account_information",
         "other_characters",
         "deletion_date",
@@ -231,6 +237,7 @@ def __init__(self, name=None, world=None, vocation=None, level=0, sex=None, **kw
         self.account_badges = kwargs.get("account_badges", [])  # type: List[AccountBadge]
         self.achievements = kwargs.get("achievements", [])  # type: List[Achievement]
         self.deaths = kwargs.get("deaths", [])  # type: List[Death]
+        self.deaths_truncated = kwargs.get("deaths", False)  # type: bool
         self.account_information = kwargs.get("account_information")  # type: Optional[AccountInformation]
         self.other_characters = kwargs.get("other_characters", [])  # type: List[OtherCharacter]
         self.deletion_date = try_datetime(kwargs.get("deletion_date"))
@@ -546,6 +553,9 @@ def _parse_deaths(self, rows):
         """
         for row in rows:
             cols = row.find_all('td')
+            if len(cols) != 2:
+                self.deaths_truncated = True
+                break
             death_time_str = cols[0].text.replace("\xa0", " ").strip()
             death_time = parse_tibia_datetime(death_time_str)
             death = str(cols[1]).replace("\xa0", " ")