[ruff] Ruff-specific rules and fixes

Author: Galarzaa90

pyproject.toml

@@ -200,6 +200,8 @@ select = [
     "ARG",
     # Perflint
     "PERF",
+    # Ruff-specific rules
+    "RUF",
 
 ]
 ignore = [
@@ -209,7 +211,14 @@ ignore = [
     "D107",
     # Unused lambda argument
     "ARG005",
-
+    # 1 blank line required before class docstring
+    "D203",
+    # 1 blank line required before class docstring
+    "D213",
+    # Mutable class attributes should be annotated with `typing.ClassVar`
+    "RUF012",
+    # PEP 484 prohibits implicit `Optional`
+    "RUF013"
 ]
 
 

tests/tests_bazaar.py

@@ -5,7 +5,7 @@
     AuctionSkillFilter, \
     AuctionStatus, AuctionVocationFilter, BidType, PvpTypeFilter, Sex, Vocation
 from tibiapy.parsers import AuctionParser, CharacterBazaarParser
-from tibiapy import InvalidContent
+from tibiapy import InvalidContentError
 
 FILE_BAZAAR_CURRENT_EMPTY = "characterBazaar/bazaarHistoryEmpty.txt"
 FILE_BAZAAR_CURRENT = "characterBazaar/bazaarCurrentAuctions.txt"
@@ -73,7 +73,7 @@ def test_character_bazaar_parser_from_content_history(self):
     def test_character_bazaar_parser_from_content_unrelated(self):
         """Testing parsing an unrelated tibia.com section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             CharacterBazaarParser.from_content(content)
 
     def test_auction_parser_from_content_finished(self):
@@ -206,5 +206,5 @@ def test_auction_parser_from_content_not_found(self):
     def test_auction_parser_from_content_unrelated(self):
         """Testing parsing an unrelated tibia.com section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             AuctionParser.from_content(content)

tests/tests_character.py

@@ -1,7 +1,7 @@
 import datetime
 
 from tests.tests_tibiapy import TestCommons
-from tibiapy import InvalidContent
+from tibiapy import InvalidContentError
 from tibiapy.enums import Sex, Vocation
 from tibiapy.models import Character
 from tibiapy.parsers import CharacterParser
@@ -164,7 +164,7 @@ def test_character_parser_from_content_truncated_deaths(self):
     def test_character_parser_from_content_unrelated(self):
         """Testing parsing an unrelated tibia.com section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             CharacterParser.from_content(content)
 
     # endregion

tests/tests_client.py

@@ -17,7 +17,7 @@
 from tests.tests_news import FILE_NEWS_ARCHIVE_RESULTS_FILTERED, FILE_NEWS_ARTICLE
 from tests.tests_tibiapy import TestCommons
 from tests.tests_world import FILE_WORLD_ONLINE, FILE_WORLD_OVERVIEW_ONLINE
-from tibiapy import Forbidden, NetworkError
+from tibiapy import ForbiddenError, NetworkError
 from tibiapy.client import Client
 from tibiapy.enums import BazaarType, HouseType
 from tibiapy.models import Auction, CMPostArchive, Character, CharacterBazaar, ForumBoard, ForumSection, Guild, \
@@ -53,7 +53,7 @@ async def test_client_init_pass_session(self):
     async def test_client_handle_errors(self, mock):
         """Testing error handling"""
         mock.get(get_world_overview_url(), status=403)
-        with self.assertRaises(Forbidden):
+        with self.assertRaises(ForbiddenError):
             await self.client.fetch_world_overview()
 
         mock.get(get_world_overview_url(), status=404)

tests/tests_creature.py

@@ -1,5 +1,5 @@
 from tests.tests_tibiapy import TestCommons
-from tibiapy import InvalidContent
+from tibiapy import InvalidContentError
 from tibiapy.models import CreatureEntry
 from tibiapy.parsers import BoostableBossesParser, CreatureParser, CreaturesSectionParser
 
@@ -20,7 +20,7 @@ def test_creatures_section_from_boosted_creature_header_content(self):
 
     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"""
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             CreaturesSectionParser.boosted_creature_from_header("<html><div><p>Nothing</p></div></html>")
 
     def test_creature_section_from_content(self):
@@ -42,7 +42,7 @@ def test_creature_section_from_content(self):
     def test_creatures_section_from_content_invalid_content(self):
         """Testing parsing the creatures section from an invalid section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             CreaturesSectionParser.from_content(content)
 
     def test_creature_from_content(self):
@@ -103,7 +103,7 @@ def test_boostable_bosses_from_content_invalid_content(self):
         """Testing parsing the creatures section from an invalid section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
 
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             BoostableBossesParser.from_content(content)
 
 

tests/tests_forums.py

@@ -1,7 +1,7 @@
 import datetime
 
 from tests.tests_tibiapy import TestCommons
-from tibiapy import InvalidContent
+from tibiapy import InvalidContentError
 from tibiapy.enums import ThreadStatus
 from tibiapy.models import BoardEntry, CMPostArchive, ForumPost, LastPost, ThreadEntry
 from tibiapy.parsers import (CMPostArchiveParser, ForumAnnouncementParser, ForumBoardParser, ForumSectionParser,
@@ -81,7 +81,7 @@ def test_forum_section_parser_from_content_empty_section(self):
     def test_forum_section_parser_from_content_unrelated_section(self):
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
 
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             ForumSectionParser.from_content(content)
 
     # endregion
@@ -128,7 +128,7 @@ def test_forum_board_parser_from_content_empty_threads(self):
     def test_forum_board_parser_from_content_unrelated_section(self):
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
 
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             ForumBoardParser.from_content(content)
 
     def test_forum_board_parser_from_content_invalid_page(self):
@@ -246,7 +246,7 @@ def test_forum_announcement_from_content_not_found(self):
     def test_forum_announcement_from_content_unrelated_section(self):
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
 
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             ForumAnnouncementParser.from_content(content, 34)
 
     # endregion
@@ -368,7 +368,7 @@ def test_forum_thread_parser_from_content_not_found(self):
     def test_forum_thread_parser_from_content_unrelated_section(self):
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
 
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             ForumThreadParser.from_content(content)
 
     # endregion
@@ -423,7 +423,7 @@ def test_cm_post_archive_from_content_pages(self):
 
     def test_cm_post_archive_from_content_unrelated_section(self):
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             CMPostArchiveParser.from_content(content)
 
     def test_cm_post_archive_get_page_url_negative_page(self):

tests/tests_guild.py

@@ -1,7 +1,7 @@
 import datetime
 
 from tests.tests_tibiapy import TestCommons
-from tibiapy import InvalidContent
+from tibiapy import InvalidContentError
 from tibiapy.builders import GuildBuilder
 from tibiapy.models import Guild, GuildHouse, GuildWars
 from tibiapy.parsers import GuildParser, GuildWarsParser, GuildsSectionParser
@@ -69,7 +69,7 @@ def test_guild_parser_from_content_not_found(self):
     def test_guild_parser_from_content_unrelated(self):
         """Testing parsing an unrelated tibiacom section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             GuildParser.from_content(content)
 
 
@@ -143,7 +143,7 @@ def test_guilds_section_parser_from_content_not_found(self):
     def test_guilds_section_parser_from_content_unrelated(self):
         """Testing parsing and unrelated section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             GuildsSectionParser.from_content(content)
 
 

tests/tests_highscores.py

@@ -1,5 +1,5 @@
 from tests.tests_tibiapy import TestCommons
-from tibiapy import InvalidContent
+from tibiapy import InvalidContentError
 from tibiapy.enums import HighscoresBattlEyeType, HighscoresCategory, HighscoresProfession, Vocation
 from tibiapy.models import Highscores, HighscoresEntry, LoyaltyHighscoresEntry
 from tibiapy.parsers import HighscoresParser
@@ -117,7 +117,7 @@ def test_highscores_parser_from_content_no_results(self):
     def test_highscores_parser_from_content_unrelated_section(self):
         """Testing parsing an unrelated section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             HighscoresParser.from_content(content)
 
     # endregion

tests/tests_house.py

@@ -1,5 +1,5 @@
 from tests.tests_tibiapy import TestCommons
-from tibiapy import InvalidContent
+from tibiapy import InvalidContentError
 from tibiapy.enums import HouseOrder, HouseStatus, HouseType
 from tibiapy.models import House, HouseEntry, HousesSection
 from tibiapy.parsers import HouseParser, HousesSectionParser
@@ -87,7 +87,7 @@ def test_house_parser_from_content_not_found(self):
     def test_house_parser_from_content_unrelated(self):
         """Testing parsing an unrelated section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             HouseParser.from_content(content)
 
     # endregion
@@ -161,7 +161,7 @@ def test_houses_section_parser_from_content_not_found(self):
     def test_houses_section_parser_from_content_unrelated(self):
         """Testing parsing an unrelated section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             HousesSectionParser.from_content(content)
 
     # endregion

tests/tests_kill_statistics.py

@@ -1,5 +1,5 @@
 from tests.tests_tibiapy import TestCommons
-from tibiapy import InvalidContent
+from tibiapy import InvalidContentError
 from tibiapy.parsers import KillStatisticsParser
 
 FILE_KILL_STATISTICS_FULL = "killStatistics/killStatisticsWithResults.txt"
@@ -51,5 +51,5 @@ def test_kill_statistics_from_parser_content_not_found(self):
     def test_kill_statistics_from_parser_content_unrelated_section(self):
         """Testing parsing an unrelated section"""
         content = self.load_resource(self.FILE_UNRELATED_SECTION)
-        with self.assertRaises(InvalidContent):
+        with self.assertRaises(InvalidContentError):
             KillStatisticsParser.from_content(content)