diff --git a/setup.py b/setup.py index 8a11eb9..e8d6705 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,6 @@ def get_version(): platforms='any', install_requires=[ 'WTForms>=1.0.5', - 'six>=1.3.0' ], extras_require=extras_require, cmdclass={'test': PyTest}, @@ -75,8 +74,6 @@ def get_version(): 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', diff --git a/tests/test_field_type_coercion.py b/tests/test_field_type_coercion.py index 3223f40..17dc0c6 100644 --- a/tests/test_field_type_coercion.py +++ b/tests/test_field_type_coercion.py @@ -1,4 +1,4 @@ -import six # noqa +PY3 = True from pytest import mark from wtforms import Form, IntegerField, SelectMultipleField, StringField try: @@ -47,7 +47,7 @@ class FooForm(Form): ) -@mark.skipif('sa is None or six.PY3 or not HAS_SQLALCHEMY_SUPPORT') +@mark.skipif('sa is None or PY3 or not HAS_SQLALCHEMY_SUPPORT') class TestQuerySelectField(object): def setup_method(self, method): self.Base = declarative_base() diff --git a/wtforms_json/__init__.py b/wtforms_json/__init__.py index ec86397..a27be5e 100644 --- a/wtforms_json/__init__.py +++ b/wtforms_json/__init__.py @@ -3,7 +3,6 @@ except: from collections import Mapping, MutableMapping -import six from wtforms import Form try: from wtforms_sqlalchemy.fields import ( @@ -148,7 +147,7 @@ def is_optional(field): def is_required(field): return DataRequired in [v.__class__ for v in field.validators] - for name, f in six.iteritems(self._fields): + for name, f in self._fields.items(): if f.is_missing: if is_optional(f): continue @@ -206,7 +205,7 @@ def process(self, formdata, data=_unset_value, **kwargs): except TypeError: self.data = self.default else: - self.data = six.text_type(self.data) + self.data = str(self.data) return process @@ -267,7 +266,7 @@ def field_list_is_missing(self): def monkey_patch_process_formdata(func): def process_formdata(self, valuelist): - valuelist = list(map(six.text_type, valuelist)) + valuelist = list(map(str, valuelist)) return func(self, valuelist) return process_formdata