From d0ea028c0484ee353d235de3689ebda7acb94b28 Mon Sep 17 00:00:00 2001 From: Tomas Pecka <peckato1@fit.cvut.cz> Date: Wed, 28 Jun 2017 17:54:02 +0200 Subject: [PATCH] Enums compatible with py3.5 --- kosapi/entity/enum/base_enum.py | 4 +--- kosapi/entity/enum/classes_lang.py | 19 ++++++++--------- kosapi/entity/enum/classes_type.py | 27 +++++++++++++------------ kosapi/entity/enum/completion.py | 15 +++++++------- kosapi/entity/enum/course_state.py | 11 +++++----- kosapi/entity/enum/division_type.py | 11 +++++----- kosapi/entity/enum/dspace_file_type.py | 7 ++++--- kosapi/entity/enum/parallel_type.py | 9 +++++---- kosapi/entity/enum/parity.py | 9 +++++---- kosapi/entity/enum/permission.py | 7 ++++--- kosapi/entity/enum/programme_type.py | 15 +++++++------- kosapi/entity/enum/room_type.py | 11 +++++----- kosapi/entity/enum/season.py | 9 +++++---- kosapi/entity/enum/sex.py | 7 ++++--- kosapi/entity/enum/study_form.py | 17 ++++++++-------- kosapi/entity/enum/study_state.py | 9 +++++---- kosapi/entity/enum/study_termination.py | 21 ++++++++++--------- kosapi/entity/enum/teacher_role.py | 13 ++++++------ kosapi/entity/enum/term_type.py | 5 +++-- kosapi/entity/enum/thesis_state.py | 15 +++++++------- 20 files changed, 129 insertions(+), 112 deletions(-) diff --git a/kosapi/entity/enum/base_enum.py b/kosapi/entity/enum/base_enum.py index 054b70d..96b35e2 100644 --- a/kosapi/entity/enum/base_enum.py +++ b/kosapi/entity/enum/base_enum.py @@ -2,6 +2,4 @@ import enum class BaseEnum(enum.Enum): - @classmethod - def auto(cls): - return enum.auto() \ No newline at end of file + pass \ No newline at end of file diff --git a/kosapi/entity/enum/classes_lang.py b/kosapi/entity/enum/classes_lang.py index 32f1e26..41d2ce4 100644 --- a/kosapi/entity/enum/classes_lang.py +++ b/kosapi/entity/enum/classes_lang.py @@ -1,12 +1,13 @@ from . import BaseEnum + class ClassesLang(BaseEnum): - CS = BaseEnum.auto() - DE = BaseEnum.auto() - EN = BaseEnum.auto() - ES = BaseEnum.auto() - FR = BaseEnum.auto() - PL = BaseEnum.auto() - RU = BaseEnum.auto() - SK = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() + CS = 1 + DE = 2 + EN = 3 + ES = 4 + FR = 5 + PL = 6 + RU = 7 + SK = 8 + UNDEFINED = 9 diff --git a/kosapi/entity/enum/classes_type.py b/kosapi/entity/enum/classes_type.py index 029cb24..1b783d6 100644 --- a/kosapi/entity/enum/classes_type.py +++ b/kosapi/entity/enum/classes_type.py @@ -1,16 +1,17 @@ from . import BaseEnum + class ClassesType(BaseEnum): - ATELIER = BaseEnum.auto() - BLOCK = BaseEnum.auto() - CONSULTATION = BaseEnum.auto() - LABORATORY = BaseEnum.auto() - LECTURE = BaseEnum.auto() - PROJECT = BaseEnum.auto() - PROJECT_INDV = BaseEnum.auto() - PROJECT_TEAM = BaseEnum.auto() - PROSEMINAR = BaseEnum.auto() - PT_COURSE = BaseEnum.auto() - SEMINAR = BaseEnum.auto() - TUTORIAL = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() + ATELIER = 1 + BLOCK = 2 + CONSULTATION = 3 + LABORATORY = 4 + LECTURE = 5 + PROJECT = 6 + PROJECT_INDV = 7 + PROJECT_TEAM = 8 + PROSEMINAR = 9 + PT_COURSE = 10 + SEMINAR = 11 + TUTORIAL = 12 + UNDEFINED = 13 diff --git a/kosapi/entity/enum/completion.py b/kosapi/entity/enum/completion.py index 0d8a912..161d191 100644 --- a/kosapi/entity/enum/completion.py +++ b/kosapi/entity/enum/completion.py @@ -1,10 +1,11 @@ from . import BaseEnum + class Completion(BaseEnum): - CLFD_CREDIT = BaseEnum.auto() - CREDIT = BaseEnum.auto() - CREDIT_EXAM = BaseEnum.auto() - DEFENCE = BaseEnum.auto() - EXAM = BaseEnum.auto() - NOTHING = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + CLFD_CREDIT = 1 + CREDIT = 2 + CREDIT_EXAM = 3 + DEFENCE = 4 + EXAM = 5 + NOTHING = 6 + UNDEFINED = 7 \ No newline at end of file diff --git a/kosapi/entity/enum/course_state.py b/kosapi/entity/enum/course_state.py index e42e308..96d5324 100644 --- a/kosapi/entity/enum/course_state.py +++ b/kosapi/entity/enum/course_state.py @@ -1,8 +1,9 @@ from . import BaseEnum + class CourseState(BaseEnum): - PROPOSED = BaseEnum.auto() - APPROVED = BaseEnum.auto() - OPEN = BaseEnum.auto() - CLOSED = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + PROPOSED = 1 + APPROVED = 2 + OPEN = 3 + CLOSED = 4 + UNDEFINED = 5 \ No newline at end of file diff --git a/kosapi/entity/enum/division_type.py b/kosapi/entity/enum/division_type.py index 0c99efc..3ca852d 100644 --- a/kosapi/entity/enum/division_type.py +++ b/kosapi/entity/enum/division_type.py @@ -1,8 +1,9 @@ from . import BaseEnum + class DivisionType(BaseEnum): - RECTORATE = BaseEnum.auto() - FACULTY = BaseEnum.auto() - DEPARTMENT = BaseEnum.auto() - INSTITUTE = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + RECTORATE = 1 + FACULTY = 2 + DEPARTMENT = 3 + INSTITUTE = 4 + UNDEFINED = 5 \ No newline at end of file diff --git a/kosapi/entity/enum/dspace_file_type.py b/kosapi/entity/enum/dspace_file_type.py index ba1ec87..eae9672 100644 --- a/kosapi/entity/enum/dspace_file_type.py +++ b/kosapi/entity/enum/dspace_file_type.py @@ -1,6 +1,7 @@ from . import BaseEnum + class DSpaceFileType(BaseEnum): - ATTACHMENT = BaseEnum.auto() - REVIEW = BaseEnum.auto() - THESIS = BaseEnum.auto() \ No newline at end of file + ATTACHMENT = 1 + REVIEW = 2 + THESIS = 3 \ No newline at end of file diff --git a/kosapi/entity/enum/parallel_type.py b/kosapi/entity/enum/parallel_type.py index 7e409f1..5dce613 100644 --- a/kosapi/entity/enum/parallel_type.py +++ b/kosapi/entity/enum/parallel_type.py @@ -1,7 +1,8 @@ from . import BaseEnum + class ParallelType(BaseEnum): - LABORATORY = BaseEnum.auto() - LECTURE = BaseEnum.auto() - TUTORIAL = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + LABORATORY = 1 + LECTURE = 2 + TUTORIAL = 3 + UNDEFINED = 4 \ No newline at end of file diff --git a/kosapi/entity/enum/parity.py b/kosapi/entity/enum/parity.py index 7b71ba4..70706d4 100644 --- a/kosapi/entity/enum/parity.py +++ b/kosapi/entity/enum/parity.py @@ -1,7 +1,8 @@ from . import BaseEnum + class Parity(BaseEnum): - ODD = BaseEnum.auto() - EVEN = BaseEnum.auto() - BOTH = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + ODD = 1 + EVEN = 2 + BOTH = 3 + UNDEFINED = 4 \ No newline at end of file diff --git a/kosapi/entity/enum/permission.py b/kosapi/entity/enum/permission.py index 31c862e..ff700dd 100644 --- a/kosapi/entity/enum/permission.py +++ b/kosapi/entity/enum/permission.py @@ -1,6 +1,7 @@ from . import BaseEnum + class Permission(BaseEnum): - ALLOWED = BaseEnum.auto() - DENIED = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + ALLOWED = 1 + DENIED = 2 + UNDEFINED = 3 \ No newline at end of file diff --git a/kosapi/entity/enum/programme_type.py b/kosapi/entity/enum/programme_type.py index f1dd5bd..226c4a7 100644 --- a/kosapi/entity/enum/programme_type.py +++ b/kosapi/entity/enum/programme_type.py @@ -1,10 +1,11 @@ from . import BaseEnum + class ProgrammeType(BaseEnum): - BACHELOR = BaseEnum.auto() - DOCTORAL = BaseEnum.auto() - INTERNSHIP = BaseEnum.auto() - LIFELONG = BaseEnum.auto() - MASTER = BaseEnum.auto() - MASTER_LEGACY = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + BACHELOR = 1 + DOCTORAL = 2 + INTERNSHIP = 3 + LIFELONG = 4 + MASTER = 5 + MASTER_LEGACY = 6 + UNDEFINED = 7 \ No newline at end of file diff --git a/kosapi/entity/enum/room_type.py b/kosapi/entity/enum/room_type.py index d2ca1fc..4f9a13a 100644 --- a/kosapi/entity/enum/room_type.py +++ b/kosapi/entity/enum/room_type.py @@ -1,8 +1,9 @@ from . import BaseEnum + class RoomType(BaseEnum): - LABORATORY = BaseEnum.auto() - LECTURE = BaseEnum.auto() - OFFICE = BaseEnum.auto() - TUTORIAL = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + LABORATORY = 1 + LECTURE = 2 + OFFICE = 3 + TUTORIAL = 4 + UNDEFINED = 5 \ No newline at end of file diff --git a/kosapi/entity/enum/season.py b/kosapi/entity/enum/season.py index 825d636..0c0262b 100644 --- a/kosapi/entity/enum/season.py +++ b/kosapi/entity/enum/season.py @@ -1,7 +1,8 @@ from . import BaseEnum + class Season(BaseEnum): - WINTER = BaseEnum.auto() - SUMMER = BaseEnum.auto() - BOTH = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + WINTER = 1 + SUMMER = 2 + BOTH = 3 + UNDEFINED = 4 \ No newline at end of file diff --git a/kosapi/entity/enum/sex.py b/kosapi/entity/enum/sex.py index d563194..4f6731b 100644 --- a/kosapi/entity/enum/sex.py +++ b/kosapi/entity/enum/sex.py @@ -1,6 +1,7 @@ from . import BaseEnum + class Sex(BaseEnum): - MALE = BaseEnum.auto() - FEMALE = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + MALE = 1 + FEMALE = 2 + UNDEFINED = 3 \ No newline at end of file diff --git a/kosapi/entity/enum/study_form.py b/kosapi/entity/enum/study_form.py index d23a5c0..eb9b16d 100644 --- a/kosapi/entity/enum/study_form.py +++ b/kosapi/entity/enum/study_form.py @@ -1,11 +1,12 @@ from . import BaseEnum + class StudyForm(BaseEnum): - FULLTIME = BaseEnum.auto() - PARTTIME = BaseEnum.auto() - DISTANCE = BaseEnum.auto() - SELF_PAYER = BaseEnum.auto() - Z = BaseEnum.auto() # Prijezd kratkodoby - W = BaseEnum.auto() # Vyjezd kratkodoby - kombinovany - V = TODO = BaseEnum.auto() # Vyjezd kratkodoby - UNDEFINED = BaseEnum.auto() \ No newline at end of file + FULLTIME = 1 + PARTTIME = 2 + DISTANCE = 3 + SELF_PAYER = 4 + Z = 5 # Prijezd kratkodoby + W = 6 # Vyjezd kratkodoby - kombinovany + V = 7 # Vyjezd kratkodoby + UNDEFINED = 8 \ No newline at end of file diff --git a/kosapi/entity/enum/study_state.py b/kosapi/entity/enum/study_state.py index 71493dd..f6fbadd 100644 --- a/kosapi/entity/enum/study_state.py +++ b/kosapi/entity/enum/study_state.py @@ -1,7 +1,8 @@ from . import BaseEnum + class StudyState(BaseEnum): - ACTIVE = BaseEnum.auto() - INTERRUPTED = BaseEnum.auto() - CLOSED = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + ACTIVE = 1 + INTERRUPTED = 2 + CLOSED = 3 + UNDEFINED = 4 \ No newline at end of file diff --git a/kosapi/entity/enum/study_termination.py b/kosapi/entity/enum/study_termination.py index e5d367d..e4b4948 100644 --- a/kosapi/entity/enum/study_termination.py +++ b/kosapi/entity/enum/study_termination.py @@ -1,13 +1,14 @@ from . import BaseEnum + class StudyTermination(BaseEnum): - GRADUATION = BaseEnum.auto() - WITHDRAW = BaseEnum.auto() - NONCOMPLIANCE = BaseEnum.auto() - ACCREDITATION_REVOKED = BaseEnum.auto() - ACCREDITATION_EXPIRED = BaseEnum.auto() - EXPULSION_PAR_65 = BaseEnum.auto() - EXPULSION_PAR_67 = BaseEnum.auto() - DEATH = BaseEnum.auto() - TRANSFER_TO_OTHER_FACULTY = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + GRADUATION = 1 + WITHDRAW = 2 + NONCOMPLIANCE = 3 + ACCREDITATION_REVOKED = 4 + ACCREDITATION_EXPIRED = 5 + EXPULSION_PAR_65 = 6 + EXPULSION_PAR_67 = 7 + DEATH = 8 + TRANSFER_TO_OTHER_FACULTY = 9 + UNDEFINED = 10 \ No newline at end of file diff --git a/kosapi/entity/enum/teacher_role.py b/kosapi/entity/enum/teacher_role.py index 90a2589..231e7af 100644 --- a/kosapi/entity/enum/teacher_role.py +++ b/kosapi/entity/enum/teacher_role.py @@ -1,9 +1,10 @@ from . import BaseEnum + class TeacherRole(BaseEnum): - EDITOR = BaseEnum.auto() - EXAMINER = BaseEnum.auto() - GUARANTOR = BaseEnum.auto() - INSTRUCTOR = BaseEnum.auto() - LECTURER = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() \ No newline at end of file + EDITOR = 1 + EXAMINER = 2 + GUARANTOR = 3 + INSTRUCTOR = 4 + LECTURER = 5 + UNDEFINED = 6 \ No newline at end of file diff --git a/kosapi/entity/enum/term_type.py b/kosapi/entity/enum/term_type.py index 56804d1..9523684 100644 --- a/kosapi/entity/enum/term_type.py +++ b/kosapi/entity/enum/term_type.py @@ -1,5 +1,6 @@ from . import BaseEnum + class TermType(BaseEnum): - ASSESSMENT = BaseEnum.auto() - FINAL_EXAM = BaseEnum.auto() \ No newline at end of file + ASSESSMENT = 1 + FINAL_EXAM = 2 \ No newline at end of file diff --git a/kosapi/entity/enum/thesis_state.py b/kosapi/entity/enum/thesis_state.py index 8036343..a7b473e 100644 --- a/kosapi/entity/enum/thesis_state.py +++ b/kosapi/entity/enum/thesis_state.py @@ -1,10 +1,11 @@ from . import BaseEnum + class ThesisState(BaseEnum): - AVAILABLE = BaseEnum.auto() - RESERVED = BaseEnum.auto() - ASSIGNED = BaseEnum.auto() - SUBMITTED = BaseEnum.auto() - ACCEPTED = BaseEnum.auto() - DEFENDED = BaseEnum.auto() - UNDEFINED = BaseEnum.auto() + AVAILABLE = 1 + RESERVED = 2 + ASSIGNED = 3 + SUBMITTED = 4 + ACCEPTED = 5 + DEFENDED = 6 + UNDEFINED = 7 -- GitLab