Revert "API: Cleanup APIs interface.api"
This reverts commit e63325e3ca03c847963863446345e6c80a2c0cfd.
Allow time for CSIT to accommodate.
Change-Id: I59435e4ab5e05e36a2796c3bf44889b5d4823cc2
Signed-off-by: ot@cisco.com
diff --git a/test/remote_test.py b/test/remote_test.py
index f5b3c62..bc6d707 100644
--- a/test/remote_test.py
+++ b/test/remote_test.py
@@ -3,21 +3,14 @@
import inspect
import os
import unittest
-from framework import VppTestCase
from multiprocessing import Process, Pipe
from pickle import dumps
+
import six
from six import moves
-import sys
-if sys.version_info <= (3, 4):
- from aenum import IntEnum
-else:
- from enum import IntEnum
-if sys.version_info <= (3, 6):
- from aenum import IntFlag
-else:
- from enum import IntFlag
+from framework import VppTestCase
+from enum import Enum
class SerializableClassCopy(object):
@@ -273,7 +266,7 @@
if type(obj) is tuple:
rv = tuple(rv)
return rv
- elif (isinstance(obj, IntEnum) or isinstance(obj, IntFlag)):
+ elif (isinstance(obj, Enum)):
return obj.value
else:
return self._make_obj_serializable(obj)