Skip to content
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

Jump to bottom

Fixed incorrect description type #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed incorrect description type #1

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f810a14
Added format check for descriptions
Feb 21, 2017
36e9d1a
Now using isinstance() rather than type() and using string_types over…
May 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions mcstatus/pinger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,18 @@ def __init__(self, raw):

if "description" not in raw:
raise ValueError("Invalid status object (no 'description' value)")
self.description = raw["description"]
self.description_clean = re.sub(r'\u00A7.', '', raw["description"])
# for newer versions of minecraft

if type(raw["description"]) is str:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switching to isinstance() checks may be better, and using string_types instead of str would be more version compatible

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should also fix the build errors

self.description = raw["description"]
self.description_clean = re.sub(r'\u00A7.', '', raw["description"])

elif type(raw["description"]) is dict:
self.description = raw["description"]["text"]
self.description_clean = re.sub(r'\u00A7.', '', raw["description"]["text"])

else:
raise ValueError("Invalid status object (unknown 'description' type)")

if "favicon" in raw:
self.favicon = raw["favicon"]
Expand Down