From 381227af664131929f6e3f32207e2f7fa2a96ff9 Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Wed, 12 Dec 2018 22:39:31 +0100 Subject: [PATCH] Make use `aenum` instead of the default `enum` --- fbchat/models.py | 4 ++-- requirements.txt | 2 +- setup.cfg | 5 +---- setup.py | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/fbchat/models.py b/fbchat/models.py index 7cc9d65..a870913 100644 --- a/fbchat/models.py +++ b/fbchat/models.py @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- from __future__ import unicode_literals -import enum +import aenum class FBchatException(Exception): @@ -523,7 +523,7 @@ class Plan(object): def __unicode__(self): return ''.format(self.uid, repr(self.title), self.time, repr(self.location), repr(self.location_id)) -class Enum(enum.Enum): +class Enum(aenum.Enum): """Used internally by fbchat to support enumerations""" def __repr__(self): # For documentation: diff --git a/requirements.txt b/requirements.txt index 9cb2a6c..40ce5a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ requests beautifulsoup4 -enum34; python_version < '3.4' +aenum diff --git a/setup.cfg b/setup.cfg index b554b7b..45cdd3b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,9 +43,6 @@ include_package_data = True packages = find: python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4.0 install_requires = + aenum requests beautifulsoup4 - # May not work in pip with bdist_wheel - # See https://wheel.readthedocs.io/en/latest/#defining-conditional-dependencies - # It is therefore defined in setup.py - # enum34; python_version < '3.4' diff --git a/setup.py b/setup.py index 1157ca5..3216505 100755 --- a/setup.py +++ b/setup.py @@ -5,4 +5,4 @@ from __future__ import unicode_literals from setuptools import setup -setup(extras_require={':python_version < "3.4"': ['enum34']}) +setup()