LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File bugfix-any-unicode-string-of-length-16-will-raise-ty.patch of Package salt (Project openSUSE:Factory)

From 8fc3419db49497ca33f99d7bbc3a251d7b07ff09 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/_compat.py b/salt/_compat.py
index 8628833dcf..98931c6cce 100644
--- a/salt/_compat.py
+++ b/salt/_compat.py
@@ -191,7 +191,7 @@ class IPv6AddressScoped(ipaddress.IPv6Address):
         if isinstance(data, bytes) and len(data) == 16 and b':' not in data:
             try:
                 packed = bool(int(str(bytearray(data)).encode('hex'), 16))
-            except ValueError:
+            except (ValueError, TypeError):
                 pass
 
         return packed
-- 
2.20.1