Skip to content

Fix SteamID regex syntax warnings #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Mirochill wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −2
Draft

Fix SteamID regex syntax warnings #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions steam/steamid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ def from_csgo_friend_code(code, universe=EUniverse.Public):
:return: SteamID instance
:rtype: :class:`.SteamID` or :class:`None`
"""
if not re.match(r'^['+_csgofrcode_chars+'\-]{10}$', code):
if not re.match(r'^['+_csgofrcode_chars+r'\-]{10}$', code):
return None

code = ('AAAA-' + code).replace('-', '')
Expand Down Expand Up @@ -574,7 +574,7 @@ def steam64_from_url(url, http_timeout=30):
# group profiles
else:
text = web.get(match.group('clean_url'), timeout=http_timeout).text
data_match = re.search("OpenGroupChat\( *'(?P<steamid>\d+)'", text)
data_match = re.search(r"OpenGroupChat\( *'(?P<steamid>\d+)'", text)

if data_match:
return int(data_match.group('steamid'))
Expand Down
10 changes: 10 additions & 0 deletions tests/test_steamid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
class SteamID_properties(unittest.TestCase):
def test_repr(self):
# just to cover in coverage
self.assertTrue('SteamID' in repr(SteamID()))

Check warning on line 199 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIn" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmU&open=AZ5LycdDc5Lloj-DeQmU&pullRequest=490

def test_is_valid(self):
# default
Expand Down Expand Up @@ -230,10 +230,10 @@

def test_rich_comperison(self):
for test_value in [SteamID(5), 5]:
self.assertFalse(SteamID(10) == test_value)

Check warning on line 233 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertNotEqual" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmV&open=AZ5LycdDc5Lloj-DeQmV&pullRequest=490
self.assertTrue(SteamID(10) != test_value)

Check warning on line 234 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertNotEqual" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmW&open=AZ5LycdDc5Lloj-DeQmW&pullRequest=490
self.assertTrue(SteamID(10) > test_value)

Check warning on line 235 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertGreater" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmX&open=AZ5LycdDc5Lloj-DeQmX&pullRequest=490
self.assertTrue(SteamID(10) >= test_value)

Check warning on line 236 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertGreaterEqual" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmY&open=AZ5LycdDc5Lloj-DeQmY&pullRequest=490
self.assertFalse(SteamID(10) < test_value)
self.assertFalse(SteamID(10) <= test_value)

Expand Down Expand Up @@ -284,34 +284,34 @@
'https://steamcommunity.com/gid/103582791429521412'
)
# else None
self.assertEqual(SteamID('[A:1:4]').community_url,
None
)

Check warning on line 289 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmZ&open=AZ5LycdDc5Lloj-DeQmZ&pullRequest=490

def test_as_invite_code(self):
self.assertEqual(SteamID(0 , EType.Individual, EUniverse.Public, instance=1).as_invite_code, None)

Check warning on line 292 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQma&open=AZ5LycdDc5Lloj-DeQma&pullRequest=490
self.assertEqual(SteamID(1 , EType.Invalid , EUniverse.Public, instance=1).as_invite_code, None)

Check warning on line 293 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmb&open=AZ5LycdDc5Lloj-DeQmb&pullRequest=490
self.assertEqual(SteamID(1 , EType.Clan , EUniverse.Public, instance=1).as_invite_code, None)

Check warning on line 294 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmc&open=AZ5LycdDc5Lloj-DeQmc&pullRequest=490
self.assertEqual(SteamID(1 , EType.Individual, EUniverse.Beta , instance=1).as_invite_code, 'c')
self.assertEqual(SteamID(1 , EType.Individual, EUniverse.Public, instance=1).as_invite_code, 'c')
self.assertEqual(SteamID(123456 , EType.Individual, EUniverse.Public, instance=1).as_invite_code, 'cv-dgb')
self.assertEqual(SteamID(4294967295, EType.Individual, EUniverse.Public, instance=1).as_invite_code, 'wwww-wwww')

def test_as_csgo_friend_code(self):
self.assertEqual(SteamID(0 , EType.Individual, EUniverse.Public, instance=1).as_csgo_friend_code, None)

Check warning on line 301 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmd&open=AZ5LycdDc5Lloj-DeQmd&pullRequest=490
self.assertEqual(SteamID(1 , EType.Invalid , EUniverse.Public, instance=1).as_csgo_friend_code, None)

Check warning on line 302 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQme&open=AZ5LycdDc5Lloj-DeQme&pullRequest=490
self.assertEqual(SteamID(1 , EType.Clan , EUniverse.Public, instance=1).as_csgo_friend_code, None)

Check warning on line 303 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmf&open=AZ5LycdDc5Lloj-DeQmf&pullRequest=490
self.assertEqual(SteamID(1 , EType.Individual, EUniverse.Beta , instance=1).as_csgo_friend_code, 'AJJJS-ABAA')
self.assertEqual(SteamID(1 , EType.Individual, EUniverse.Public, instance=1).as_csgo_friend_code, 'AJJJS-ABAA')
self.assertEqual(SteamID(123456 , EType.Individual, EUniverse.Public, instance=1).as_csgo_friend_code, 'ABNBT-GBDC')
self.assertEqual(SteamID(4294967295, EType.Individual, EUniverse.Public, instance=1).as_csgo_friend_code, 'S9ZZR-999P')

def test_as_invite_url(self):
self.assertEqual(SteamID(0 , EType.Individual, EUniverse.Public, instance=1).invite_url, None)

Check warning on line 310 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmg&open=AZ5LycdDc5Lloj-DeQmg&pullRequest=490
self.assertEqual(SteamID(123456, EType.Individual, EUniverse.Public, instance=1).invite_url, 'https://s.team/p/cv-dgb')
self.assertEqual(SteamID(123456, EType.Individual, EUniverse.Beta , instance=1).invite_url, 'https://s.team/p/cv-dgb')
self.assertEqual(SteamID(123456, EType.Invalid , EUniverse.Public, instance=1).invite_url, None)

Check warning on line 313 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmh&open=AZ5LycdDc5Lloj-DeQmh&pullRequest=490
self.assertEqual(SteamID(123456, EType.Clan , EUniverse.Public, instance=1).invite_url, None)

Check warning on line 314 in tests/test_steamid.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Consider using "assertIsNone" instead. 


See more on https://sonarcloud.io/project/issues?id=ValvePython_steam&issues=AZ5LycdDc5Lloj-DeQmi&open=AZ5LycdDc5Lloj-DeQmi&pullRequest=490


class steamid_functions(unittest.TestCase):
Expand All @@ -337,6 +337,16 @@
mm.get.side_effect = requests.exceptions.ReadTimeout('test')
self.assertIsNone(steamid.steam64_from_url("https://steamcommunity.com/id/timeout_me"))

@mock.patch('steam.steamid.make_requests_session')
def test_steam64_from_url_group_chat_markup(self, mrs_mock):
mm = mrs_mock.return_value = mock.MagicMock()
mm.get.return_value.text = "OpenGroupChat( '103582791429521412'"

self.assertEqual(
steamid.steam64_from_url("https://steamcommunity.com/groups/Valve"),
103582791429521412
)

def test_steam64_from_url(self):
def scrub_req(r):
r.headers.pop('Cookie', None)
Expand Down