aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot2010-08-11 14:48:46 -0600
committerroot2010-08-11 14:48:46 -0600
commit2a859fdeebc544068067eb1bbf14f39568515284 (patch)
treeac1632ef83a48b6caafc9389ee649e7ae0cf777f
parent846d832fa79c5591cd1df7293b50d0c3705a5879 (diff)
downloadamazons3-py-2a859fdeebc544068067eb1bbf14f39568515284.tar.gz
amazons3-py-2a859fdeebc544068067eb1bbf14f39568515284.zip
Fixed ascii str conversion in get_valid_name
-rw-r--r--django/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/__init__.py b/django/__init__.py
index f354dea..827e2c3 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -149,7 +149,7 @@ class CxStorage(S3Storage):
149 149
150 extension = os.path.splitext(name)[1].lower() 150 extension = os.path.splitext(name)[1].lower()
151 # Ensure an ascii string for .hexdigest() later. 151 # Ensure an ascii string for .hexdigest() later.
152 name = str(name).encode('ascii', 'ignore') 152 name = name.encode('ascii', 'ignore')
153 153
154 return str(md5(str(time.time()) + name).hexdigest()) + \ 154 return str(md5(str(time.time()) + name).hexdigest()) + \
155 str(extension) 155 str(extension)