diff options
author | Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-03-07 11:26:23 -0800 |
---|---|---|
committer | Ole Trøan <otroan@employees.org> | 2019-03-07 22:19:48 +0000 |
commit | 42bdba80f744840ed281770624019a8907793bf3 (patch) | |
tree | 276246a929acd2f6ef86521d0605159bdb777837 /src/vpp-api/python/vpp_papi | |
parent | 2cbf2fb05ea0468a6faf8df575f32d1277109527 (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/vpp-api/python/vpp_papi')
-rw-r--r-- | src/vpp-api/python/vpp_papi/vpp_serializer.py | 13 |
1 files changed, 10 insertions, 3 deletions
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 |