Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "API: Cleanup APIs interface.api"
[vpp.git]
/
test
/
remote_test.py
diff --git
a/test/remote_test.py
b/test/remote_test.py
index
f5b3c62
..
bc6d707
100644
(file)
--- a/
test/remote_test.py
+++ b/
test/remote_test.py
@@
-3,21
+3,14
@@
import inspect
import os
import unittest
import inspect
import os
import unittest
-from framework import VppTestCase
from multiprocessing import Process, Pipe
from pickle import dumps
from multiprocessing import Process, Pipe
from pickle import dumps
+
import six
from six import moves
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):
class SerializableClassCopy(object):
@@
-273,7
+266,7
@@
class RemoteClass(Process):
if type(obj) is tuple:
rv = tuple(rv)
return rv
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)
return obj.value
else:
return self._make_obj_serializable(obj)