Rewrite Query response class to #306's style #536
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PerchunPak
added
area: API
PerchunPak
force-pushed
the
rewrite-query-answer-class
branch
2 times, most recently
from
d68adea to
9a2e743
Compare
PerchunPak
force-pushed
the
rewrite-query-answer-class
branch
from
9a2e743 to
3d8fe41
Compare
PerchunPak
force-pushed
the
rewrite-query-answer-class
branch
from
3d8fe41 to
482cd59
Compare
PerchunPak
added
status: needs review
PerchunPak
requested review from
ItsDrike and
kevinkjt2000
and removed request for
ItsDrike
…wer-class # Conflicts: # mcstatus/status_response.py
ItsDrike
requested changes
Oct 2, 2023
mcstatus/status_response.py
Outdated
| Will be removed 2023-12, use :attr:`.name` instead. | ||
| """ | ||
| return self.name | ||
| warnings.warn("`mcstatus.status_response` is deprecated, use `mcstatus.responses` instead", DeprecationWarning, stacklevel=2) |
There was a problem hiding this comment.
We could use utils.deprecated like this instead of manually calling warnings.warn
Suggested change
| warnings.warn("`mcstatus.status_response` is deprecated, use `mcstatus.responses` instead", DeprecationWarning, stacklevel=2) | |
| deprecated("mcstatus.status_response", replacement="mcstatus.responses", date="2023-12", msg="module was renamed")() |
There was a problem hiding this comment.
mcstatus.utils.deprecated doesn't work with strings:
File "/home/perchun/programming/mcstatus/mcstatus/utils.py", line 156, in decorate
name = getattr(obj, "__qualname__", obj.__name__)
^^^^^^^^^^^^
AttributeError: 'str' object has no attribute '__name__'. Did you mean: '__ne__'?
There was a problem hiding this comment.
This is no longer relevant, since #687 was merged
…r-class # Conflicts: # mcstatus/status_response.py
# Conflicts: # mcstatus/status_response.py
It creates more headache than it would solve.
# Conflicts: # mcstatus/querier.py
We deprecated `status_response`
katrinafyi
added a commit
to rina-forks/mcstatus
that referenced
this pull request
Jul 20, 2024
in anticipation of py-mine#536 Co-authored-by: Perchun Pak <github@perchun.it>
PerchunPak
added a commit
that referenced
this pull request
Jul 27, 2024
* fix crash with one command-line argument * implement ping() on BedrockServer simply measures the latency of status() * support Bedrock servers in CLI done in a slightly ad-hoc way, but this is the best we can do given the split of the response types. * print server kind and tweak player sample printing * JavaServer ping() doesn't work? * fix precommit warnings * review: remove Bedrock ping() * review: change CLI ping comment to be more permanent * review: formalise hostip/hostport within QueryResponse * review: only squash traceback in common errors * review: leading line break for multi-line motd * Revert "review: formalise hostip/hostport within QueryResponse" This reverts commit 3a0ee8c. * review: use motd.to_minecraft() in json * review amendment: factor out motd line breaking * review: refactor CLI json() to use dataclasses.asdict() * amendment: add NoNameservers and remove ValueError from squashed errors ValueError might be thrown by programming errors in json handling, for example. * review: fallback logic in CLI ping since this runs both ping() then status(), it can report precisely when one fails and the other succeeds. some kludgy logic to switch bedrock too. * review: use ip/port fields in CLI's JSON output in anticipation of #536 Co-authored-by: Perchun Pak <github@perchun.it> * review: avoid kind() classmethod * review: clarify MOTD serialisation comment * review: simplify ping fallback logic Co-authored-by: Perchun Pak <github@perchun.it> * make version consistent between status and query * review: apply simplify() to motd in CLI JSON output Co-authored-by: Perchun Pak <github@perchun.it> * review: use separate JSON field for simplified MOTD * review: remove MOTD fixup comment * review: update README with new CLI * review: no raw motd * no --help output in readme * review: allow main() with no arguments * Update mcstatus/__main__.py Co-authored-by: Kevin Tindall <kevinkjt2000@users.noreply.github.com> * avoid json collision * oops! good linter * drike review * good linter * one more ci failure and i turn on the computer * also squash ConnectionError happens during server startup, for example --------- Co-authored-by: Perchun Pak <github@perchun.it> Co-authored-by: Kevin Tindall <kevinkjt2000@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I do not propose to release it in v11, as we probably won't merge it in time.
I made d8b26f1 as separate commit in case if you will want to release it with v11, while the main commit here will stay here for a while.
This was easier than I expected actually, most of the work was done in #306.