monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: store multidata/multisave enums by value on py3.11 (#1783) 

This is what py3.10 did and should be better for AP than the new default
This commit is contained in:
black-sliver 2023-05-02 08:23:39 +02:00 committed by GitHub
parent a368520200
commit 39c7c7291e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NetUtils.py
View File

@ -6,7 +6,7 @@ from json import JSONEncoder, JSONDecoder
import websockets import websockets
from Utils import Version from Utils import ByValue, Version
class JSONMessagePart(typing.TypedDict, total=False): class JSONMessagePart(typing.TypedDict, total=False):
@ -20,7 +20,7 @@ class JSONMessagePart(typing.TypedDict, total=False):
flags: int flags: int
class ClientStatus(enum.IntEnum): class ClientStatus(ByValue, enum.IntEnum):
CLIENT_UNKNOWN = 0 CLIENT_UNKNOWN = 0
CLIENT_CONNECTED = 5 CLIENT_CONNECTED = 5
CLIENT_READY = 10 CLIENT_READY = 10
@ -28,7 +28,7 @@ class ClientStatus(enum.IntEnum):
CLIENT_GOAL = 30 CLIENT_GOAL = 30
class SlotType(enum.IntFlag): class SlotType(ByValue, enum.IntFlag):
spectator = 0b00 spectator = 0b00
player = 0b01 player = 0b01
group = 0b10 group = 0b10
@ -39,7 +39,7 @@ class SlotType(enum.IntFlag):
return self.value != 0b01 return self.value != 0b01
class Permission(enum.IntFlag): class Permission(ByValue, enum.IntFlag):
disabled = 0b000 # 0, completely disables access disabled = 0b000 # 0, completely disables access
enabled = 0b001 # 1, allows manual use enabled = 0b001 # 1, allows manual use
goal = 0b010 # 2, allows manual use after goal completion goal = 0b010 # 2, allows manual use after goal completion

9
Utils.py
View File

@ -508,6 +508,15 @@ def restricted_loads(s):
return RestrictedUnpickler(io.BytesIO(s)).load() return RestrictedUnpickler(io.BytesIO(s)).load()
class ByValue:
"""
Mixin for enums to pickle value instead of name (restores pre-3.11 behavior). Use as left-most parent.
See https://github.com/python/cpython/pull/26658 for why this exists.
"""
def __reduce_ex__(self, prot):
return self.__class__, (self._value_, )
class KeyedDefaultDict(collections.defaultdict): class KeyedDefaultDict(collections.defaultdict):
"""defaultdict variant that uses the missing key as argument to default_factory""" """defaultdict variant that uses the missing key as argument to default_factory"""
default_factory: typing.Callable[[typing.Any], typing.Any] default_factory: typing.Callable[[typing.Any], typing.Any]