Skip to content

drop Python2 support #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
a-detiste wants to merge 1 commit into
base: master
Choose a base branch
from
Open

drop Python2 support #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand All @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions tests/test_field_type_coercion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import six # noqa
PY3 = True
from pytest import mark
from wtforms import Form, IntegerField, SelectMultipleField, StringField
try:
Expand Down Expand Up @@ -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()
Expand Down
7 changes: 3 additions & 4 deletions wtforms_json/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
except:
from collections import Mapping, MutableMapping

import six
from wtforms import Form
try:
from wtforms_sqlalchemy.fields import (
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down