diff --git a/citadel/indico_citadel/models/id_map.py b/citadel/indico_citadel/models/id_map.py index 04d4a39..1a071c8 100644 --- a/citadel/indico_citadel/models/id_map.py +++ b/citadel/indico_citadel/models/id_map.py @@ -12,11 +12,11 @@ from indico.modules.events import Event from indico.modules.events.contributions import Contribution from indico.modules.events.contributions.models.subcontributions import SubContribution from indico.modules.events.notes.models.notes import EventNote -from indico.util.enum import IndicoEnum +from indico.util.enum import IndicoIntEnum from indico.util.string import format_repr -class EntryType(int, IndicoEnum): +class EntryType(IndicoIntEnum): event = 1 contribution = 2 subcontribution = 3 diff --git a/livesync/indico_livesync/models/queue.py b/livesync/indico_livesync/models/queue.py index 70461c2..c75a691 100644 --- a/livesync/indico_livesync/models/queue.py +++ b/livesync/indico_livesync/models/queue.py @@ -11,14 +11,14 @@ from indico.core.db.sqlalchemy import PyIntEnum, UTCDateTime, db from indico.modules.attachments.models.attachments import Attachment from indico.modules.categories.models.categories import Category from indico.util.date_time import now_utc -from indico.util.enum import IndicoEnum +from indico.util.enum import IndicoIntEnum from indico.util.string import format_repr from indico_livesync.models.agents import LiveSyncAgent from indico_livesync.util import obj_deref -class ChangeType(int, IndicoEnum): +class ChangeType(IndicoIntEnum): created = 1 deleted = 2 moved = 3 @@ -30,7 +30,7 @@ class ChangeType(int, IndicoEnum): unpublished = 9 -class EntryType(int, IndicoEnum): +class EntryType(IndicoIntEnum): category = 1 event = 2 contribution = 3 diff --git a/livesync/indico_livesync/simplify.py b/livesync/indico_livesync/simplify.py index 87e061c..2c39aa5 100644 --- a/livesync/indico_livesync/simplify.py +++ b/livesync/indico_livesync/simplify.py @@ -19,13 +19,13 @@ from indico.modules.events.contributions.models.subcontributions import SubContr from indico.modules.events.models.events import Event from indico.modules.events.notes.models.notes import EventNote from indico.modules.events.sessions import Session -from indico.util.enum import IndicoEnum +from indico.util.enum import IndicoIntEnum from indico_livesync.models.queue import ChangeType, EntryType from indico_livesync.util import get_excluded_categories -class SimpleChange(int, IndicoEnum): +class SimpleChange(IndicoIntEnum): deleted = 1 created = 2 updated = 4 diff --git a/vc_zoom/indico_vc_zoom/util.py b/vc_zoom/indico_vc_zoom/util.py index 7fee140..bd3b352 100644 --- a/vc_zoom/indico_vc_zoom/util.py +++ b/vc_zoom/indico_vc_zoom/util.py @@ -20,14 +20,14 @@ from indico.modules.users.util import get_user_by_email from indico.modules.vc.exceptions import VCRoomError, VCRoomNotFoundError from indico.util.caching import memoize_request from indico.util.date_time import now_utc -from indico.util.enum import IndicoEnum, RichEnum +from indico.util.enum import IndicoIntEnum, RichStrEnum from indico.util.user import principal_from_identifier from indico_vc_zoom import _ from indico_vc_zoom.api import ZoomIndicoClient -class ZoomMeetingType(int, IndicoEnum): +class ZoomMeetingType(IndicoIntEnum): instant_meeting = 1 scheduled_meeting = 2 recurring_meeting_no_time = 3 @@ -38,7 +38,7 @@ class ZoomMeetingType(int, IndicoEnum): recurring_webinar_fixed_time = 9 -class UserLookupMode(str, RichEnum): +class UserLookupMode(RichStrEnum): __titles__ = { 'all_emails': _('All emails'), 'email_domains': _('Email domains'), @@ -47,7 +47,7 @@ class UserLookupMode(str, RichEnum): @property def title(self): - return RichEnum.title.__get__(self, type(self)) + return RichStrEnum.title.__get__(self, type(self)) all_emails = 'all_emails' email_domains = 'email_domains'