| Server IP : 82.208.35.60 / Your IP : 216.73.216.238 Web Server : Apache/2.4.55 (FreeBSD) OpenSSL/1.1.1q-freebsd PHP/7.3.31 System : FreeBSD server7.d2m.cz 12.4-RELEASE-p9 FreeBSD 12.4-RELEASE-p9 GENERIC amd64 User : studiokobylisy_cz ( 1008) PHP Version : 7.3.31 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : OFF | Perl : OFF | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /usr/ports/www/py-formencode/files/ |
Upload File : |
--- formencode/api.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/api.py
@@ -150,15 +150,15 @@ class Invalid(Exception):
val = self.msg
return val
- if unicode is not str: # Python 2
+ if str is not str: # Python 2
def __unicode__(self):
- if isinstance(self.msg, unicode):
+ if isinstance(self.msg, str):
return self.msg
elif isinstance(self.msg, str):
return self.msg.decode('utf8')
else:
- return unicode(self.msg)
+ return str(self.msg)
def unpack_errors(self, encode_variables=False, dict_char='.',
list_char='-'):
@@ -177,15 +177,15 @@ class Invalid(Exception):
for item in self.error_list]
if self.error_dict:
result = {}
- for name, item in self.error_dict.iteritems():
+ for name, item in self.error_dict.items():
result[name] = item if isinstance(
- item, basestring) else item.unpack_errors()
+ item, str) else item.unpack_errors()
if encode_variables:
from . import variabledecode
result = variabledecode.variable_encode(
result, add_repetitions=False,
dict_char=dict_char, list_char=list_char)
- for key in result.keys():
+ for key in list(result.keys()):
if not result[key]:
del result[key]
return result
@@ -245,8 +245,8 @@ class Validator(declarative.Declarative):
except AttributeError:
try:
if self.use_builtins_gettext:
- import __builtin__
- trans = __builtin__._
+ import builtins
+ trans = builtins._
else:
trans = _stdtrans
except AttributeError:
@@ -311,7 +311,7 @@ class Validator(declarative.Declarative):
"""
doc = cls.__doc__ or ''
doc = [textwrap.dedent(doc).rstrip()]
- messages = sorted(cls._messages.iteritems())
+ messages = sorted(cls._messages.items())
doc.append('\n\n**Messages**\n\n')
for name, default in messages:
default = re.sub(r'(%\(.*?\)[rsifcx])', r'``\1``', default)
@@ -456,7 +456,7 @@ class FancyValidator(Validator):
def to_python(self, value, state=None):
try:
- if self.strip and isinstance(value, basestring):
+ if self.strip and isinstance(value, str):
value = value.strip()
elif hasattr(value, 'mixed'):
# Support Paste's MultiDict
@@ -484,7 +484,7 @@ class FancyValidator(Validator):
def from_python(self, value, state=None):
try:
- if self.strip and isinstance(value, basestring):
+ if self.strip and isinstance(value, str):
value = value.strip()
if not self.accept_python:
if self.is_empty(value):
@@ -520,7 +520,7 @@ class FancyValidator(Validator):
return None
def assert_string(self, value, state):
- if not isinstance(value, basestring):
+ if not isinstance(value, str):
raise Invalid(self.message('badType', state,
type=type(value), value=value),
value, state)
--- formencode/compound.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/compound.py
@@ -39,7 +39,7 @@ class CompoundValidator(FancyValidator):
def __classinit__(cls, new_attrs):
FancyValidator.__classinit__(cls, new_attrs)
toAdd = []
- for name, value in new_attrs.iteritems():
+ for name, value in new_attrs.items():
if is_validator(value) and value is not Identity:
toAdd.append((name, value))
# @@: Should we really delete too?
@@ -200,7 +200,7 @@ class All(CompoundValidator):
filtering out None and trying to keep `All` validators from
being nested (which isn't needed).
"""
- validators = filter(lambda v: v and v is not Identity, validators)
+ validators = [v for v in validators if v and v is not Identity]
if not validators:
return Identity
if len(validators) == 1:
--- formencode/context.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/context.py
@@ -96,7 +96,7 @@ class Context(object):
"You can only write attribute on context object with the .set() method")
def set(self, **kw):
- state_id = _restore_ids.next()
+ state_id = next(_restore_ids)
try:
stack = self._local.stack
except AttributeError:
--- formencode/declarative.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/declarative.py
@@ -55,9 +55,9 @@ class _methodwrapper(object):
def __repr__(self):
if self.obj is None:
return ('<bound class method %s.%s>'
- % (self.cls.__name__, self.func.func_name))
+ % (self.cls.__name__, self.func.__name__))
return ('<bound method %s.%s of %r>'
- % (self.cls.__name__, self.func.func_name, self.obj))
+ % (self.cls.__name__, self.func.__name__, self.obj))
class DeclarativeMeta(type):
@@ -66,11 +66,11 @@ class DeclarativeMeta(type):
cls = type.__new__(meta, class_name, bases, new_attrs)
for name in cls.__mutableattributes__:
setattr(cls, name, copy.copy(getattr(cls, name)))
- cls.declarative_count = cls.counter.next()
+ cls.declarative_count = next(cls.counter)
if ('__classinit__' in new_attrs and not isinstance(cls.__classinit__,
(staticmethod, types.FunctionType))):
setattr(cls, '__classinit__',
- staticmethod(cls.__classinit__.im_func))
+ staticmethod(cls.__classinit__.__func__))
cls.__classinit__(cls, new_attrs)
names = getattr(cls, '__singletonmethods__', None)
if names:
@@ -97,14 +97,12 @@ class singletonmethod(object):
return types.MethodType(self.func, obj)
-class Declarative(object):
+class Declarative(object, metaclass=DeclarativeMeta):
__unpackargs__ = ()
__mutableattributes__ = ()
- __metaclass__ = DeclarativeMeta
-
__singletonmethods__ = ()
counter = count()
@@ -143,10 +141,10 @@ class Declarative(object):
for name in self.__mutableattributes__:
if name not in kw:
setattr(self, name, copy.copy(getattr(self, name)))
- for name, value in kw.iteritems():
+ for name, value in kw.items():
setattr(self, name, value)
if 'declarative_count' not in kw:
- self.declarative_count = self.counter.next()
+ self.declarative_count = next(self.counter)
self.__initargs__(kw)
def __initargs__(self, new_attrs):
@@ -179,7 +177,7 @@ class Declarative(object):
and self.__unpackargs__[1] in vals):
v = vals[self.__unpackargs__[1]]
if isinstance(v, (list, int)):
- args.extend(map(source.makeRepr, v))
+ args.extend(list(map(source.makeRepr, v)))
del v[self.__unpackargs__[1]]
for name in self.__unpackargs__:
if name in vals:
@@ -188,7 +186,7 @@ class Declarative(object):
else:
break
args.extend('%s=%s' % (name, source.makeRepr(value))
- for (name, value) in vals.iteritems())
+ for (name, value) in vals.items())
return '%s(%s)' % (self.__class__.__name__,
', '.join(args))
--- formencode/doctest_xml_compare.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/doctest_xml_compare.py
@@ -11,7 +11,7 @@ RealOutputChecker = doctest.OutputChecker
def debug(*msg):
import sys
- print >> sys.stderr, ' '.join(map(str, msg))
+ print(' '.join(map(str, msg)), file=sys.stderr)
class HTMLOutputChecker(RealOutputChecker):
@@ -69,7 +69,7 @@ def xml_compare(x1, x2, reporter=None):
if reporter:
reporter('Tags do not match: %s and %s' % (x1.tag, x2.tag))
return False
- for name, value in x1.attrib.iteritems():
+ for name, value in x1.attrib.items():
if x2.attrib.get(name) != value:
if reporter:
reporter('Attributes do not match: %s=%r, %s=%r'
@@ -120,7 +120,7 @@ def make_xml(s):
def make_string(xml):
- if isinstance(xml, basestring):
+ if isinstance(xml, str):
xml = make_xml(xml)
s = ET.tostring(xml)
if s == '<xml />':
--- formencode/foreach.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/foreach.py
@@ -83,7 +83,7 @@ class ForEach(CompoundValidator):
new_list = set(new_list)
return new_list
else:
- raise Invalid('Errors:\n%s' % '\n'.join(unicode(e)
+ raise Invalid('Errors:\n%s' % '\n'.join(str(e)
for e in errors if e), value, state, error_list=errors)
finally:
if state is not None:
@@ -125,7 +125,7 @@ class ForEach(CompoundValidator):
del _IfMissing
def _convert_to_list(self, value):
- if isinstance(value, basestring):
+ if isinstance(value, str):
return [value]
elif value is None:
return []
--- formencode/htmlfill.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/htmlfill.py
@@ -226,7 +226,7 @@ class FillingParser(RewritingParser):
self.in_select = None
self.skip_next = False
self.errors = errors or {}
- if isinstance(self.errors, basestring):
+ if isinstance(self.errors, str):
self.errors = {None: self.errors}
self.in_error = None
self.skip_error = False
@@ -253,14 +253,14 @@ class FillingParser(RewritingParser):
Compare the two objects as strings (coercing to strings if necessary).
Also uses encoding to compare the strings.
"""
- if not isinstance(str1, basestring):
+ if not isinstance(str1, str):
if hasattr(str1, '__unicode__'):
- str1 = unicode(str1)
+ str1 = str(str1)
else:
str1 = str(str1)
if type(str1) == type(str2):
return str1 == str2
- if isinstance(str1, unicode):
+ if isinstance(str1, str):
str1 = str1.encode(self.encoding or self.default_encoding)
else:
str2 = str2.encode(self.encoding or self.default_encoding)
@@ -274,7 +274,7 @@ class FillingParser(RewritingParser):
if key in unused_errors:
del unused_errors[key]
if self.auto_error_formatter:
- for key, value in unused_errors.iteritems():
+ for key, value in unused_errors.items():
error_message = self.auto_error_formatter(value)
error_message = '<!-- for: %s -->\n%s' % (key, error_message)
self.insert_at_marker(
@@ -297,7 +297,7 @@ class FillingParser(RewritingParser):
if self.encoding is not None:
new_content = []
for item in self._content:
- if (unicode is not str # Python 2
+ if (str is not str # Python 2
and isinstance(item, str)):
item = item.decode(self.encoding)
new_content.append(item)
@@ -390,11 +390,11 @@ class FillingParser(RewritingParser):
if self.prefix_error:
self.write_marker(name)
value = self.defaults.get(name)
- if (unicode is not str # Python 2
- and isinstance(name, unicode) and isinstance(value, str)):
+ if (str is not str # Python 2
+ and isinstance(name, str) and isinstance(value, str)):
value = value.decode(self.encoding or self.default_encoding)
if name in self.add_attributes:
- for attr_name, attr_value in self.add_attributes[name].iteritems():
+ for attr_name, attr_value in self.add_attributes[name].items():
if attr_name.startswith('+'):
attr_name = attr_name[1:]
self.set_attr(attrs, attr_name,
@@ -540,7 +540,7 @@ class FillingParser(RewritingParser):
"""
if obj is None:
return False
- if isinstance(obj, basestring):
+ if isinstance(obj, str):
return obj == value
if hasattr(obj, '__contains__'):
if value in obj:
--- formencode/htmlgen.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/htmlgen.py
@@ -90,12 +90,12 @@ class _HTML:
def quote(self, arg):
if arg is None:
return ''
- if unicode is not str: # Python 2
- arg = unicode(arg).encode(default_encoding)
+ if str is not str: # Python 2
+ arg = str(arg).encode(default_encoding)
return escape(arg, True)
def str(self, arg, encoding=None):
- if isinstance(arg, basestring):
+ if isinstance(arg, str):
if not isinstance(arg, str):
arg = arg.encode(default_encoding)
return arg
@@ -106,7 +106,7 @@ class _HTML:
elif isinstance(arg, Element):
return str(arg)
else:
- arg = unicode(arg)
+ arg = str(arg)
if not isinstance(arg, str): # Python 2
arg = arg.encode(default_encoding)
return arg
@@ -127,11 +127,11 @@ class Element(ET.Element
args = kw.pop('c')
if not isinstance(args, (list, tuple)):
args = (args,)
- for name, value in kw.items():
+ for name, value in list(kw.items()):
if value is None:
del kw[name]
continue
- kw[name] = unicode(value)
+ kw[name] = str(value)
if name.endswith('_'):
kw[name[:-1]] = value
del kw[name]
@@ -151,20 +151,20 @@ class Element(ET.Element
if not ET.iselement(arg):
if last is None:
if el.text is None:
- el.text = unicode(arg)
+ el.text = str(arg)
else:
- el.text += unicode(arg)
+ el.text += str(arg)
else:
if last.tail is None:
- last.tail = unicode(arg)
+ last.tail = str(arg)
else:
- last.tail += unicode(arg)
+ last.tail += str(arg)
else:
last = arg
el.append(last)
return el
- if unicode is str: # Python 3
+ if str is str: # Python 3
def __str__(self):
return ET.tostring(
--- formencode/national.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/national.py
@@ -53,7 +53,7 @@ if tgformat:
else:
d = dict(country_additions)
d.update(dict(c2))
- ret = d.items() + fuzzy_countrynames
+ ret = list(d.items()) + fuzzy_countrynames
return ret
def get_country(code):
@@ -65,7 +65,7 @@ if tgformat:
if len(c1) > len(c2):
d = dict(c1)
d.update(dict(c2))
- return d.items()
+ return list(d.items())
else:
return c2
@@ -154,7 +154,7 @@ class DelimitedDigitsPostalCode(Regex):
def __init__(self, partition_lengths, delimiter=None,
*args, **kw):
- if isinstance(partition_lengths, (int, long)):
+ if isinstance(partition_lengths, int):
partition_lengths = [partition_lengths]
if not delimiter:
delimiter = ''
@@ -675,7 +675,7 @@ class InternationalPhoneNumber(FancyValidator):
value = value.encode('ascii', 'strict')
except UnicodeEncodeError:
raise Invalid(self.message('phoneFormat', state), value, state)
- if unicode is str: # Python 3
+ if str is str: # Python 3
value = value.decode('ascii')
value = self._mark_chars_re.sub('-', value)
for f, t in [(' ', ' '),
@@ -765,7 +765,7 @@ class LanguageValidator(FancyValidator):
def validators():
"""Return the names of all validators in this module."""
- return [name for name, value in globals().items()
+ return [name for name, value in list(globals().items())
if isinstance(value, type) and issubclass(value, FancyValidator)]
__all__ = ['Invalid'] + validators()
--- formencode/rewritingparser.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/rewritingparser.py
@@ -1,5 +1,5 @@
-import HTMLParser
+import html.parser
import re
try:
@@ -7,7 +7,7 @@ try:
except ImportError: # Python < 3.2
from cgi import escape
-from htmlentitydefs import name2codepoint
+from html.entities import name2codepoint
def html_quote(v):
@@ -15,23 +15,23 @@ def html_quote(v):
return ''
if hasattr(v, '__html__'):
return v.__html__()
- if isinstance(v, basestring):
+ if isinstance(v, str):
return escape(v, True)
if hasattr(v, '__unicode__'):
- v = unicode(v)
+ v = str(v)
else:
v = str(v)
return escape(v, True)
-class RewritingParser(HTMLParser.HTMLParser):
+class RewritingParser(html.parser.HTMLParser):
listener = None
skip_next = False
def __init__(self):
self._content = []
- HTMLParser.HTMLParser.__init__(self)
+ html.parser.HTMLParser.__init__(self)
def feed(self, data):
self.data_is_str = isinstance(data, str)
@@ -40,7 +40,7 @@ class RewritingParser(HTMLParser.HTMLParser):
self.source_pos = 1, 0
if self.listener:
self.listener.reset()
- HTMLParser.HTMLParser.feed(self, data)
+ html.parser.HTMLParser.feed(self, data)
_entityref_re = re.compile('&([a-zA-Z][-.a-zA-Z\d]*);')
_charref_re = re.compile('&#(\d+|[xX][a-fA-F\d]+);')
@@ -56,7 +56,7 @@ class RewritingParser(HTMLParser.HTMLParser):
# If we don't recognize it, pass it through as though it
# wasn't an entity ref at all
return match.group(0)
- return unichr(name2codepoint[name])
+ return chr(name2codepoint[name])
def _sub_charref(self, match):
num = match.group(1)
@@ -64,7 +64,7 @@ class RewritingParser(HTMLParser.HTMLParser):
num = int(num[1:], 16)
else:
num = int(num)
- return unichr(num)
+ return chr(num)
def handle_misc(self, whatever):
self.write_pos()
--- formencode/schema.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/schema.py
@@ -81,7 +81,7 @@ class Schema(FancyValidator):
# Scan through the class variables we've defined *just*
# for this subclass, looking for validators (both classes
# and instances):
- for key, value in new_attrs.iteritems():
+ for key, value in new_attrs.items():
if key in ('pre_validators', 'chained_validators'):
if is_validator(value):
msg = "Any validator with the name %s will be ignored." % \
@@ -96,12 +96,12 @@ class Schema(FancyValidator):
elif key in cls.fields:
del cls.fields[key]
- for name, value in cls.fields.iteritems():
+ for name, value in cls.fields.items():
cls.add_field(name, value)
def __initargs__(self, new_attrs):
self.fields = self.fields.copy()
- for key, value in new_attrs.iteritems():
+ for key, value in new_attrs.items():
if key in ('pre_validators', 'chained_validators'):
if is_validator(value):
msg = "Any validator with the name %s will be ignored." % \
@@ -139,13 +139,13 @@ class Schema(FancyValidator):
new = {}
errors = {}
- unused = self.fields.keys()
+ unused = list(self.fields.keys())
if state is not None:
previous_key = getattr(state, 'key', None)
previous_full_dict = getattr(state, 'full_dict', None)
state.full_dict = value_dict
try:
- for name, value in value_dict.items():
+ for name, value in list(value_dict.items()):
try:
unused.remove(name)
except ValueError:
@@ -239,14 +239,14 @@ class Schema(FancyValidator):
self.assert_dict(value_dict, state)
new = {}
errors = {}
- unused = self.fields.keys()
+ unused = list(self.fields.keys())
if state is not None:
previous_key = getattr(state, 'key', None)
previous_full_dict = getattr(state, 'full_dict', None)
state.full_dict = value_dict
try:
__traceback_info__ = None
- for name, value in value_dict.iteritems():
+ for name, value in value_dict.items():
__traceback_info__ = 'for_python in %s' % name
try:
unused.remove(name)
@@ -327,7 +327,7 @@ class Schema(FancyValidator):
result = []
result.extend(self.pre_validators)
result.extend(self.chained_validators)
- result.extend(self.fields.itervalues())
+ result.extend(iter(self.fields.values()))
return result
def is_empty(self, value):
@@ -338,7 +338,7 @@ class Schema(FancyValidator):
return {}
def _value_is_iterator(self, value):
- if isinstance(value, basestring):
+ if isinstance(value, str):
return False
elif isinstance(value, (list, tuple)):
return True
@@ -361,16 +361,16 @@ def format_compound_error(v, indent=0):
# version if possible, and unicode() if necessary, because
# testing for the presence of a __unicode__ method isn't
# enough
- return unicode(v)
+ return str(v)
elif isinstance(v, dict):
return ('%s\n' % (' ' * indent)).join(
'%s: %s' % (k, format_compound_error(value, indent=len(k) + 2))
- for k, value in sorted(v.iteritems()) if value is not None)
+ for k, value in sorted(v.items()) if value is not None)
elif isinstance(v, list):
return ('%s\n' % (' ' * indent)).join(
'%s' % (format_compound_error(value, indent=indent))
for value in v if value is not None)
- elif isinstance(v, basestring):
+ elif isinstance(v, str):
return v
else:
assert False, "I didn't expect something like %s" % repr(v)
@@ -383,7 +383,7 @@ def merge_dicts(d1, d2):
def merge_values(v1, v2):
- if isinstance(v1, basestring) and isinstance(v2, basestring):
+ if isinstance(v1, str) and isinstance(v2, str):
return v1 + '\n' + v2
elif isinstance(v1, (list, tuple)) and isinstance(v2, (list, tuple)):
return merge_lists(v1, v2)
@@ -474,7 +474,7 @@ class SimpleFormValidator(FancyValidator):
errors = self.func(value_dict, state, self)
if not errors:
return value_dict
- if isinstance(errors, basestring):
+ if isinstance(errors, str):
raise Invalid(errors, value_dict, state)
elif isinstance(errors, dict):
raise Invalid(
--- formencode/tests/test_doctests.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/tests/test_doctests.py
@@ -27,7 +27,7 @@ base = os.path.dirname(os.path.dirname(os.path.dirname
os.path.abspath(__file__))))
-if unicode is str: # Python 3
+if str is str: # Python 3
OutputChecker = doctest.OutputChecker
--- formencode/tests/test_email.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/tests/test_email.py
@@ -15,7 +15,7 @@ class TestEmail(unittest.TestCase):
try:
return self.validator.to_python(*args)
except Invalid as e:
- return unicode(e)
+ return str(e)
def message(self, message_name, username, domain):
email = '@'.join((username, domain))
@@ -74,8 +74,8 @@ class TestUnicodeEmailWithResolveDomain(unittest.TestC
def test_unicode_ascii_subgroup(self):
self.assertEqual(self.validator.to_python(
- u'foo@yandex.com'), 'foo@yandex.com')
+ 'foo@yandex.com'), 'foo@yandex.com')
def test_cyrillic_email(self):
self.assertEqual(self.validator.to_python(
- u'me@письмо.рф'), u'me@письмо.рф')
+ 'me@письмо.рф'), 'me@письмо.рф')
--- formencode/tests/test_htmlfill.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/tests/test_htmlfill.py
@@ -10,7 +10,7 @@ try:
except AttributeError: # Python < 2.7
from xml.parsers.expat import ExpatError as XMLParseError
-from htmlentitydefs import name2codepoint
+from html.entities import name2codepoint
base_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(
os.path.abspath(__file__)))))
@@ -44,7 +44,7 @@ def run_filename(filename):
data_content = ''
namespace = {}
if data_content:
- exec data_content in namespace
+ exec(data_content, namespace)
data = namespace.copy()
data['defaults'] = data.get('defaults', {})
if 'check' in data:
@@ -52,7 +52,7 @@ def run_filename(filename):
else:
def checker(p, s):
pass
- for name in data.keys():
+ for name in list(data.keys()):
if name.startswith('_') or hasattr('__builtin__', name):
del data[name]
listener = htmlfill_schemabuilder.SchemaBuilder()
@@ -62,7 +62,7 @@ def run_filename(filename):
output = p.text()
def reporter(v):
- print v
+ print(v)
try:
output_xml = ET.XML(output)
@@ -72,10 +72,10 @@ def run_filename(filename):
else:
comp = xml_compare(output_xml, expected_xml, reporter)
if not comp:
- print '---- Output: ----'
- print output
- print '---- Expected: ----'
- print expected
+ print('---- Output: ----')
+ print(output)
+ print('---- Expected: ----')
+ print(expected)
assert False
checker(p, listener.schema())
checker(p, htmlfill_schemabuilder.parse_schema(template))
@@ -87,14 +87,14 @@ def test_no_trailing_newline():
def test_escape_defaults():
- rarr = unichr(name2codepoint['rarr'])
+ rarr = chr(name2codepoint['rarr'])
assert (htmlfill.render('<input type="submit" value="next>→">', {}, {})
== '<input type="submit" value="next>%s">' % rarr)
assert (htmlfill.render('<input type="submit" value="1&2">', {}, {})
== '<input type="submit" value="1&2">')
assert (htmlfill.render('<input type="submit" value="Japan - 日本 Nihon" />',
{}, {}) ==
- u'<input type="submit" value="Japan - 日本 Nihon" />')
+ '<input type="submit" value="Japan - 日本 Nihon" />')
def test_xhtml():
@@ -180,7 +180,7 @@ def test_checkbox():
def test_unicode():
- assert (htmlfill.render(u'<input type="checkbox" name="tags" value="2" />',
+ assert (htmlfill.render('<input type="checkbox" name="tags" value="2" />',
dict(tags=[])) ==
'<input type="checkbox" name="tags" value="2" />')
@@ -455,10 +455,10 @@ def test_error_class_textarea():
def test_mix_str_and_unicode():
html = '<input type="text" name="cheese">'
- uhtml = unicode(html)
+ uhtml = str(html)
cheese = dict(cheese='Käse')
- ucheese = dict(cheese=u'Käse')
- expected = u'<input type="text" name="cheese" value="Käse">'
+ ucheese = dict(cheese='Käse')
+ expected = '<input type="text" name="cheese" value="Käse">'
rendered = htmlfill.render(html, defaults=cheese, encoding='utf-8')
assert expected == rendered
rendered = htmlfill.render(html, defaults=ucheese, encoding='utf-8')
--- formencode/tests/test_htmlgen.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/tests/test_htmlgen.py
@@ -4,8 +4,8 @@ import doctest
from formencode.htmlgen import html
# A test value that can't be encoded as ascii:
-uni_value = u'\xff'
-str_value = uni_value if str is unicode else uni_value.encode('utf-8')
+uni_value = '\xff'
+str_value = uni_value if str is str else uni_value.encode('utf-8')
def test_basic():
@@ -37,7 +37,7 @@ def test_unicode():
assert False, (
"We need something that can't be ASCII-encoded: %r (%r)"
% (uni_value, uni_value.encode('ascii')))
- assert unicode(html.b(uni_value)) == u'<b>%s</b>' % uni_value
+ assert str(html.b(uni_value)) == '<b>%s</b>' % uni_value
def test_quote():
@@ -76,10 +76,10 @@ def test_namespace():
if __name__ == '__main__':
# It's like a super-mini py.test...
- for name, value in globals().iteritems():
+ for name, value in globals().items():
if name.startswith('test'):
- print name
+ print(name)
value()
from formencode import htmlgen
doctest.testmod(htmlgen)
- print 'doctest'
+ print('doctest')
--- formencode/tests/test_i18n.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/tests/test_i18n.py
@@ -8,15 +8,15 @@ ne = formencode.validators.NotEmpty()
def _test_builtins(func):
def dummy(s):
return "builtins dummy"
- import __builtin__
- __builtin__._ = dummy
+ import builtins
+ builtins._ = dummy
try:
ne.to_python("")
except formencode.api.Invalid as e:
func(e)
- del __builtin__._
+ del builtins._
def test_builtins():
@@ -52,90 +52,90 @@ def _test_lang(language, notemptytext):
try:
ne.to_python("")
except formencode.api.Invalid as e:
- assert unicode(e) == notemptytext
+ assert str(e) == notemptytext
formencode.api.set_stdtranslation() # set back to defaults
def test_de():
- _test_lang("de", u"Bitte einen Wert eingeben")
+ _test_lang("de", "Bitte einen Wert eingeben")
def test_es():
- _test_lang("es", u"Por favor introduzca un valor")
+ _test_lang("es", "Por favor introduzca un valor")
def test_pt_BR():
- _test_lang("pt_BR", u"Por favor digite um valor")
+ _test_lang("pt_BR", "Por favor digite um valor")
def test_zh_TW():
- _test_lang("zh_TW", u"請輸入值")
+ _test_lang("zh_TW", "請輸入值")
def test_sk():
- _test_lang("sk", u"Zadajte hodnotu, prosím")
+ _test_lang("sk", "Zadajte hodnotu, prosím")
def test_ru():
- _test_lang("ru", u"Необходимо ввести значение")
+ _test_lang("ru", "Необходимо ввести значение")
def test_sl():
- _test_lang("sl", u"Prosim, izpolnite polje")
+ _test_lang("sl", "Prosim, izpolnite polje")
def test_pt_PT():
- _test_lang("pt_PT", u"Por favor insira um valor")
+ _test_lang("pt_PT", "Por favor insira um valor")
def test_fr():
- _test_lang("fr", u"Saisissez une valeur")
+ _test_lang("fr", "Saisissez une valeur")
def test_nl():
- _test_lang("nl", u"Voer een waarde in")
+ _test_lang("nl", "Voer een waarde in")
def test_pl():
- _test_lang("pl", u"Proszę podać wartość")
+ _test_lang("pl", "Proszę podać wartość")
def test_el():
- _test_lang("el", u"Παρακαλούμε εισάγετε μια τιμή")
+ _test_lang("el", "Παρακαλούμε εισάγετε μια τιμή")
def test_zh_CN():
- _test_lang("zh_CN", u"请输入一个值")
+ _test_lang("zh_CN", "请输入一个值")
def test_cs():
- _test_lang("cs", u"Prosím zadejte hodnotu")
+ _test_lang("cs", "Prosím zadejte hodnotu")
def test_fi():
- _test_lang("fi", u"Anna arvo")
+ _test_lang("fi", "Anna arvo")
def test_nb_NO():
- _test_lang("nb_NO", u"Venligst fyll inn en verdi")
+ _test_lang("nb_NO", "Venligst fyll inn en verdi")
def test_it():
- _test_lang("it", u"Inserire un dato")
+ _test_lang("it", "Inserire un dato")
def test_et():
- _test_lang("et", u"Palun sisestada väärtus")
+ _test_lang("et", "Palun sisestada väärtus")
def test_lt():
- _test_lang("lt", u"Prašome įvesti reikšmę")
+ _test_lang("lt", "Prašome įvesti reikšmę")
def test_ja():
- _test_lang("ja", u"入力してください")
+ _test_lang("ja", "入力してください")
def test_tr():
- _test_lang("tr", u"Lütfen bir değer giriniz")
+ _test_lang("tr", "Lütfen bir değer giriniz")
--- formencode/tests/test_schema.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/tests/test_schema.py
@@ -1,6 +1,6 @@
import unittest
-from urlparse import parse_qsl
+from urllib.parse import parse_qsl
from formencode import Invalid, Validator, compound, foreach, validators
from formencode.schema import Schema, merge_dicts, SimpleFormValidator
@@ -14,14 +14,14 @@ def _notranslation(s):
def setup_module(module):
"""Disable i18n translation"""
- import __builtin__
- __builtin__._ = _notranslation
+ import builtins
+ builtins._ = _notranslation
def teardown_module(module):
"""Remove translation function"""
- import __builtin__
- del __builtin__._
+ import builtins
+ del builtins._
def d(**kw):
@@ -56,9 +56,9 @@ class DecodeCase(object):
all_cases.append(self)
def test(self):
- print 'input', repr(self.input)
+ print('input', repr(self.input))
actual = self.schema.to_python(self.input)
- print 'output', repr(actual)
+ print('output', repr(actual))
assert actual == self.output
@@ -72,9 +72,9 @@ class BadCase(DecodeCase):
self.output = self.output['text']
def test(self):
- print repr(self.raw_input)
+ print(repr(self.raw_input))
try:
- print repr(self.schema.to_python(self.input))
+ print(repr(self.schema.to_python(self.input)))
except Invalid as e:
actual = e.unpack_errors()
assert actual == self.output
--- formencode/tests/test_validators.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/tests/test_validators.py
@@ -49,7 +49,7 @@ class TestByteStringValidator(unittest.TestCase):
self.messages = self.validator.message
def test_alias(self):
- if str is not unicode: # Python 2
+ if str is not str: # Python 2
self.assertTrue(self.validator is validators.String)
def test_docstring(self):
@@ -87,7 +87,7 @@ class TestUnicodeStringValidator(unittest.TestCase):
self.validator = validators.UnicodeString
def test_alias(self):
- if str is unicode: # Python 3
+ if str is str: # Python 3
self.assertTrue(self.validator is validators.String)
def test_docstring(self):
@@ -96,47 +96,47 @@ class TestUnicodeStringValidator(unittest.TestCase):
def test_unicode(self):
un = self.validator()
- self.assertEqual(un.to_python(12), u'12')
- self.assertTrue(type(un.to_python(12)) is unicode)
- self.assertEqual(un.from_python(12), u'12'.encode('ascii'))
+ self.assertEqual(un.to_python(12), '12')
+ self.assertTrue(type(un.to_python(12)) is str)
+ self.assertEqual(un.from_python(12), '12'.encode('ascii'))
self.assertTrue(type(un.from_python(12)) is bytes)
def test_unicode_encoding(self):
uv = self.validator()
- us = u'käse'
+ us = 'käse'
u7s, u8s = us.encode('utf-7'), us.encode('utf-8')
self.assertEqual(uv.to_python(u8s), us)
- self.assertTrue(type(uv.to_python(u8s)) is unicode)
+ self.assertTrue(type(uv.to_python(u8s)) is str)
self.assertEqual(uv.from_python(us), u8s)
self.assertTrue(type(uv.from_python(us)) is bytes)
uv = self.validator(encoding='utf-7')
self.assertEqual(uv.to_python(u7s), us)
- self.assertTrue(type(uv.to_python(u7s)) is unicode)
+ self.assertTrue(type(uv.to_python(u7s)) is str)
self.assertEqual(uv.from_python(us), u7s)
self.assertTrue(type(uv.from_python(us)) is bytes)
uv = self.validator(inputEncoding='utf-7')
self.assertEqual(uv.to_python(u7s), us)
- self.assertTrue(type(uv.to_python(u7s)) is unicode)
+ self.assertTrue(type(uv.to_python(u7s)) is str)
uv = self.validator(outputEncoding='utf-7')
self.assertEqual(uv.from_python(us), u7s)
self.assertTrue(type(uv.from_python(us)) is bytes)
uv = self.validator(inputEncoding=None)
self.assertEqual(uv.to_python(us), us)
- self.assertTrue(type(uv.to_python(us)) is unicode)
+ self.assertTrue(type(uv.to_python(us)) is str)
self.assertEqual(uv.from_python(us), u8s)
self.assertTrue(type(uv.from_python(us)) is bytes)
uv = self.validator(outputEncoding=None)
self.assertEqual(uv.to_python(u8s), us)
- self.assertTrue(type(uv.to_python(u8s)) is unicode)
+ self.assertTrue(type(uv.to_python(u8s)) is str)
self.assertEqual(uv.from_python(us), us)
- self.assertTrue(type(uv.from_python(us)) is unicode)
+ self.assertTrue(type(uv.from_python(us)) is str)
def test_unicode_empty(self):
iv = self.validator()
- for value in [None, "", u""]:
+ for value in [None, "", ""]:
result = iv.to_python(value)
- self.assertEqual(result, u"")
- self.assertTrue(isinstance(result, unicode))
+ self.assertEqual(result, "")
+ self.assertTrue(isinstance(result, str))
class TestIntValidator(unittest.TestCase):
@@ -437,7 +437,7 @@ class TestForEachValidator(unittest.TestCase):
values = validator.to_python(start_values, state)
except Invalid as e:
self.assertEqual(e.unpack_errors(),
- {'people': u'Please add a person'})
+ {'people': 'Please add a person'})
else:
raise Exception("Shouldn't be valid data", values, start_values)
@@ -534,8 +534,8 @@ class TestINameValidator(unittest.TestCase):
def test_non_english_inames(self):
"""i-names with non-English characters are valid"""
- self.validator.to_python(u'=Gustavo.Narea.García')
- self.validator.to_python(u'@名前.例')
+ self.validator.to_python('=Gustavo.Narea.García')
+ self.validator.to_python('@名前.例')
def test_inames_plus_paths(self):
"""i-names with paths are valid but not supported"""
@@ -544,9 +544,9 @@ class TestINameValidator(unittest.TestCase):
def test_communities(self):
"""i-names may have so-called 'communities'"""
- self.validator.to_python(u'=María*Yolanda*Liliana*Gustavo')
- self.validator.to_python(u'=Gustavo*Andreina')
- self.validator.to_python(u'@IBM*Lenovo')
+ self.validator.to_python('=María*Yolanda*Liliana*Gustavo')
+ self.validator.to_python('=Gustavo*Andreina')
+ self.validator.to_python('@IBM*Lenovo')
class TestINumberValidator(unittest.TestCase):
@@ -619,8 +619,8 @@ class TestOneOfValidator(unittest.TestCase):
'Value must be one of: ``%(items)s`` (not ``%(value)r``)' in doc)
def test_unicode_list(self):
- o = validators.OneOf([u'ö', u'a'])
- self.assertRaises(Invalid, o.to_python, u"ä")
+ o = validators.OneOf(['ö', 'a'])
+ self.assertRaises(Invalid, o.to_python, "ä")
def test_ascii_list(self):
o = validators.OneOf(['a', 'b'])
@@ -718,7 +718,7 @@ class TestRequireIfMissingValidator(unittest.TestCase)
v = self.validator('phone_type', missing='mail')
self.assertEqual(
validate(v, dict(phone_type='')),
- dict(phone_type=u'Please enter a value'))
+ dict(phone_type='Please enter a value'))
self.assertEqual(
validate(v, dict(phone_type='', mail='foo@bar.org')),
dict(phone_type='', mail='foo@bar.org'))
@@ -727,7 +727,7 @@ class TestRequireIfMissingValidator(unittest.TestCase)
v = self.validator('phone_type', present='phone')
self.assertEqual(
validate(v, dict(phone_type='', phone='510 420 4577')),
- dict(phone_type=u'Please enter a value'))
+ dict(phone_type='Please enter a value'))
self.assertEqual(
validate(v, dict(phone='')), dict(phone=''))
@@ -735,7 +735,7 @@ class TestRequireIfMissingValidator(unittest.TestCase)
v = self.validator('operator', present='operand')
self.assertEqual(
validate(v, dict(operator='', operand=0)),
- dict(operator=u'Please enter a value'))
+ dict(operator='Please enter a value'))
class TestRequireIfMatchingValidator(unittest.TestCase):
@@ -753,14 +753,14 @@ class TestRequireIfMatchingValidator(unittest.TestCase
v = self.validator('phone_type', 'mobile', required_fields=['mobile'])
self.assertEqual(
validate(v, dict(phone_type='mobile')),
- dict(mobile=u'Please enter a value')
+ dict(mobile='Please enter a value')
)
def test_matching_multiple_required(self):
v = self.validator('phone_type', 'mobile', required_fields=['mobile', 'code'])
self.assertEqual(
validate(v, dict(phone_type='mobile')),
- dict(mobile=u'Please enter a value')
+ dict(mobile='Please enter a value')
)
def test_not_matching(self):
--- formencode/validators.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/validators.py
@@ -513,13 +513,13 @@ class Regex(FancyValidator):
def __init__(self, *args, **kw):
FancyValidator.__init__(self, *args, **kw)
- if isinstance(self.regex, basestring):
+ if isinstance(self.regex, str):
ops = 0
- assert not isinstance(self.regexOps, basestring), (
+ assert not isinstance(self.regexOps, str), (
"regexOps should be a list of options from the re module "
"(names, or actual values)")
for op in self.regexOps:
- if isinstance(op, basestring):
+ if isinstance(op, str):
ops |= getattr(re, op)
else:
ops |= op
@@ -527,13 +527,13 @@ class Regex(FancyValidator):
def _validate_python(self, value, state):
self.assert_string(value, state)
- if self.strip and isinstance(value, basestring):
+ if self.strip and isinstance(value, str):
value = value.strip()
if not self.regex.search(value):
raise Invalid(self.message('invalid', state), value, state)
def _convert_to_python(self, value, state):
- if self.strip and isinstance(value, basestring):
+ if self.strip and isinstance(value, str):
return value.strip()
return value
@@ -615,7 +615,7 @@ class OneOf(FancyValidator):
try:
items = '; '.join(map(str, self.list))
except UnicodeError:
- items = '; '.join(map(unicode, self.list))
+ items = '; '.join(map(str, self.list))
raise Invalid(
self.message('notIn', state,
items=items, value=value), value, state)
@@ -690,13 +690,13 @@ class DictConverter(FancyValidator):
state, items=items), value, state)
def _convert_from_python(self, value, state):
- for k, v in self.dict.iteritems():
+ for k, v in self.dict.items():
if value == v:
return k
if self.hideDict:
raise Invalid(self.message('valueNotFound', state), value, state)
else:
- items = '; '.join(map(repr, self.dict.itervalues()))
+ items = '; '.join(map(repr, iter(self.dict.values())))
raise Invalid(
self.message('chooseValue', state,
value=repr(value), items=items), value, state)
@@ -812,8 +812,8 @@ class DateValidator(FancyValidator):
def _validate_python(self, value, state):
date_format = self.message('date_format', state)
- if (str is not unicode # Python 2
- and isinstance(date_format, unicode)):
+ if (str is not str # Python 2
+ and isinstance(date_format, str)):
# strftime uses the locale encoding, not Unicode
encoding = locale.getlocale(locale.LC_TIME)[1] or 'utf-8'
date_format = date_format.encode(encoding)
@@ -1061,27 +1061,27 @@ class ByteString(FancyValidator):
def _convert_to_python(self, value, state):
if value is None:
value = ''
- elif not isinstance(value, basestring):
+ elif not isinstance(value, str):
try:
value = bytes(value)
except UnicodeEncodeError:
- value = unicode(value)
- if self.encoding is not None and isinstance(value, unicode):
+ value = str(value)
+ if self.encoding is not None and isinstance(value, str):
value = value.encode(self.encoding)
return value
def _convert_from_python(self, value, state):
if value is None:
value = ''
- elif not isinstance(value, basestring):
+ elif not isinstance(value, str):
if isinstance(value, (list, tuple)):
value = self.list_joiner.join(
self._convert_from_python(v, state) for v in value)
try:
value = str(value)
except UnicodeEncodeError:
- value = unicode(value)
- if self.encoding is not None and isinstance(value, unicode):
+ value = str(value)
+ if self.encoding is not None and isinstance(value, str):
value = value.encode(self.encoding)
if self.strip:
value = value.strip()
@@ -1092,11 +1092,11 @@ class ByteString(FancyValidator):
return
if value is None:
value = ''
- elif not isinstance(value, basestring):
+ elif not isinstance(value, str):
try:
value = str(value)
except UnicodeEncodeError:
- value = unicode(value)
+ value = str(value)
if self.max is not None and len(value) > self.max:
raise Invalid(
self.message('tooLong', state, max=self.max), value, state)
@@ -1148,19 +1148,19 @@ class UnicodeString(ByteString):
def _convert_to_python(self, value, state):
if not value:
- return u''
- if isinstance(value, unicode):
+ return ''
+ if isinstance(value, str):
return value
- if not isinstance(value, unicode):
+ if not isinstance(value, str):
if hasattr(value, '__unicode__'):
- value = unicode(value)
+ value = str(value)
return value
- if not (unicode is str # Python 3
+ if not (str is str # Python 3
and isinstance(value, bytes) and self.inputEncoding):
value = str(value)
- if self.inputEncoding and not isinstance(value, unicode):
+ if self.inputEncoding and not isinstance(value, str):
try:
- value = unicode(value, self.inputEncoding)
+ value = str(value, self.inputEncoding)
except UnicodeDecodeError:
raise Invalid(self.message('badEncoding', state), value, state)
except TypeError:
@@ -1170,22 +1170,22 @@ class UnicodeString(ByteString):
return value
def _convert_from_python(self, value, state):
- if not isinstance(value, unicode):
+ if not isinstance(value, str):
if hasattr(value, '__unicode__'):
- value = unicode(value)
+ value = str(value)
else:
value = str(value)
- if self.outputEncoding and isinstance(value, unicode):
+ if self.outputEncoding and isinstance(value, str):
value = value.encode(self.outputEncoding)
return value
def empty_value(self, value):
- return u''
+ return ''
# Provide proper alias for native strings
-String = UnicodeString if str is unicode else ByteString
+String = UnicodeString if str is str else ByteString
class Set(FancyValidator):
@@ -1353,7 +1353,7 @@ class Email(FancyValidator):
value, state)
try:
idna_domain = [idna.ToASCII(p) for p in domain.split('.')]
- if unicode is str: # Python 3
+ if str is str: # Python 3
idna_domain = [p.decode('ascii') for p in idna_domain]
idna_domain = '.'.join(idna_domain)
except UnicodeError:
@@ -1456,13 +1456,13 @@ class URL(FancyValidator):
You may set allow_idna to False to change this behavior::
>>> URL(allow_idna=True).to_python(
- ... u'http://\u0433\u0443\u0433\u043b.\u0440\u0444')
+ ... u'http://\\u0433\\u0443\\u0433\\u043b.\\u0440\\u0444')
'http://xn--c1aay4a.xn--p1ai'
>>> URL(allow_idna=True, add_http=True).to_python(
- ... u'\u0433\u0443\u0433\u043b.\u0440\u0444')
+ ... u'\\u0433\\u0443\\u0433\\u043b.\\u0440\\u0444')
'http://xn--c1aay4a.xn--p1ai'
>>> URL(allow_idna=False).to_python(
- ... u'http://\u0433\u0443\u0433\u043b.\u0440\u0444')
+ ... u'http://\\u0433\\u0443\\u0433\\u043b.\\u0440\\u0444')
Traceback (most recent call last):
...
Invalid: That is not a valid URL
@@ -1526,17 +1526,17 @@ class URL(FancyValidator):
def _encode_idna(self, url):
global urlparse
if urlparse is None:
- import urlparse
+ import urllib.parse
try:
- scheme, netloc, path, params, query, fragment = urlparse.urlparse(
+ scheme, netloc, path, params, query, fragment = urllib.parse.urlparse(
url)
except ValueError:
return url
try:
netloc = netloc.encode('idna')
- if unicode is str: # Python 3
+ if str is str: # Python 3
netloc = netloc.decode('ascii')
- return str(urlparse.urlunparse((scheme, netloc,
+ return str(urllib.parse.urlunparse((scheme, netloc,
path, params, query, fragment)))
except UnicodeError:
return url
@@ -1544,17 +1544,17 @@ class URL(FancyValidator):
def _check_url_exists(self, url, state):
global httplib, urlparse, socket
if httplib is None:
- import httplib
+ import http.client
if urlparse is None:
- import urlparse
+ import urllib.parse
if socket is None:
import socket
- scheme, netloc, path, params, query, fragment = urlparse.urlparse(
+ scheme, netloc, path, params, query, fragment = urllib.parse.urlparse(
url, 'http')
if scheme == 'https':
- ConnClass = httplib.HTTPSConnection
+ ConnClass = http.client.HTTPSConnection
else:
- ConnClass = httplib.HTTPConnection
+ ConnClass = http.client.HTTPConnection
try:
conn = ConnClass(netloc)
if params:
@@ -1563,7 +1563,7 @@ class URL(FancyValidator):
path += '?' + query
conn.request('HEAD', path)
res = conn.getresponse()
- except httplib.HTTPException as e:
+ except http.client.HTTPException as e:
raise Invalid(
self.message('httpError', state, error=e), state, url)
except socket.error as e:
@@ -1688,7 +1688,7 @@ class XRI(FancyValidator):
is not valid.
"""
- if not isinstance(value, basestring):
+ if not isinstance(value, str):
raise Invalid(
self.message('badType', state,
type=str(type(value)), value=value), value, state)
@@ -1868,7 +1868,7 @@ class FileUploadKeeper(FancyValidator):
if isinstance(upload, cgi.FieldStorage):
filename = upload.filename
content = upload.value
- elif isinstance(upload, basestring) and upload:
+ elif isinstance(upload, str) and upload:
filename = None
# @@: Should this encode upload if it is unicode?
content = upload
@@ -2285,7 +2285,7 @@ class TimeConverter(FancyValidator):
return (hour, minute, second)
def _convert_from_python(self, value, state):
- if isinstance(value, basestring):
+ if isinstance(value, str):
return value
if hasattr(value, 'hour'):
hour, minute = value.hour, value.minute
@@ -2383,7 +2383,7 @@ class StringBool(FancyValidator): # originally from T
string=_('Value should be %(true)r or %(false)r'))
def _convert_to_python(self, value, state):
- if isinstance(value, basestring):
+ if isinstance(value, str):
value = value.strip().lower()
if value in self.true_values:
return True
@@ -2453,7 +2453,7 @@ class SignedString(FancyValidator):
if not random:
import random
return ''.join(chr(random.randrange(256))
- for _i in xrange(self.nonce_length))
+ for _i in range(self.nonce_length))
class IPAddress(FancyValidator):
@@ -2811,7 +2811,7 @@ class FieldsMatch(FormValidator):
else:
errors[name] = self.message('invalidNoMatch', state)
if errors:
- error_list = sorted(errors.iteritems())
+ error_list = sorted(errors.items())
error_message = '<br>\n'.join(
'%s: %s' % (name, value) for name, value in error_list)
raise Invalid(error_message, field_dict, state, error_dict=errors)
@@ -2870,7 +2870,7 @@ class CreditCardValidator(FormValidator):
def _validate_python(self, field_dict, state):
errors = self._validateReturn(field_dict, state)
if errors:
- error_list = sorted(errors.iteritems())
+ error_list = sorted(errors.items())
raise Invalid(
'<br>\n'.join('%s: %s' % (name, value)
for name, value in error_list),
@@ -2887,7 +2887,7 @@ class CreditCardValidator(FormValidator):
number = number.replace(' ', '')
number = number.replace('-', '')
try:
- long(number)
+ int(number)
except ValueError:
return {self.cc_number_field: self.message('notANumber', state)}
assert ccType in self._cardInfo, (
@@ -2985,7 +2985,7 @@ class CreditCardExpires(FormValidator):
def _validate_python(self, field_dict, state):
errors = self._validateReturn(field_dict, state)
if errors:
- error_list = sorted(errors.iteritems())
+ error_list = sorted(errors.items())
raise Invalid(
'<br>\n'.join('%s: %s' % (name, value)
for name, value in error_list),
@@ -3059,7 +3059,7 @@ class CreditCardSecurityCode(FormValidator):
def _validate_python(self, field_dict, state):
errors = self._validateReturn(field_dict, state)
if errors:
- error_list = sorted(errors.iteritems())
+ error_list = sorted(errors.items())
raise Invalid(
'<br>\n'.join('%s: %s' % (name, value)
for name, value in error_list),
@@ -3082,7 +3082,7 @@ class CreditCardSecurityCode(FormValidator):
def validators():
"""Return the names of all validators in this module."""
- return [name for name, value in globals().iteritems()
+ return [name for name, value in globals().items()
if isinstance(value, type) and issubclass(value, Validator)]
__all__ = ['Invalid'] + validators()
--- formencode/variabledecode.py.orig 2022-03-04 13:31:11 UTC
+++ formencode/variabledecode.py
@@ -32,7 +32,7 @@ def variable_decode(d, dict_char='.', list_char='-'):
result = {}
dicts_to_sort = set()
known_lengths = {}
- for key, value in d.iteritems():
+ for key, value in d.items():
keys = key.split(dict_char)
new_keys = []
was_repetition_count = False
@@ -94,10 +94,10 @@ def variable_decode(d, dict_char='.', list_char='-'):
to_sort = to_sort[sub_key]
if None in to_sort:
noneVals = [(0, x) for x in to_sort.pop(None)]
- noneVals.extend(to_sort.iteritems())
+ noneVals.extend(iter(to_sort.items()))
to_sort = noneVals
else:
- to_sort = to_sort.iteritems()
+ to_sort = iter(to_sort.items())
to_sort = [x[1] for x in sorted(to_sort)]
if key in known_lengths:
if len(to_sort) < known_lengths[key]:
@@ -115,7 +115,7 @@ def variable_encode(d, prepend='', result=None, add_re
if result is None:
result = {}
if isinstance(d, dict):
- for key, value in d.iteritems():
+ for key, value in d.items():
if key is None:
name = prepend
elif not prepend:
--- setup.py.orig 2022-03-04 13:31:11 UTC
+++ setup.py
@@ -45,6 +45,4 @@ setup(name='FormEncode',
test_suite='formencode.tests',
tests_require=tests_require,
extras_require={'testing': tests_require},
- use_2to3=True,
- convert_2to3_doctests=doctests,
)