Skip to content

Commit 9073a8e

Browse files
committed
Don't access tcod.lib at the top-level, for doc generation.
1 parent ee8cde1 commit 9073a8e

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

tcod/sdl/__init__.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
logger = logging.getLogger(__name__)
99

1010
_LOG_PRIORITY = {
11-
int(lib.SDL_LOG_PRIORITY_VERBOSE): logging.DEBUG,
12-
int(lib.SDL_LOG_PRIORITY_DEBUG): logging.DEBUG,
13-
int(lib.SDL_LOG_PRIORITY_INFO): logging.INFO,
14-
int(lib.SDL_LOG_PRIORITY_WARN): logging.WARNING,
15-
int(lib.SDL_LOG_PRIORITY_ERROR): logging.ERROR,
16-
int(lib.SDL_LOG_PRIORITY_CRITICAL): logging.CRITICAL,
11+
1: logging.DEBUG, # SDL_LOG_PRIORITY_VERBOSE
12+
2: logging.DEBUG, # SDL_LOG_PRIORITY_DEBUG
13+
3: logging.INFO, # SDL_LOG_PRIORITY_INFO
14+
4: logging.WARNING, # SDL_LOG_PRIORITY_WARN
15+
5: logging.ERROR, # SDL_LOG_PRIORITY_ERROR
16+
6: logging.CRITICAL, # SDL_LOG_PRIORITY_CRITICAL
1717
}
1818

1919

@@ -42,4 +42,5 @@ def _check_p(result: Any) -> Any:
4242
return result
4343

4444

45-
lib.SDL_LogSetOutputFunction(lib._sdl_log_output_function, ffi.NULL)
45+
if lib._sdl_log_output_function:
46+
lib.SDL_LogSetOutputFunction(lib._sdl_log_output_function, ffi.NULL)

tcod/sdl/sys.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99

1010
class Subsystem(enum.IntFlag):
11-
TIMER = lib.SDL_INIT_TIMER
12-
AUDIO = lib.SDL_INIT_AUDIO
13-
VIDEO = lib.SDL_INIT_VIDEO
14-
JOYSTICK = lib.SDL_INIT_JOYSTICK
15-
HAPTIC = lib.SDL_INIT_HAPTIC
16-
GAMECONTROLLER = lib.SDL_INIT_GAMECONTROLLER
17-
EVENTS = lib.SDL_INIT_EVENTS
18-
SENSOR = getattr(lib, "SDL_INIT_SENSOR", 0)
19-
EVERYTHING = lib.SDL_INIT_EVERYTHING
11+
TIMER = getattr(lib, "SDL_INIT_TIMER", 0x00000001)
12+
AUDIO = getattr(lib, "SDL_INIT_AUDIO", 0x00000010)
13+
VIDEO = getattr(lib, "SDL_INIT_VIDEO", 0x00000020)
14+
JOYSTICK = getattr(lib, "SDL_INIT_JOYSTICK", 0x00000200)
15+
HAPTIC = getattr(lib, "SDL_INIT_HAPTIC", 0x00001000)
16+
GAMECONTROLLER = getattr(lib, "SDL_INIT_GAMECONTROLLER", 0x00002000)
17+
EVENTS = getattr(lib, "SDL_INIT_EVENTS", 0x00004000)
18+
SENSOR = getattr(lib, "SDL_INIT_SENSOR", 0x00008000)
19+
EVERYTHING = getattr(lib, "SDL_INIT_EVERYTHING", 0)
2020

2121

2222
def init(flags: int = Subsystem.EVERYTHING) -> None:
@@ -48,11 +48,11 @@ def __exit__(self, *args: Any) -> None:
4848

4949

5050
class _PowerState(enum.IntEnum):
51-
UNKNOWN = lib.SDL_POWERSTATE_UNKNOWN
52-
ON_BATTERY = lib.SDL_POWERSTATE_ON_BATTERY
53-
NO_BATTERY = lib.SDL_POWERSTATE_NO_BATTERY
54-
CHARGING = lib.SDL_POWERSTATE_CHARGING
55-
CHARGED = lib.SDL_POWERSTATE_CHARGED
51+
UNKNOWN = getattr(lib, "SDL_POWERSTATE_UNKNOWN", 0)
52+
ON_BATTERY = getattr(lib, "SDL_POWERSTATE_ON_BATTERY", 0)
53+
NO_BATTERY = getattr(lib, "SDL_POWERSTATE_NO_BATTERY", 0)
54+
CHARGING = getattr(lib, "SDL_POWERSTATE_CHARGING", 0)
55+
CHARGED = getattr(lib, "SDL_POWERSTATE_CHARGED", 0)
5656

5757

5858
def _get_power_info() -> Tuple[_PowerState, int, int]:

0 commit comments

Comments
 (0)