Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tests: refactor ForeignAddressFactory
[vpp.git]
/
test
/
remote_test.py
diff --git
a/test/remote_test.py
b/test/remote_test.py
index
cd2e46f
..
c9686f5
100644
(file)
--- a/
test/remote_test.py
+++ b/
test/remote_test.py
@@
-1,16
+1,15
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
import inspect
import os
import inspect
import os
+import reprlib
import unittest
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 sys
-import six
-from six import moves
-
-from framework import VppTestCase
-from aenum import Enum
+from enum import IntEnum, IntFlag
class SerializableClassCopy(object):
class SerializableClassCopy(object):
@@
-110,7
+109,7
@@
class RemoteClass(Process):
self._pipe = Pipe() # pipe for input/output arguments
def __repr__(self):
self._pipe = Pipe() # pipe for input/output arguments
def __repr__(self):
- return
moves.
reprlib.repr(RemoteClassAttr(self, None))
+ return reprlib.repr(RemoteClassAttr(self, None))
def __str__(self):
return str(RemoteClassAttr(self, None))
def __str__(self):
return str(RemoteClassAttr(self, None))
@@
-144,7
+143,7
@@
class RemoteClass(Process):
isinstance(val, RemoteClassAttr):
mutable_args[i] = val.get_remote_value()
args = tuple(mutable_args)
isinstance(val, RemoteClassAttr):
mutable_args[i] = val.get_remote_value()
args = tuple(mutable_args)
- for key, val in
six.iteritems(kwargs
):
+ for key, val in
kwargs.items(
):
if isinstance(val, RemoteClass) or \
isinstance(val, RemoteClassAttr):
kwargs[key] = val.get_remote_value()
if isinstance(val, RemoteClass) or \
isinstance(val, RemoteClassAttr):
kwargs[key] = val.get_remote_value()
@@
-201,7
+200,7
@@
class RemoteClass(Process):
def _get_local_repr(self, path):
try:
obj = self._get_local_object(path)
def _get_local_repr(self, path):
try:
obj = self._get_local_object(path)
- return
moves.
reprlib.repr(obj)
+ return reprlib.repr(obj)
except AttributeError:
return None
except AttributeError:
return None
@@
-249,12
+248,14
@@
class RemoteClass(Process):
if name[0] == '_':
if name in ['__weakref__']:
continue
if name[0] == '_':
if name in ['__weakref__']:
continue
+ if name in ['__dict__']:
+ continue
if not (name.startswith('__') and name.endswith('__')):
continue
if callable(member) and not isinstance(member, property):
continue
if not self._serializable(member):
if not (name.startswith('__') and name.endswith('__')):
continue
if callable(member) and not isinstance(member, property):
continue
if not self._serializable(member):
- continue
+ member = self._make_serializable(member)
setattr(copy, name, member)
return copy
setattr(copy, name, member)
return copy
@@
-270,7
+271,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,
Enum
)):
+ elif (isinstance(obj,
IntEnum) or isinstance(obj, IntFlag
)):
return obj.value
else:
return self._make_obj_serializable(obj)
return obj.value
else:
return self._make_obj_serializable(obj)