From 522cd0009367d1f775b0e978681426773f51ce14 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 18 May 2013 18:12:30 +0200
Subject: [PATCH] python-modernize automated changes: fix_unicode (but without
 six.u())

---
 flask/json.py                 | 3 ++-
 flask/sessions.py             | 4 ++--
 flask/testsuite/basic.py      | 3 ++-
 flask/testsuite/blueprints.py | 3 ++-
 flask/testsuite/helpers.py    | 6 +++---
 flask/testsuite/testing.py    | 3 ++-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/flask/json.py b/flask/json.py
index 717eb2ab..dee2e189 100644
--- a/flask/json.py
+++ b/flask/json.py
@@ -17,6 +17,7 @@ from werkzeug.http import http_date
 # Use the same json implementation as itsdangerous on which we
 # depend anyways.
 from itsdangerous import simplejson as _json
+import six
 
 
 # figure out if simplejson escapes slashes.  This behavior was changed
@@ -59,7 +60,7 @@ class JSONEncoder(_json.JSONEncoder):
         if isinstance(o, uuid.UUID):
             return str(o)
         if hasattr(o, '__html__'):
-            return unicode(o.__html__())
+            return six.text_type(o.__html__())
         return _json.JSONEncoder.default(self, o)
 
 
diff --git a/flask/sessions.py b/flask/sessions.py
index b8e37014..04b7f8af 100644
--- a/flask/sessions.py
+++ b/flask/sessions.py
@@ -63,7 +63,7 @@ class TaggedJSONSerializer(object):
             elif isinstance(value, uuid.UUID):
                 return {' u': value.hex}
             elif callable(getattr(value, '__html__', None)):
-                return {' m': unicode(value.__html__())}
+                return {' m': six.text_type(value.__html__())}
             elif isinstance(value, list):
                 return [_tag(x) for x in value]
             elif isinstance(value, datetime):
@@ -72,7 +72,7 @@ class TaggedJSONSerializer(object):
                 return dict((k, _tag(v)) for k, v in six.iteritems(value))
             elif isinstance(value, str):
                 try:
-                    return unicode(value)
+                    return six.text_type(value)
                 except UnicodeError:
                     raise UnexpectedUnicodeError(u'A byte string with '
                         u'non-ASCII data was passed to the session system '
diff --git a/flask/testsuite/basic.py b/flask/testsuite/basic.py
index 5f6dbe4b..7cdf2211 100644
--- a/flask/testsuite/basic.py
+++ b/flask/testsuite/basic.py
@@ -22,6 +22,7 @@ from flask.testsuite import FlaskTestCase, emits_module_deprecation_warning
 from werkzeug.exceptions import BadRequest, NotFound
 from werkzeug.http import parse_date
 from werkzeug.routing import BuildError
+import six
 
 
 class BasicFunctionalityTestCase(FlaskTestCase):
@@ -277,7 +278,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
 
         @app.route('/test')
         def test():
-            return unicode(flask.session.permanent)
+            return six.text_type(flask.session.permanent)
 
         client = app.test_client()
         rv = client.get('/')
diff --git a/flask/testsuite/blueprints.py b/flask/testsuite/blueprints.py
index ea047918..97426c8e 100644
--- a/flask/testsuite/blueprints.py
+++ b/flask/testsuite/blueprints.py
@@ -18,6 +18,7 @@ from flask.testsuite import FlaskTestCase, emits_module_deprecation_warning
 from werkzeug.exceptions import NotFound
 from werkzeug.http import parse_cache_control_header
 from jinja2 import TemplateNotFound
+import six
 
 
 # import moduleapp here because it uses deprecated features and we don't
@@ -304,7 +305,7 @@ class BlueprintTestCase(FlaskTestCase):
 
         @bp.route('/bar')
         def bar(bar):
-            return unicode(bar)
+            return six.text_type(bar)
 
         app = flask.Flask(__name__)
         app.register_blueprint(bp, url_prefix='/1', url_defaults={'bar': 23})
diff --git a/flask/testsuite/helpers.py b/flask/testsuite/helpers.py
index 5604f85f..ac618538 100644
--- a/flask/testsuite/helpers.py
+++ b/flask/testsuite/helpers.py
@@ -36,7 +36,7 @@ class JSONTestCase(FlaskTestCase):
         app = flask.Flask(__name__)
         @app.route('/json', methods=['POST'])
         def return_json():
-            return unicode(flask.request.json)
+            return six.text_type(flask.request.json)
         c = app.test_client()
         rv = c.post('/json', data='malformed', content_type='application/json')
         self.assert_equal(rv.status_code, 400)
@@ -45,7 +45,7 @@ class JSONTestCase(FlaskTestCase):
         app = flask.Flask(__name__)
         @app.route('/json', methods=['POST'])
         def return_json():
-            return unicode(flask.request.json)
+            return six.text_type(flask.request.json)
         c = app.test_client()
         rv = c.post('/json', data='malformed', content_type='application/json')
         self.assert_equal(rv.status_code, 400)
@@ -97,7 +97,7 @@ class JSONTestCase(FlaskTestCase):
         app = flask.Flask(__name__)
         @app.route('/add', methods=['POST'])
         def add():
-            return unicode(flask.request.json['a'] + flask.request.json['b'])
+            return six.text_type(flask.request.json['a'] + flask.request.json['b'])
         c = app.test_client()
         rv = c.post('/add', data=flask.json.dumps({'a': 1, 'b': 2}),
                             content_type='application/json')
diff --git a/flask/testsuite/testing.py b/flask/testsuite/testing.py
index 92e3f267..92be9d33 100644
--- a/flask/testsuite/testing.py
+++ b/flask/testsuite/testing.py
@@ -14,6 +14,7 @@ from __future__ import with_statement
 import flask
 import unittest
 from flask.testsuite import FlaskTestCase
+import six
 
 
 class TestToolsTestCase(FlaskTestCase):
@@ -85,7 +86,7 @@ class TestToolsTestCase(FlaskTestCase):
 
         @app.route('/')
         def index():
-            return unicode(flask.session['foo'])
+            return six.text_type(flask.session['foo'])
 
         with app.test_client() as c:
             with c.session_transaction() as sess: