tests: remove py2/py3 six compatability library
Type: test Change-Id: Idb6b8169845e0239e639429ccfd02a683212b7e6 Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:

committed by
Ole Tr�an

parent
4a856f9593
commit
090096bff3
@ -2,12 +2,11 @@
|
||||
|
||||
import inspect
|
||||
import os
|
||||
import reprlib
|
||||
import unittest
|
||||
from framework import VppTestCase
|
||||
from multiprocessing import Process, Pipe
|
||||
from pickle import dumps
|
||||
import six
|
||||
from six import moves
|
||||
import sys
|
||||
|
||||
from enum import IntEnum, IntFlag
|
||||
@ -110,7 +109,7 @@ class RemoteClass(Process):
|
||||
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))
|
||||
@ -144,7 +143,7 @@ class RemoteClass(Process):
|
||||
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()
|
||||
@ -201,7 +200,7 @@ class RemoteClass(Process):
|
||||
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
|
||||
|
||||
|
Reference in New Issue
Block a user