From aadcd3e4f4ac5c8251db1a7899d96c8ee279e04d Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 22 Apr 2015 03:24:58 +0200 Subject: Fix hash_identifier() on Python 3 Fix paste.exceptions.serial_number_generator.hash_identifier() --- paste/exceptions/serial_number_generator.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/paste/exceptions/serial_number_generator.py b/paste/exceptions/serial_number_generator.py index 5315b7c..3f80107 100644 --- a/paste/exceptions/serial_number_generator.py +++ b/paste/exceptions/serial_number_generator.py @@ -63,7 +63,11 @@ def hash_identifier(s, length, pad=True, hasher=md5, prefix='', "length (you gave %s)" % length) if isinstance(s, six.text_type): s = s.encode('utf-8') - h = hasher(six.binary_type(s)) + elif not isinstance(s, six.binary_type): + s = str(s) + if six.PY3: + s = s.encode('utf-8') + h = hasher(s) bin_hash = h.digest() modulo = base ** length number = 0 -- cgit v1.2.1