From 977837ef74919a036729485db75e43484a1bc6a9 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 15 Jun 2015 00:26:14 +0300 Subject: [PATCH] binascii: Prefer builtin unhexlify() implementation. --- binascii/binascii.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/binascii/binascii.py b/binascii/binascii.py index 26829bba..2b7cf6fe 100644 --- a/binascii/binascii.py +++ b/binascii/binascii.py @@ -1,10 +1,11 @@ -from ubinascii import hexlify +from ubinascii import * -def unhexlify(data): - if len(data) % 2 != 0: - raise ValueError("Odd-length string") +if not "unhexlify" in globals(): + def unhexlify(data): + if len(data) % 2 != 0: + raise ValueError("Odd-length string") - return bytes([ int(data[i:i+2], 16) for i in range(0, len(data), 2) ]) + return bytes([ int(data[i:i+2], 16) for i in range(0, len(data), 2) ]) b2a_hex = hexlify a2b_hex = unhexlify