summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2018-11-26 12:04:48 -0800
committerOle Trøan <otroan@employees.org>2018-11-28 07:30:40 +0000
commit7e713f133a62efdc9d3019aeeee15cce774087e2 (patch)
tree8b3aca5d3392460d3010c9c9f693df43a180e2a5
parent526ad04e013a24d685419e4ff0d7c5f03c3395f9 (diff)
vpp_papi: Use new style classes.
Python2 defaults to old style classes to maintain compatability with python 2.1. Moving to new style classes will ensure consistent behavior across interpreters. Change-Id: I89493d608d1edb63989000c17a9566a97785a4aa Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_format.py2
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_papi.py4
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_serializer.py14
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_stats.py2
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_transport_shmem.py2
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_transport_socket.py2
6 files changed, 13 insertions, 13 deletions
diff --git a/src/vpp-api/python/vpp_papi/vpp_format.py b/src/vpp-api/python/vpp_papi/vpp_format.py
index b1800d87dd1..d020df96188 100644
--- a/src/vpp-api/python/vpp_papi/vpp_format.py
+++ b/src/vpp-api/python/vpp_papi/vpp_format.py
@@ -16,7 +16,7 @@
from socket import inet_pton, inet_ntop, AF_INET6, AF_INET
-class VPPFormat:
+class VPPFormat(object):
@staticmethod
def format_vl_api_ip6_prefix_t(args):
prefix, len = args.split('/')
diff --git a/src/vpp-api/python/vpp_papi/vpp_papi.py b/src/vpp-api/python/vpp_papi/vpp_papi.py
index 8139cf3c614..ca4b955fd07 100644
--- a/src/vpp-api/python/vpp_papi/vpp_papi.py
+++ b/src/vpp-api/python/vpp_papi/vpp_papi.py
@@ -45,7 +45,7 @@ class VppEnumType(type):
# Python3
# class VppEnum(metaclass=VppEnumType):
# pass
-class VppEnum:
+class VppEnum(object):
__metaclass__ = VppEnumType
@@ -77,7 +77,7 @@ class FuncWrapper(object):
return self._func(**kwargs)
-class VPP():
+class VPP(object):
"""VPP interface.
This class provides the APIs to VPP. The APIs are loaded
diff --git a/src/vpp-api/python/vpp_papi/vpp_serializer.py b/src/vpp-api/python/vpp_papi/vpp_serializer.py
index 8635ce0070c..bd0f73803da 100644
--- a/src/vpp-api/python/vpp_papi/vpp_serializer.py
+++ b/src/vpp-api/python/vpp_papi/vpp_serializer.py
@@ -27,7 +27,7 @@ from .vpp_format import VPPFormat
logger = logging.getLogger(__name__)
-class BaseTypes():
+class BaseTypes(object):
def __init__(self, type, elements=0):
base_types = {'u8': '>B',
'u16': '>H',
@@ -72,7 +72,7 @@ def vpp_get_type(name):
return None
-class FixedList_u8():
+class FixedList_u8(object):
def __init__(self, name, field_type, num):
self.name = name
self.num = num
@@ -98,7 +98,7 @@ class FixedList_u8():
return self.packer.unpack(data, offset)
-class FixedList():
+class FixedList(object):
def __init__(self, name, field_type, num):
self.num = num
self.packer = types[field_type]
@@ -125,7 +125,7 @@ class FixedList():
return result, total
-class VLAList():
+class VLAList(object):
def __init__(self, name, field_type, len_field_name, index):
self.name = name
self.index = index
@@ -198,7 +198,7 @@ class VLAList_legacy():
return r, total
-class VPPEnumType():
+class VPPEnumType(object):
def __init__(self, name, msgdef):
self.size = types['u32'].size
e_hash = {}
@@ -227,7 +227,7 @@ class VPPEnumType():
return self.enum(x), size
-class VPPUnionType():
+class VPPUnionType(object):
def __init__(self, name, msgdef):
self.name = name
self.size = 0
@@ -277,7 +277,7 @@ class VPPUnionType():
return self.tuple._make(r), maxsize
-class VPPType():
+class VPPType(object):
# Set everything up to be able to pack / unpack
def __init__(self, name, msgdef):
self.name = name
diff --git a/src/vpp-api/python/vpp_papi/vpp_stats.py b/src/vpp-api/python/vpp_papi/vpp_stats.py
index 654cb82d841..8344de0c55b 100644
--- a/src/vpp-api/python/vpp_papi/vpp_stats.py
+++ b/src/vpp-api/python/vpp_papi/vpp_stats.py
@@ -138,7 +138,7 @@ def stat_entry_to_python(api, e):
return None
-class VPPStats:
+class VPPStats(object):
def __init__(self, socketname='/var/run/stats.sock', timeout=10):
try:
self.api = ffi.dlopen('libvppapiclient.so')
diff --git a/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py b/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py
index 4d56e3cf00a..027d391df3e 100644
--- a/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py
+++ b/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py
@@ -47,7 +47,7 @@ def vac_error_handler(arg, msg, msg_len):
vpp_object.logger.warning("VPP API client:: %s", ffi.string(msg, msg_len))
-class VppTransport:
+class VppTransport(object):
def __init__(self, parent, read_timeout, server_address):
self.connected = False
self.read_timeout = read_timeout
diff --git a/src/vpp-api/python/vpp_papi/vpp_transport_socket.py b/src/vpp-api/python/vpp_papi/vpp_transport_socket.py
index 45ec4b4922e..c2a706ab1da 100644
--- a/src/vpp-api/python/vpp_papi/vpp_transport_socket.py
+++ b/src/vpp-api/python/vpp_papi/vpp_transport_socket.py
@@ -10,7 +10,7 @@ import queue
import logging
-class VppTransport:
+class VppTransport(object):
def __init__(self, parent, read_timeout, server_address):
self.connected = False
self.read_timeout = read_timeout if read_timeout > 0 else 1