summaryrefslogtreecommitdiff
path: root/simplejson/compat.py
diff options
context:
space:
mode:
authorRoy Williams <rwilliams@lyft.com>2016-09-22 14:46:49 -0700
committerRoy Williams <rwilliams@lyft.com>2016-09-22 14:46:53 -0700
commit074e5f4fcf2aecd4fe648ea273da6f0d8c471fdf (patch)
treea694eb71b22d3e7249a6dd5ac52478c6c89b71c6 /simplejson/compat.py
parenta1cd6421d095af6c7db5e5c44e14916eb555aade (diff)
downloadsimplejson-074e5f4fcf2aecd4fe648ea273da6f0d8c471fdf.tar.gz
Remove fromhex all together
Diffstat (limited to 'simplejson/compat.py')
-rw-r--r--simplejson/compat.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/simplejson/compat.py b/simplejson/compat.py
index 6dd4132..6f945cc 100644
--- a/simplejson/compat.py
+++ b/simplejson/compat.py
@@ -15,13 +15,6 @@ if sys.version_info[0] < 3:
integer_types = (int, long)
unichr = unichr
reload_module = reload
- try:
- from binascii import unhexlify as fromhex
- except ImportError:
- # Python 2.5
- def fromhex(s):
- return s.decode('hex')
-
else:
PY3 = True
if sys.version_info[:2] >= (3, 4):
@@ -44,7 +37,4 @@ else:
def unichr(s):
return u(chr(s))
- def fromhex(s):
- return bytes.fromhex(s)
-
long_type = integer_types[-1]