commit 1556b3ad7d96ff4a54101f6b8fbdc1738da6667e
author Ole Troan <ot@cisco.com> Mon Oct 21 19:52:06 2019 +0200
committer Andrew Yourtchenko <ayourtch@gmail.com> Mon Oct 21 18:32:58 2019 +0000
tree 93c47679a69727c308c80ea53d792f0a7377fc07
parent 22674295747965759806231c8e5beb4b1d7fa96a

classify: tests to support python3

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I8af6ee6e5239f0836978baa063a18a01c610279f

test/test_classifier_ip6.py

diff --git a/test/test_classifier_ip6.py b/test/test_classifier_ip6.py
index ea6adcb..0522520 100644
--- a/test/test_classifier_ip6.py
+++ b/test/test_classifier_ip6.py
@@ -190,11 +190,18 @@
         :param int dst_port: destination port number "x"
         """
         if src_ip:
-            src_ip = binascii.hexlify(socket.inet_pton(
-                socket.AF_INET6, src_ip))
+            if sys.version_info[0] == 2:
+                src_ip = binascii.hexlify(socket.inet_pton(
+                    socket.AF_INET6, src_ip))
+            else:
+                src_ip = socket.inet_pton(socket.AF_INET6, src_ip).hex()
+
         if dst_ip:
-            dst_ip = binascii.hexlify(socket.inet_pton(
-                socket.AF_INET6, dst_ip))
+            if sys.version_info[0] == 2:
+                dst_ip = binascii.hexlify(socket.inet_pton(
+                    socket.AF_INET6, dst_ip))
+            else:
+                dst_ip = socket.inet_pton(socket.AF_INET6, dst_ip).hex()
 
         return ('{!s:0>14}{!s:0>34}{!s:0>32}{!s:0>4}{!s:0>4}'.format(
             hex(nh)[2:], src_ip, dst_ip, hex(src_port)[2:],