From e5954d860cb50f2ad14910d5e98f8fd8008f03ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20N=C3=B8rgaard?= Date: Tue, 17 Jan 2023 01:49:19 +0000 Subject: [PATCH] switch to using `__all__` imports over the explicit exporting --- a2s/__init__.py | 20 ++++---------------- a2s/exceptions.py | 6 ++++++ a2s/info.py | 7 +++++++ a2s/players.py | 6 ++++++ a2s/rules.py | 5 +++++ 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/a2s/__init__.py b/a2s/__init__.py index 0221d4e..4499fa2 100644 --- a/a2s/__init__.py +++ b/a2s/__init__.py @@ -1,16 +1,4 @@ -from a2s.exceptions import ( - BrokenMessageError as BrokenMessageError, - BufferExhaustedError as BufferExhaustedError, -) -from a2s.info import ( - GoldSrcInfo as GoldSrcInfo, - SourceInfo as SourceInfo, - ainfo as ainfo, - info as info, -) -from a2s.players import ( - Player as Player, - aplayers as aplayers, - players as players, -) -from a2s.rules import arules as arules, rules as rules +from a2s.exceptions import * +from a2s.info import * +from a2s.players import * +from a2s.rules import * diff --git a/a2s/exceptions.py b/a2s/exceptions.py index fad37c5..b2f9390 100644 --- a/a2s/exceptions.py +++ b/a2s/exceptions.py @@ -1,3 +1,9 @@ +__all__ = ( + "BrokenMessageError", + "BufferExhaustedError", +) + + class BrokenMessageError(Exception): pass diff --git a/a2s/info.py b/a2s/info.py index 1f68ca1..e697583 100644 --- a/a2s/info.py +++ b/a2s/info.py @@ -13,6 +13,13 @@ from .byteio import ByteReader A2S_INFO_RESPONSE = 0x49 A2S_INFO_RESPONSE_LEGACY = 0x6D +__all__ = ( + "SourceInfo", + "GoldSrcInfo", + "info", + "ainfo", +) + class SourceInfo(metaclass=DataclsMeta): diff --git a/a2s/players.py b/a2s/players.py index 9169253..2ba3959 100644 --- a/a2s/players.py +++ b/a2s/players.py @@ -8,6 +8,12 @@ from a2s.defaults import DEFAULT_ENCODING, DEFAULT_TIMEOUT A2S_PLAYER_RESPONSE = 0x44 +__all__ = ( + "Player", + "players", + "aplayers", +) + class Player(metaclass=DataclsMeta): index: int diff --git a/a2s/rules.py b/a2s/rules.py index db97eb0..5575c65 100644 --- a/a2s/rules.py +++ b/a2s/rules.py @@ -7,6 +7,11 @@ from a2s.defaults import DEFAULT_ENCODING, DEFAULT_TIMEOUT A2S_RULES_RESPONSE = 0x45 +__all__ = ( + "rules", + "arules", +) + def rules( address: Tuple[str, int],