51d9b78cf8
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=156
30 lines
913 B
Diff
30 lines
913 B
Diff
From 160103e536cfb5c956d64ed13b9c633153fb7a2e Mon Sep 17 00:00:00 2001
|
|
From: Bo Maryniuk <bo@suse.de>
|
|
Date: Fri, 5 Oct 2018 12:02:08 +0200
|
|
Subject: [PATCH] Bugfix: any unicode string of length 16 will raise
|
|
TypeError instead of ValueError
|
|
|
|
---
|
|
salt/_compat.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/_compat.py b/salt/_compat.py
|
|
index 61842b4bf3..42153f2395 100644
|
|
--- a/salt/_compat.py
|
|
+++ b/salt/_compat.py
|
|
@@ -190,8 +190,8 @@ class IPv6AddressScoped(ipaddress.IPv6Address):
|
|
packed = False
|
|
if isinstance(data, bytes) and len(data) == 16 and b':' not in data:
|
|
try:
|
|
- packed = bool(int(binascii.hexlify(data), 16))
|
|
- except ValueError:
|
|
+ packed = bool(int(str(bytearray(data)).encode('hex'), 16))
|
|
+ except (ValueError, TypeError):
|
|
pass
|
|
|
|
return packed
|
|
--
|
|
2.16.4
|
|
|
|
|