summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-15 12:37:08 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-15 12:37:08 +0200
commit187ec5a1664377337afdc9c701307717ab80ab9e (patch)
treecfb446fec1ed59ad34586659aa62b8a2116db2ab
parent2d2dca2d8e8f2b7f05f90594a291a2c78fe828d0 (diff)
[py3] Pass bytes to md5 in truncate_name
-rw-r--r--django/db/backends/util.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/backends/util.py b/django/db/backends/util.py
index 775bb3e182..9d70248ebf 100644
--- a/django/db/backends/util.py
+++ b/django/db/backends/util.py
@@ -6,6 +6,7 @@ import hashlib
from time import time
from django.conf import settings
+from django.utils.encoding import smart_bytes
from django.utils.log import getLogger
from django.utils.timezone import utc
@@ -137,7 +138,7 @@ def truncate_name(name, length=None, hash_len=4):
if length is None or len(name) <= length:
return name
- hsh = hashlib.md5(name).hexdigest()[:hash_len]
+ hsh = hashlib.md5(smart_bytes(name)).hexdigest()[:hash_len]
return '%s%s' % (name[:length-hash_len], hsh)
def format_number(value, max_digits, decimal_places):