From: Paul Vinciguerra <pvinci@vinciconsulting.com>
Date: Thu, 6 Jun 2019 14:49:46 +0000 (-0400)
Subject: vpp_papi: Fix format_vl_api_address_t under python3.
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F20005%2F2;p=vpp.git

vpp_papi: Fix format_vl_api_address_t under python3.

Under PY3, inet_pton returns OSError, not socket.error.

Type: fix

Change-Id: Id270a684c0ab124cbe1ddcb7123e14e85af844b8
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 2c2345a3f76..415070c4196 100644
--- a/src/vpp-api/python/vpp_papi/vpp_format.py
+++ b/src/vpp-api/python/vpp_papi/vpp_format.py
@@ -36,7 +36,9 @@ def format_vl_api_address_t(args):
     try:
         return {'un': {'ip6': inet_pton(AF_INET6, args)},
                 'af': ADDRESS_IP6}
-    except socket.error as e:
+    # PY2: raises socket.error
+    # PY3: raises OSError
+    except (socket.error, OSError):
         return {'un': {'ip4': inet_pton(AF_INET, args)},
                 'af': ADDRESS_IP4}