From a932c596fc5bfcfcb358981540917c8d6f9dc575 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Sat, 6 Sep 2014 10:07:34 -0400
Subject: [PATCH] [1.7.x] Fixed #22882 -- Fixed a UnicodeDecodeError in flush.

Thanks djbaldey for the report.

Backport of 0e4d79c4f0 from master
---
 django/core/management/commands/flush.py | 2 ++
 docs/releases/1.7.1.txt                  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/django/core/management/commands/flush.py b/django/core/management/commands/flush.py
index 29e3a8ec58..637d6d525b 100644
--- a/django/core/management/commands/flush.py
+++ b/django/core/management/commands/flush.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import sys
 from importlib import import_module
 from optparse import make_option
diff --git a/docs/releases/1.7.1.txt b/docs/releases/1.7.1.txt
index 9b36ee71ba..64a673f5a6 100644
--- a/docs/releases/1.7.1.txt
+++ b/docs/releases/1.7.1.txt
@@ -10,3 +10,6 @@ Bugfixes
 ========
 
 * Replace with actual issue (:ticket:`00000`).
+
+* Fixed a ``UnicodeDecodeError`` when the ``flush`` error message contained
+  Unicode characters (:ticket:`22882`).