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>

diff --git a/src/vpp-api/python/vpp_papi/vpp_format.py b/src/vpp-api/python/vpp_papi/vpp_format.py
index b1800d8..d020df9 100644 (file)
--- 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 8139cf3..ca4b955 100644 (file)
--- 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 8635ce0..bd0f738 100644 (file)
--- 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 654cb82..8344de0 100644 (file)
--- 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 4d56e3c..027d391 100644 (file)
--- 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 45ec4b4..c2a706a 100644 (file)
--- 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