Fixed tests

Author: Galarzaa90

tests/resources/tibiacom_about.txt

@@ -16,7 +16,7 @@ def test_creatures_section_from_boosted_creature_header_content(self):
         creature = CreaturesSection.boosted_creature_from_header(content)
 
         self.assertIsInstance(creature, CreatureEntry)
-        self.assertEqual("Skeleton Warrior", creature.name)
+        self.assertEqual("Menacing Carnivor", creature.name)
 
     def test_creatures_section_from_boosted_creature_header_content_not_tibiacom(self):
         """Testing parsing the boosted creature from a page that is not Tibia.com"""

tests/tests_creature.py

@@ -384,7 +384,7 @@ def from_content(cls, content):
 
                 bazaar.entries.append(auction)
             return bazaar
-        except ValueError as e:
+        except (ValueError, IndexError) as e:
             raise InvalidContent("content does not belong to the bazaar at Tibia.com", original=e)
     # endregion
 

tibiapy/bazaar.py

@@ -295,7 +295,7 @@ def from_content(cls, content):
             boosted_creature_table = parsed_content.find("div", {"class": "TableContainer"})
             boosted_creature_text = boosted_creature_table.find("div", {"class": "Text"})
             if not boosted_creature_text or "Boosted" not in boosted_creature_text.text:
-                return None
+                raise InvalidContent("content is not from the creatures section.")
             boosted_creature_link = boosted_creature_table.find("a")
             url = urllib.parse.urlparse(boosted_creature_link["href"])
             query = urllib.parse.parse_qs(url.query)

tibiapy/creature.py

@@ -122,7 +122,7 @@ def from_content(cls, content):
             selected_world = data["world"] if data["world"] else None
             available_worlds = [w for w in data["__options__"]["world"].values() if w]
             guilds = cls(selected_world, available_worlds=available_worlds)
-        except AttributeError as e:
+        except (AttributeError, KeyError) as e:
             raise InvalidContent("Content does not belong to world guild list.", e)
         # First TableContainer contains world selector.
         _, *containers = parsed_content.find_all('div', class_="TableContainer")

tibiapy/guild.py

@@ -165,7 +165,7 @@ def from_content(cls, content):
         parsed_content = parse_tibiacom_content(content)
         form = parsed_content.find("form")
         tables = cls._parse_tables(parsed_content)
-        if form is None:
+        if form is None or "Highscores" not in tables:
             if "Error" in tables and "The world doesn't exist!" in tables["Error"].text:
                 return None
             raise InvalidContent("content does is not from the highscores section of Tibia.com")

tibiapy/highscores.py

@@ -346,39 +346,42 @@ def from_content(cls, content):
         InvalidContent
             If the content is not the house section on Tibia.com
         """
-        parsed_content = parse_tibiacom_content(content)
-        image_column, desc_column, *_ = parsed_content.find_all('td')
-        if "Error" in image_column.text:
-            return None
-        image = image_column.find('img')
-        for br in desc_column.find_all("br"):
-            br.replace_with("\n")
-        description = desc_column.text.replace("\u00a0", " ").replace("\n\n", "\n")
-        lines = description.splitlines()
         try:
-            name, beds, info, state, *_ = lines
-        except ValueError:
-            raise InvalidContent("content does is not from the house section of Tibia.com")
-
-        house = cls(name.strip())
-        house.image_url = image["src"]
-        house.id = int(id_regex.search(house.image_url).group(1))
-        m = bed_regex.search(beds)
-        if m:
-            if m.group("type").lower() in ["guildhall", "clanhall"]:
-                house.type = HouseType.GUILDHALL
-            else:
-                house.type = HouseType.HOUSE
-            house.beds = int(m.group("beds"))
-
-        m = info_regex.search(info)
-        if m:
-            house.world = m.group("world")
-            house.rent = parse_tibia_money(m.group("rent"))
-            house.size = int(m.group("size"))
+            parsed_content = parse_tibiacom_content(content)
+            image_column, desc_column, *_ = parsed_content.find_all('td')
+            if "Error" in image_column.text:
+                return None
+            image = image_column.find('img')
+            for br in desc_column.find_all("br"):
+                br.replace_with("\n")
+            description = desc_column.text.replace("\u00a0", " ").replace("\n\n", "\n")
+            lines = description.splitlines()
+            try:
+                name, beds, info, state, *_ = lines
+            except ValueError:
+                raise InvalidContent("content does is not from the house section of Tibia.com")
+
+            house = cls(name.strip())
+            house.image_url = image["src"]
+            house.id = int(id_regex.search(house.image_url).group(1))
+            m = bed_regex.search(beds)
+            if m:
+                if m.group("type").lower() in ["guildhall", "clanhall"]:
+                    house.type = HouseType.GUILDHALL
+                else:
+                    house.type = HouseType.HOUSE
+                house.beds = int(m.group("beds"))
 
-        house._parse_status(state)
-        return house
+            m = info_regex.search(info)
+            if m:
+                house.world = m.group("world")
+                house.rent = parse_tibia_money(m.group("rent"))
+                house.size = int(m.group("size"))
+
+            house._parse_status(state)
+            return house
+        except (ValueError, TypeError) as e:
+            raise InvalidContent("content does not belong to a house page", e)
     # endregion
 
     def _parse_status(self, status):

tibiapy/house.py

@@ -112,7 +112,7 @@ def from_content(cls, content):
                 else:
                     entries[columns[0]] = entry
             return cls(world, entries, total, available_worlds=available_worlds)
-        except AttributeError as e:
+        except (AttributeError, KeyError) as e:
             raise InvalidContent("content does not belong to a Tibia.com kill statistics page.", e)
 
 

tibiapy/kill_statistics.py

@@ -178,7 +178,7 @@ def from_content(cls, content):
             leaderboard.total_pages = total
             leaderboard.results_count = count
             return leaderboard
-        except (AttributeError, ValueError) as e:
+        except (AttributeError, ValueError, KeyError) as e:
             raise errors.InvalidContent("content does not belong to the leaderboards", e)
 
     def _parse_entries(self, entries_table):

tibiapy/leaderboard.py

@@ -132,7 +132,7 @@ def from_content(cls, content):
             spells_section.sort_by = try_enum(SpellSorting, data["sort"])
             spells_section.premium = "yes" in data["premium"] if data["premium"] else None
             return spells_section
-        except (AttributeError, TypeError) as e:
+        except (AttributeError, TypeError, KeyError) as e:
             raise errors.InvalidContent("content does not belong to the Spells section", e)
 
     @classmethod