mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

[py3] Avoided the deprecated base64 interface.

Browse Source 
This fixes a deprecation warning under Python 3.
This commit is contained in:
Aymeric Augustin
2012-08-14 23:10:01 +02:00
parent 928baee747
commit 212a512984
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/cache/backends/db.py vendored
View File

@@ -72,7 +72,7 @@ class DatabaseCache(BaseDatabaseCache):
transaction.commit_unless_managed(using=db)
return default
value = connections[db].ops.process_clob(row[1])
return pickle.loads(base64.decodestring(value))
return pickle.loads(base64.b64decode(value))
def set(self, key, value, timeout=None, version=None):
key = self.make_key(key, version=version)
@@ -103,7 +103,7 @@ class DatabaseCache(BaseDatabaseCache):
if num > self._max_entries:
self._cull(db, cursor, now)
pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
encoded = base64.encodestring(pickled).strip()
encoded = base64.b64encode(pickled).strip()
cursor.execute("SELECT cache_key, expires FROM %s "
"WHERE cache_key = %%s" % table, [key])
try: