From 212a5129842ffec9d42ae0dbdb55964fab2c5fa2 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Tue, 14 Aug 2012 23:10:01 +0200
Subject: [PATCH] [py3] Avoided the deprecated base64 interface.

This fixes a deprecation warning under Python 3.
---
 django/contrib/sessions/backends/base.py | 4 ++--
 django/core/cache/backends/db.py         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/django/contrib/sessions/backends/base.py b/django/contrib/sessions/backends/base.py
index 4515edbb17..c25f1babd4 100644
--- a/django/contrib/sessions/backends/base.py
+++ b/django/contrib/sessions/backends/base.py
@@ -81,10 +81,10 @@ class SessionBase(object):
         "Returns the given session dictionary pickled and encoded as a string."
         pickled = pickle.dumps(session_dict, pickle.HIGHEST_PROTOCOL)
         hash = self._hash(pickled)
-        return base64.encodestring(hash.encode() + b":" + pickled)
+        return base64.b64encode(hash.encode() + b":" + pickled)
 
     def decode(self, session_data):
-        encoded_data = base64.decodestring(smart_bytes(session_data))
+        encoded_data = base64.b64decode(smart_bytes(session_data))
         try:
             # could produce ValueError if there is no ':'
             hash, pickled = encoded_data.split(b':', 1)
diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py
index f60b4e0cd1..17fa885ce2 100644
--- a/django/core/cache/backends/db.py
+++ b/django/core/cache/backends/db.py
@@ -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: