aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2019-03-07 11:26:23 -0800
committerOle Trøan <otroan@employees.org>2019-03-07 22:19:48 +0000
commit42bdba80f744840ed281770624019a8907793bf3 (patch)
tree276246a929acd2f6ef86521d0605159bdb777837 /src
parent2cbf2fb05ea0468a6faf8df575f32d1277109527 (diff)
vpp_papi: Adjust aenum import for python3.
The stdlib introduced IntEnum in python 3.4 and IntFlag in python 3.6. Change-Id: I3ac278a9d5a97eefa9fc4f1491f0cd030e40c3b2 Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'src')
-rw-r--r--src/vpp-api/python/setup.py2
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_serializer.py13
2 files changed, 11 insertions, 4 deletions
diff --git a/src/vpp-api/python/setup.py b/src/vpp-api/python/setup.py
index b5fc11a590a..c8321320c73 100644
--- a/src/vpp-api/python/setup.py
+++ b/src/vpp-api/python/setup.py
@@ -13,7 +13,7 @@
# limitations under the License.
import sys
-stdlib_enum = sys.version_info >= (3, 4)
+stdlib_enum = sys.version_info >= (3, 6)
try:
from setuptools import setup, find_packages
diff --git a/src/vpp-api/python/vpp_papi/vpp_serializer.py b/src/vpp-api/python/vpp_papi/vpp_serializer.py
index e6012018f08..1e59e366a8f 100644
--- a/src/vpp-api/python/vpp_papi/vpp_serializer.py
+++ b/src/vpp-api/python/vpp_papi/vpp_serializer.py
@@ -16,10 +16,17 @@
import struct
import collections
import sys
-if sys.version[0] == '2':
- from aenum import IntEnum, IntFlag
+
+if sys.version_info <= (3, 4):
+ from aenum import IntEnum
else:
- from enum import IntEnum, IntFlag
+ from enum import IntEnum
+
+if sys.version_info <= (3, 6):
+ from aenum import IntFlag
+else:
+ from enum import IntFlag
+
import logging
from . import vpp_format
import ipaddress