Remove six dependency

flask/testsuite/basic.py

@@ -17,10 +17,10 @@ import unittest
 from datetime import datetime
 from threading import Thread
 from flask.testsuite import FlaskTestCase, emits_module_deprecation_warning
+from flask._compat import text_type
 from werkzeug.exceptions import BadRequest, NotFound
 from werkzeug.http import parse_date
 from werkzeug.routing import BuildError
-import six
 
 
 class BasicFunctionalityTestCase(FlaskTestCase):
@@ -276,7 +276,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
 
         @app.route('/test')
         def test():
-            return six.text_type(flask.session.permanent)
+            return text_type(flask.session.permanent)
 
         client = app.test_client()
         rv = client.get('/')

flask/testsuite/blueprints.py

@@ -13,10 +13,10 @@ import flask
 import unittest
 import warnings
 from flask.testsuite import FlaskTestCase, emits_module_deprecation_warning
+from flask._compat import text_type
 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
@@ -303,7 +303,7 @@ class BlueprintTestCase(FlaskTestCase):
 
         @bp.route('/bar')
         def bar(bar):
-            return six.text_type(bar)
+            return text_type(bar)
 
         app = flask.Flask(__name__)
         app.register_blueprint(bp, url_prefix='/1', url_defaults={'bar': 23})

flask/testsuite/ext.py

@@ -11,9 +11,12 @@
 
 import sys
 import unittest
+try:
+    from imp import reload as reload_module
+except ImportError:
+    reload_module = reload
 from flask.testsuite import FlaskTestCase
 from flask._compat import PY2
-from six.moves import reload_module
 
 class ExtImportHookTestCase(FlaskTestCase):
 

flask/testsuite/helpers.py

@@ -15,8 +15,7 @@ import unittest
 from logging import StreamHandler
 from flask.testsuite import FlaskTestCase, catch_warnings, catch_stderr
 from werkzeug.http import parse_cache_control_header, parse_options_header
-import six
-from flask._compat import StringIO
+from flask._compat import StringIO, text_type
 
 
 def has_encoding(name):
@@ -34,7 +33,7 @@ class JSONTestCase(FlaskTestCase):
         app = flask.Flask(__name__)
         @app.route('/json', methods=['POST'])
         def return_json():
-            return six.text_type(flask.request.json)
+            return 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)
@@ -43,7 +42,7 @@ class JSONTestCase(FlaskTestCase):
         app = flask.Flask(__name__)
         @app.route('/json', methods=['POST'])
         def return_json():
-            return six.text_type(flask.request.json)
+            return 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)
@@ -95,7 +94,7 @@ class JSONTestCase(FlaskTestCase):
         app = flask.Flask(__name__)
         @app.route('/add', methods=['POST'])
         def add():
-            return six.text_type(flask.request.json['a'] + flask.request.json['b'])
+            return 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')
@@ -506,7 +505,7 @@ class StreamingTestCase(FlaskTestCase):
             def close(self):
                 called.append(42)
             def next(self):
-                return six.advance_iterator(self._gen)
+                return next(self._gen)
         @app.route('/')
         def index():
             def generate():

flask/testsuite/testing.py

@@ -12,7 +12,7 @@
 import flask
 import unittest
 from flask.testsuite import FlaskTestCase
-import six
+from flask._compat import text_type
 
 
 class TestToolsTestCase(FlaskTestCase):
@@ -84,7 +84,7 @@ class TestToolsTestCase(FlaskTestCase):
 
         @app.route('/')
         def index():
-            return six.text_type(flask.session['foo'])
+            return text_type(flask.session['foo'])
 
         with app.test_client() as c:
             with c.session_transaction() as sess: