From 0d95a40fa7ac86d9e0bd4bd54693b42d25f5c0a5 Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 19:24:54 -0700 Subject: [PATCH 01/10] improve cmp function, add unittest --- src/past/builtins/misc.py | 63 ++++++++++- tests/test_past/test_misc.py | 39 +++++++ tests/test_past/test_values.py | 201 +++++++++++++++++++++++++++++++++ 3 files changed, 302 insertions(+), 1 deletion(-) create mode 100644 tests/test_past/test_misc.py create mode 100644 tests/test_past/test_values.py diff --git a/src/past/builtins/misc.py b/src/past/builtins/misc.py index ba50aa9e..889e0ff8 100644 --- a/src/past/builtins/misc.py +++ b/src/past/builtins/misc.py @@ -1,6 +1,8 @@ from __future__ import unicode_literals import inspect +import math +import numbers from future.utils import PY2, PY3, exec_ @@ -29,8 +31,67 @@ def cmp(x, y): cmp(x, y) -> integer Return negative if xy. + Python2 had looser comparison allowing cmp None and non Numerical types and collections. + Try to match the old behavior """ - return (x > y) - (x < y) + if isinstance(x, set) and isinstance(y, set): + raise TypeError('cannot compare sets using cmp()',) + try: + if isinstance(x, numbers.Number) and math.isnan(x): + if not isinstance(y, numbers.Number): + raise TypeError(f'cannot compare float("nan"), {type(y)} with cmp') + if isinstance(y, int): + return 1 + else: + return -1 + if isinstance(y, numbers.Number) and math.isnan(y): + if not isinstance(x, numbers.Number): + raise TypeError(f'cannot compare {type(x)}, float("nan") with cmp') + if isinstance(x, int): + return -1 + else: + return 1 + return (x > y) - (x < y) + except TypeError: + if x == y: + return 0 + type_order = [ + type(None), + numbers.Number, + dict, list, + set, + (str, bytes), + ] + x_type_index = y_type_index = None + for i, type_match in enumerate(type_order): + if isinstance(x, type_match): + x_type_index = i + if isinstance(y, type_match): + y_type_index = i + if cmp(x_type_index, y_type_index) == 0: + if isinstance(x, bytes) and isinstance(y, str): + return cmp(x.decode('ascii'), y) + if isinstance(y, bytes) and isinstance(x, str): + return cmp(x, y.decode('ascii')) + elif isinstance(x, list): + # if both arguments are lists take the comparison of the first non equal value + for x_elem, y_elem in zip(x, y): + elem_cmp_val = cmp(x_elem, y_elem) + if elem_cmp_val != 0: + return elem_cmp_val + # if all elements are equal, return equal/0 + return 0 + elif isinstance(x, dict): + if len(x) != len(y): + return cmp(len(x), len(y)) + else: + x_key = min(a for a in x if a not in y or x[a] != y[a]) + y_key = min(b for b in y if b not in x or x[b] != y[b]) + if x_key != y_key: + return cmp(x_key, y_key) + else: + return cmp(x[x_key], y[y_key]) + return cmp(x_type_index, y_type_index) from sys import intern diff --git a/tests/test_past/test_misc.py b/tests/test_past/test_misc.py new file mode 100644 index 00000000..3d1b7a09 --- /dev/null +++ b/tests/test_past/test_misc.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +""" +Tests for the resurrected Py2-like cmp funtion +""" + +from __future__ import absolute_import, unicode_literals, print_function + +import os.path +import sys +import traceback + +from future.tests.base import unittest +from past.builtins import cmp + +_dir = os.path.dirname(os.path.abspath(__file__)) +sys.path.append(_dir) +import test_values + + +class TestCmp(unittest.TestCase): + def test_cmp(self): + for x, y, cmp_python2_value in test_values.cmp_python2_value: + with self.subTest(x=x, y=y): + try: + past_cmp_value = cmp(x, y) + except Exception as ex: + past_cmp_value = traceback.format_exc().strip().split('\n')[-1] + + self.assertEqual(cmp_python2_value, past_cmp_value, + "expected result matching python2 __builtins__.cmp({x!r},{y!r}) " + "== {cmp_python2_value} " + "got past.builtins.cmp({x!r},{y!r}) " + "== {past_cmp_value} " + "".format(x=x, y=y, past_cmp_value=past_cmp_value, + cmp_python2_value=cmp_python2_value)) + + +if __name__ == '__main__': + unittest.main() diff --git a/tests/test_past/test_values.py b/tests/test_past/test_values.py new file mode 100644 index 00000000..393ad761 --- /dev/null +++ b/tests/test_past/test_values.py @@ -0,0 +1,201 @@ +from math import pi + +inf, nan = float('inf'), float('nan') +test_values = [ + 0, 1, 2, -1, -9999999999, 9999999, + 0.0, inf, nan, pi, + # [], [[]], [1,2,3], + set(), set([1, 2, 3]), + " ", "", "1", "dsada saA.", "2", "dsa", b"", b"dsa", b" ", + {5: 3}, dict(), dict(a=99), dict(a=1, b=2, c=3), None +] + +# cmp_python2_values are pre-calculated from running cmp under python2 first values are x and y, last is results of cmp +cmp_python2_value = [[0, 1, -1], [0, 2, -1], [0, -1, 1], [0, -9999999999999999, 1], [0, 9999999999999999, -1], + [0, 0.0, 0], [0, inf, -1], [0, nan, -1], [0, 3.141592653589793, -1], [0, '', -1], [0, ' ', -1], + [0, '1', -1], [0, 'a bee cd.', -1], [0, '', -1], [0, ' ', -1], [0, '1', -1], [0, 'a bee cd.', -1], + [0, set([]), -1], [0, set([1, 2, 3]), -1], [0, {5: 3}, -1], [0, {}, -1], [0, {'a': 99}, -1], + [0, {'a': 1, 'c': 3, 'b': 2}, -1], [0, {'a': 99, 'c': 3, 'b': 5}, -1], [0, None, 1], [1, 0, 1], + [1, 2, -1], [1, -1, 1], [1, -9999999999999999, 1], [1, 9999999999999999, -1], [1, 0.0, 1], + [1, inf, -1], [1, nan, -1], [1, 3.141592653589793, -1], [1, '', -1], [1, ' ', -1], [1, '1', -1], + [1, 'a bee cd.', -1], [1, '', -1], [1, ' ', -1], [1, '1', -1], [1, 'a bee cd.', -1], + [1, set([]), -1], [1, set([1, 2, 3]), -1], [1, {5: 3}, -1], [1, {}, -1], [1, {'a': 99}, -1], + [1, {'a': 1, 'c': 3, 'b': 2}, -1], [1, {'a': 99, 'c': 3, 'b': 5}, -1], [1, None, 1], [2, 0, 1], + [2, 1, 1], [2, -1, 1], [2, -9999999999999999, 1], [2, 9999999999999999, -1], [2, 0.0, 1], + [2, inf, -1], [2, nan, -1], [2, 3.141592653589793, -1], [2, '', -1], [2, ' ', -1], [2, '1', -1], + [2, 'a bee cd.', -1], [2, '', -1], [2, ' ', -1], [2, '1', -1], [2, 'a bee cd.', -1], + [2, set([]), -1], [2, set([1, 2, 3]), -1], [2, {5: 3}, -1], [2, {}, -1], [2, {'a': 99}, -1], + [2, {'a': 1, 'c': 3, 'b': 2}, -1], [2, {'a': 99, 'c': 3, 'b': 5}, -1], [2, None, 1], [-1, 0, -1], + [-1, 1, -1], [-1, 2, -1], [-1, -9999999999999999, 1], [-1, 9999999999999999, -1], [-1, 0.0, -1], + [-1, inf, -1], [-1, nan, -1], [-1, 3.141592653589793, -1], [-1, '', -1], [-1, ' ', -1], + [-1, '1', -1], [-1, 'a bee cd.', -1], [-1, '', -1], [-1, ' ', -1], [-1, '1', -1], + [-1, 'a bee cd.', -1], [-1, set([]), -1], [-1, set([1, 2, 3]), -1], [-1, {5: 3}, -1], [-1, {}, -1], + [-1, {'a': 99}, -1], [-1, {'a': 1, 'c': 3, 'b': 2}, -1], [-1, {'a': 99, 'c': 3, 'b': 5}, -1], + [-1, None, 1], [-9999999999999999, 0, -1], [-9999999999999999, 1, -1], + [-9999999999999999, 2, -1], [-9999999999999999, -1, -1], + [-9999999999999999, 9999999999999999, -1], [-9999999999999999, 0.0, -1], + [-9999999999999999, inf, -1], [-9999999999999999, nan, -1], + [-9999999999999999, 3.141592653589793, -1], [-9999999999999999, '', -1], + [-9999999999999999, ' ', -1], [-9999999999999999, '1', -1], + [-9999999999999999, 'a bee cd.', -1], [-9999999999999999, '', -1], [-9999999999999999, ' ', -1], + [-9999999999999999, '1', -1], [-9999999999999999, 'a bee cd.', -1], + [-9999999999999999, set([]), -1], [-9999999999999999, set([1, 2, 3]), -1], + [-9999999999999999, {5: 3}, -1], [-9999999999999999, {}, -1], + [-9999999999999999, {'a': 99}, -1], [-9999999999999999, {'a': 1, 'c': 3, 'b': 2}, -1], + [-9999999999999999, {'a': 99, 'c': 3, 'b': 5}, -1], [-9999999999999999, None, 1], + [9999999999999999, 0, 1], [9999999999999999, 1, 1], [9999999999999999, 2, 1], + [9999999999999999, -1, 1], [9999999999999999, -9999999999999999, 1], + [9999999999999999, 0.0, 1], [9999999999999999, inf, -1], [9999999999999999, nan, -1], + [9999999999999999, 3.141592653589793, 1], [9999999999999999, '', -1], + [9999999999999999, ' ', -1], [9999999999999999, '1', -1], [9999999999999999, 'a bee cd.', -1], + [9999999999999999, '', -1], [9999999999999999, ' ', -1], [9999999999999999, '1', -1], + [9999999999999999, 'a bee cd.', -1], [9999999999999999, set([]), -1], + [9999999999999999, set([1, 2, 3]), -1], [9999999999999999, {5: 3}, -1], + [9999999999999999, {}, -1], [9999999999999999, {'a': 99}, -1], + [9999999999999999, {'a': 1, 'c': 3, 'b': 2}, -1], + [9999999999999999, {'a': 99, 'c': 3, 'b': 5}, -1], [9999999999999999, None, 1], [0.0, 0, 0], + [0.0, 1, -1], [0.0, 2, -1], [0.0, -1, 1], [0.0, -9999999999999999, 1], + [0.0, 9999999999999999, -1], [0.0, inf, -1], [0.0, nan, 1], [0.0, 3.141592653589793, -1], + [0.0, '', -1], [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], [0.0, '', -1], + [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], [0.0, set([]), -1], + [0.0, set([1, 2, 3]), -1], [0.0, {5: 3}, -1], [0.0, {}, -1], [0.0, {'a': 99}, -1], + [0.0, {'a': 1, 'c': 3, 'b': 2}, -1], [0.0, {'a': 99, 'c': 3, 'b': 5}, -1], [0.0, None, 1], + [inf, 0, 1], [inf, 1, 1], [inf, 2, 1], [inf, -1, 1], [inf, -9999999999999999, 1], + [inf, 9999999999999999, 1], [inf, 0.0, 1], [inf, nan, 1], [inf, 3.141592653589793, 1], + [inf, '', -1], [inf, ' ', -1], [inf, '1', -1], [inf, 'a bee cd.', -1], [inf, '', -1], + [inf, ' ', -1], [inf, '1', -1], [inf, 'a bee cd.', -1], [inf, set([]), -1], + [inf, set([1, 2, 3]), -1], [inf, {5: 3}, -1], [inf, {}, -1], [inf, {'a': 99}, -1], + [inf, {'a': 1, 'c': 3, 'b': 2}, -1], [inf, {'a': 99, 'c': 3, 'b': 5}, -1], [inf, None, 1], + [nan, 0, 1], [nan, 1, 1], [nan, 2, 1], [nan, -1, 1], [nan, -9999999999999999, 1], + [nan, 9999999999999999, 1], [nan, 0.0, -1], [nan, inf, -1], [nan, 3.141592653589793, -1], + [nan, '', -1], [nan, ' ', -1], [nan, '1', -1], [nan, 'a bee cd.', -1], [nan, '', -1], + [nan, ' ', -1], [nan, '1', -1], [nan, 'a bee cd.', -1], [nan, set([]), -1], + [nan, set([1, 2, 3]), -1], [nan, {5: 3}, -1], [nan, {}, -1], [nan, {'a': 99}, -1], + [nan, {'a': 1, 'c': 3, 'b': 2}, -1], [nan, {'a': 99, 'c': 3, 'b': 5}, -1], [nan, None, 1], + [3.141592653589793, 0, 1], [3.141592653589793, 1, 1], [3.141592653589793, 2, 1], + [3.141592653589793, -1, 1], [3.141592653589793, -9999999999999999, 1], + [3.141592653589793, 9999999999999999, -1], [3.141592653589793, 0.0, 1], + [3.141592653589793, inf, -1], [3.141592653589793, nan, 1], [3.141592653589793, '', -1], + [3.141592653589793, ' ', -1], [3.141592653589793, '1', -1], [3.141592653589793, 'a bee cd.', -1], + [3.141592653589793, '', -1], [3.141592653589793, ' ', -1], [3.141592653589793, '1', -1], + [3.141592653589793, 'a bee cd.', -1], [3.141592653589793, set([]), -1], + [3.141592653589793, set([1, 2, 3]), -1], [3.141592653589793, {5: 3}, -1], + [3.141592653589793, {}, -1], [3.141592653589793, {'a': 99}, -1], + [3.141592653589793, {'a': 1, 'c': 3, 'b': 2}, -1], + [3.141592653589793, {'a': 99, 'c': 3, 'b': 5}, -1], [3.141592653589793, None, 1], ['', 0, 1], + ['', 1, 1], ['', 2, 1], ['', -1, 1], ['', -9999999999999999, 1], ['', 9999999999999999, 1], + ['', 0.0, 1], ['', inf, 1], ['', nan, 1], ['', 3.141592653589793, 1], ['', ' ', -1], ['', '1', -1], + ['', 'a bee cd.', -1], ['', '', 0], ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], + ['', set([]), 1], ['', set([1, 2, 3]), 1], ['', {5: 3}, 1], ['', {}, 1], ['', {'a': 99}, 1], + ['', {'a': 1, 'c': 3, 'b': 2}, 1], ['', {'a': 99, 'c': 3, 'b': 5}, 1], ['', None, 1], [' ', 0, 1], + [' ', 1, 1], [' ', 2, 1], [' ', -1, 1], [' ', -9999999999999999, 1], [' ', 9999999999999999, 1], + [' ', 0.0, 1], [' ', inf, 1], [' ', nan, 1], [' ', 3.141592653589793, 1], [' ', '', 1], + [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', '', 1], [' ', ' ', 0], [' ', '1', -1], + [' ', 'a bee cd.', -1], [' ', set([]), 1], [' ', set([1, 2, 3]), 1], [' ', {5: 3}, 1], + [' ', {}, 1], [' ', {'a': 99}, 1], [' ', {'a': 1, 'c': 3, 'b': 2}, 1], + [' ', {'a': 99, 'c': 3, 'b': 5}, 1], [' ', None, 1], ['1', 0, 1], ['1', 1, 1], ['1', 2, 1], + ['1', -1, 1], ['1', -9999999999999999, 1], ['1', 9999999999999999, 1], ['1', 0.0, 1], + ['1', inf, 1], ['1', nan, 1], ['1', 3.141592653589793, 1], ['1', '', 1], ['1', ' ', 1], + ['1', 'a bee cd.', -1], ['1', '', 1], ['1', ' ', 1], ['1', '1', 0], ['1', 'a bee cd.', -1], + ['1', set([]), 1], ['1', set([1, 2, 3]), 1], ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], + ['1', {'a': 1, 'c': 3, 'b': 2}, 1], ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], + ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], + ['a bee cd.', -9999999999999999, 1], ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], + ['a bee cd.', inf, 1], ['a bee cd.', nan, 1], ['a bee cd.', 3.141592653589793, 1], + ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', '', 1], + ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', 'a bee cd.', 0], + ['a bee cd.', set([]), 1], ['a bee cd.', set([1, 2, 3]), 1], ['a bee cd.', {5: 3}, 1], + ['a bee cd.', {}, 1], ['a bee cd.', {'a': 99}, 1], ['a bee cd.', {'a': 1, 'c': 3, 'b': 2}, 1], + ['a bee cd.', {'a': 99, 'c': 3, 'b': 5}, 1], ['a bee cd.', None, 1], ['', 0, 1], ['', 1, 1], + ['', 2, 1], ['', -1, 1], ['', -9999999999999999, 1], ['', 9999999999999999, 1], ['', 0.0, 1], + ['', inf, 1], ['', nan, 1], ['', 3.141592653589793, 1], ['', '', 0], ['', ' ', -1], ['', '1', -1], + ['', 'a bee cd.', -1], ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', set([]), 1], + ['', set([1, 2, 3]), 1], ['', {5: 3}, 1], ['', {}, 1], ['', {'a': 99}, 1], + ['', {'a': 1, 'c': 3, 'b': 2}, 1], ['', {'a': 99, 'c': 3, 'b': 5}, 1], ['', None, 1], [' ', 0, 1], + [' ', 1, 1], [' ', 2, 1], [' ', -1, 1], [' ', -9999999999999999, 1], [' ', 9999999999999999, 1], + [' ', 0.0, 1], [' ', inf, 1], [' ', nan, 1], [' ', 3.141592653589793, 1], [' ', '', 1], + [' ', ' ', 0], [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', '', 1], [' ', '1', -1], + [' ', 'a bee cd.', -1], [' ', set([]), 1], [' ', set([1, 2, 3]), 1], [' ', {5: 3}, 1], + [' ', {}, 1], [' ', {'a': 99}, 1], [' ', {'a': 1, 'c': 3, 'b': 2}, 1], + [' ', {'a': 99, 'c': 3, 'b': 5}, 1], [' ', None, 1], ['1', 0, 1], ['1', 1, 1], ['1', 2, 1], + ['1', -1, 1], ['1', -9999999999999999, 1], ['1', 9999999999999999, 1], ['1', 0.0, 1], + ['1', inf, 1], ['1', nan, 1], ['1', 3.141592653589793, 1], ['1', '', 1], ['1', ' ', 1], + ['1', '1', 0], ['1', 'a bee cd.', -1], ['1', '', 1], ['1', ' ', 1], ['1', 'a bee cd.', -1], + ['1', set([]), 1], ['1', set([1, 2, 3]), 1], ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], + ['1', {'a': 1, 'c': 3, 'b': 2}, 1], ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], + ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], + ['a bee cd.', -9999999999999999, 1], ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], + ['a bee cd.', inf, 1], ['a bee cd.', nan, 1], ['a bee cd.', 3.141592653589793, 1], + ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', 'a bee cd.', 0], + ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', set([]), 1], + ['a bee cd.', set([1, 2, 3]), 1], ['a bee cd.', {5: 3}, 1], ['a bee cd.', {}, 1], + ['a bee cd.', {'a': 99}, 1], ['a bee cd.', {'a': 1, 'c': 3, 'b': 2}, 1], + ['a bee cd.', {'a': 99, 'c': 3, 'b': 5}, 1], ['a bee cd.', None, 1], [set([]), 0, 1], + [set([]), 1, 1], [set([]), 2, 1], [set([]), -1, 1], [set([]), -9999999999999999, 1], + [set([]), 9999999999999999, 1], [set([]), 0.0, 1], [set([]), inf, 1], [set([]), nan, 1], + [set([]), 3.141592653589793, 1], [set([]), '', -1], [set([]), ' ', -1], [set([]), '1', -1], + [set([]), 'a bee cd.', -1], [set([]), '', -1], [set([]), ' ', -1], [set([]), '1', -1], + [set([]), 'a bee cd.', -1], + [set([]), set([1, 2, 3]), 'TypeError: cannot compare sets using cmp()'], [set([]), {5: 3}, 1], + [set([]), {}, 1], [set([]), {'a': 99}, 1], [set([]), {'a': 1, 'c': 3, 'b': 2}, 1], + [set([]), {'a': 99, 'c': 3, 'b': 5}, 1], [set([]), None, 1], [set([1, 2, 3]), 0, 1], + [set([1, 2, 3]), 1, 1], [set([1, 2, 3]), 2, 1], [set([1, 2, 3]), -1, 1], + [set([1, 2, 3]), -9999999999999999, 1], [set([1, 2, 3]), 9999999999999999, 1], + [set([1, 2, 3]), 0.0, 1], [set([1, 2, 3]), inf, 1], [set([1, 2, 3]), nan, 1], + [set([1, 2, 3]), 3.141592653589793, 1], [set([1, 2, 3]), '', -1], [set([1, 2, 3]), ' ', -1], + [set([1, 2, 3]), '1', -1], [set([1, 2, 3]), 'a bee cd.', -1], [set([1, 2, 3]), '', -1], + [set([1, 2, 3]), ' ', -1], [set([1, 2, 3]), '1', -1], [set([1, 2, 3]), 'a bee cd.', -1], + [set([1, 2, 3]), set([]), 'TypeError: cannot compare sets using cmp()'], + [set([1, 2, 3]), {5: 3}, 1], [set([1, 2, 3]), {}, 1], [set([1, 2, 3]), {'a': 99}, 1], + [set([1, 2, 3]), {'a': 1, 'c': 3, 'b': 2}, 1], [set([1, 2, 3]), {'a': 99, 'c': 3, 'b': 5}, 1], + [set([1, 2, 3]), None, 1], [{5: 3}, 0, 1], [{5: 3}, 1, 1], [{5: 3}, 2, 1], [{5: 3}, -1, 1], + [{5: 3}, -9999999999999999, 1], [{5: 3}, 9999999999999999, 1], [{5: 3}, 0.0, 1], + [{5: 3}, inf, 1], [{5: 3}, nan, 1], [{5: 3}, 3.141592653589793, 1], [{5: 3}, '', -1], + [{5: 3}, ' ', -1], [{5: 3}, '1', -1], [{5: 3}, 'a bee cd.', -1], [{5: 3}, '', -1], + [{5: 3}, ' ', -1], [{5: 3}, '1', -1], [{5: 3}, 'a bee cd.', -1], [{5: 3}, set([]), -1], + [{5: 3}, set([1, 2, 3]), -1], [{5: 3}, {}, 1], [{5: 3}, {'a': 99}, -1], + [{5: 3}, {'a': 1, 'c': 3, 'b': 2}, -1], [{5: 3}, {'a': 99, 'c': 3, 'b': 5}, -1], [{5: 3}, None, 1], + [{}, 0, 1], [{}, 1, 1], [{}, 2, 1], [{}, -1, 1], [{}, -9999999999999999, 1], + [{}, 9999999999999999, 1], [{}, 0.0, 1], [{}, inf, 1], [{}, nan, 1], [{}, 3.141592653589793, 1], + [{}, '', -1], [{}, ' ', -1], [{}, '1', -1], [{}, 'a bee cd.', -1], [{}, '', -1], [{}, ' ', -1], + [{}, '1', -1], [{}, 'a bee cd.', -1], [{}, set([]), -1], [{}, set([1, 2, 3]), -1], + [{}, {5: 3}, -1], [{}, {'a': 99}, -1], [{}, {'a': 1, 'c': 3, 'b': 2}, -1], + [{}, {'a': 99, 'c': 3, 'b': 5}, -1], [{}, None, 1], [{'a': 99}, 0, 1], [{'a': 99}, 1, 1], + [{'a': 99}, 2, 1], [{'a': 99}, -1, 1], [{'a': 99}, -9999999999999999, 1], + [{'a': 99}, 9999999999999999, 1], [{'a': 99}, 0.0, 1], [{'a': 99}, inf, 1], [{'a': 99}, nan, 1], + [{'a': 99}, 3.141592653589793, 1], [{'a': 99}, '', -1], [{'a': 99}, ' ', -1], [{'a': 99}, '1', -1], + [{'a': 99}, 'a bee cd.', -1], [{'a': 99}, '', -1], [{'a': 99}, ' ', -1], [{'a': 99}, '1', -1], + [{'a': 99}, 'a bee cd.', -1], [{'a': 99}, set([]), -1], [{'a': 99}, set([1, 2, 3]), -1], + [{'a': 99}, {5: 3}, 1], [{'a': 99}, {}, 1], [{'a': 99}, {'a': 1, 'c': 3, 'b': 2}, -1], + [{'a': 99}, {'a': 99, 'c': 3, 'b': 5}, -1], [{'a': 99}, None, 1], [{'a': 1, 'c': 3, 'b': 2}, 0, 1], + [{'a': 1, 'c': 3, 'b': 2}, 1, 1], [{'a': 1, 'c': 3, 'b': 2}, 2, 1], + [{'a': 1, 'c': 3, 'b': 2}, -1, 1], [{'a': 1, 'c': 3, 'b': 2}, -9999999999999999, 1], + [{'a': 1, 'c': 3, 'b': 2}, 9999999999999999, 1], [{'a': 1, 'c': 3, 'b': 2}, 0.0, 1], + [{'a': 1, 'c': 3, 'b': 2}, inf, 1], [{'a': 1, 'c': 3, 'b': 2}, nan, 1], + [{'a': 1, 'c': 3, 'b': 2}, 3.141592653589793, 1], [{'a': 1, 'c': 3, 'b': 2}, '', -1], + [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], [{'a': 1, 'c': 3, 'b': 2}, '1', -1], + [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], [{'a': 1, 'c': 3, 'b': 2}, '', -1], + [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], [{'a': 1, 'c': 3, 'b': 2}, '1', -1], + [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], [{'a': 1, 'c': 3, 'b': 2}, set([]), -1], + [{'a': 1, 'c': 3, 'b': 2}, set([1, 2, 3]), -1], [{'a': 1, 'c': 3, 'b': 2}, {5: 3}, 1], + [{'a': 1, 'c': 3, 'b': 2}, {}, 1], [{'a': 1, 'c': 3, 'b': 2}, {'a': 99}, 1], + [{'a': 1, 'c': 3, 'b': 2}, {'a': 99, 'c': 3, 'b': 5}, -1], [{'a': 1, 'c': 3, 'b': 2}, None, 1], + [{'a': 99, 'c': 3, 'b': 5}, 0, 1], [{'a': 99, 'c': 3, 'b': 5}, 1, 1], + [{'a': 99, 'c': 3, 'b': 5}, 2, 1], [{'a': 99, 'c': 3, 'b': 5}, -1, 1], + [{'a': 99, 'c': 3, 'b': 5}, -9999999999999999, 1], + [{'a': 99, 'c': 3, 'b': 5}, 9999999999999999, 1], [{'a': 99, 'c': 3, 'b': 5}, 0.0, 1], + [{'a': 99, 'c': 3, 'b': 5}, inf, 1], [{'a': 99, 'c': 3, 'b': 5}, nan, 1], + [{'a': 99, 'c': 3, 'b': 5}, 3.141592653589793, 1], [{'a': 99, 'c': 3, 'b': 5}, '', -1], + [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], [{'a': 99, 'c': 3, 'b': 5}, '1', -1], + [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], [{'a': 99, 'c': 3, 'b': 5}, '', -1], + [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], [{'a': 99, 'c': 3, 'b': 5}, '1', -1], + [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], [{'a': 99, 'c': 3, 'b': 5}, set([]), -1], + [{'a': 99, 'c': 3, 'b': 5}, set([1, 2, 3]), -1], [{'a': 99, 'c': 3, 'b': 5}, {5: 3}, 1], + [{'a': 99, 'c': 3, 'b': 5}, {}, 1], [{'a': 99, 'c': 3, 'b': 5}, {'a': 99}, 1], + [{'a': 99, 'c': 3, 'b': 5}, {'a': 1, 'c': 3, 'b': 2}, 1], [{'a': 99, 'c': 3, 'b': 5}, None, 1], + [None, 0, -1], [None, 1, -1], [None, 2, -1], [None, -1, -1], [None, -9999999999999999, -1], + [None, 9999999999999999, -1], [None, 0.0, -1], [None, inf, -1], [None, nan, -1], + [None, 3.141592653589793, -1], [None, '', -1], [None, ' ', -1], [None, '1', -1], + [None, 'a bee cd.', -1], [None, '', -1], [None, ' ', -1], [None, '1', -1], [None, 'a bee cd.', -1], + [None, set([]), -1], [None, set([1, 2, 3]), -1], [None, {5: 3}, -1], [None, {}, -1], + [None, {'a': 99}, -1], [None, {'a': 1, 'c': 3, 'b': 2}, -1], [None, {'a': 99, 'c': 3, 'b': 5}, -1]] From 8302d8c8f1f61c9b1cb978337eddcdcc48701310 Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 19:37:37 -0700 Subject: [PATCH 02/10] minor style/spelling fixes --- src/past/builtins/misc.py | 4 ++-- tests/test_past/test_misc.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/past/builtins/misc.py b/src/past/builtins/misc.py index 889e0ff8..6342a8ec 100644 --- a/src/past/builtins/misc.py +++ b/src/past/builtins/misc.py @@ -103,7 +103,7 @@ def oct(number): return '0' + builtins.oct(number)[2:] raw_input = input - from imp import reload + from importlib import reload unicode = str unichr = chr xrange = range @@ -143,7 +143,7 @@ def execfile(filename, myglobals=None, mylocals=None): if not isinstance(mylocals, Mapping): raise TypeError('locals must be a mapping') with open(filename, "rb") as fin: - source = fin.read() + source = fin.read() code = compile(source, filename, "exec") exec_(code, myglobals, mylocals) diff --git a/tests/test_past/test_misc.py b/tests/test_past/test_misc.py index 3d1b7a09..3952ab19 100644 --- a/tests/test_past/test_misc.py +++ b/tests/test_past/test_misc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -Tests for the resurrected Py2-like cmp funtion +Tests for the resurrected Py2-like cmp function """ from __future__ import absolute_import, unicode_literals, print_function @@ -23,7 +23,7 @@ def test_cmp(self): with self.subTest(x=x, y=y): try: past_cmp_value = cmp(x, y) - except Exception as ex: + except Exception: past_cmp_value = traceback.format_exc().strip().split('\n')[-1] self.assertEqual(cmp_python2_value, past_cmp_value, From 4a687ea190fb3a18e808373fd571adb65218cf9e Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 20:06:38 -0700 Subject: [PATCH 03/10] replace fstrings with format for python 3.4,3.5 --- src/past/builtins/misc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/past/builtins/misc.py b/src/past/builtins/misc.py index 6342a8ec..dda6ff33 100644 --- a/src/past/builtins/misc.py +++ b/src/past/builtins/misc.py @@ -39,14 +39,14 @@ def cmp(x, y): try: if isinstance(x, numbers.Number) and math.isnan(x): if not isinstance(y, numbers.Number): - raise TypeError(f'cannot compare float("nan"), {type(y)} with cmp') + raise TypeError('cannot compare float("nan"), {type_y} with cmp'.format(type_y=type(y))) if isinstance(y, int): return 1 else: return -1 if isinstance(y, numbers.Number) and math.isnan(y): if not isinstance(x, numbers.Number): - raise TypeError(f'cannot compare {type(x)}, float("nan") with cmp') + raise TypeError('cannot compare {type_x}, float("nan") with cmp'.format(type_x=type(x))) if isinstance(x, int): return -1 else: From fc84fa8dd46d5ccff8d80b5ac1cac68af5c83055 Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 20:16:59 -0700 Subject: [PATCH 04/10] import from old imp library on older python versions --- src/past/builtins/misc.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/past/builtins/misc.py b/src/past/builtins/misc.py index dda6ff33..3600695c 100644 --- a/src/past/builtins/misc.py +++ b/src/past/builtins/misc.py @@ -103,7 +103,13 @@ def oct(number): return '0' + builtins.oct(number)[2:] raw_input = input - from importlib import reload + + try: + from importlib import reload + except ImportError: + # for python2, python3 <= 3.4 + from imp import reload + unicode = str unichr = chr xrange = range From f006cad1cf66d691086df058698404cd4bdf2216 Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 20:32:00 -0700 Subject: [PATCH 05/10] fix missing subTest --- tests/test_past/test_misc.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/test_past/test_misc.py b/tests/test_past/test_misc.py index 3952ab19..2bbdea2d 100644 --- a/tests/test_past/test_misc.py +++ b/tests/test_past/test_misc.py @@ -8,6 +8,7 @@ import os.path import sys import traceback +from contextlib import contextmanager from future.tests.base import unittest from past.builtins import cmp @@ -17,10 +18,16 @@ import test_values +@contextmanager +def empty_context_manager(*args, **kwargs): + return dict(args=args, kwargs=kwargs) + + class TestCmp(unittest.TestCase): def test_cmp(self): for x, y, cmp_python2_value in test_values.cmp_python2_value: - with self.subTest(x=x, y=y): + # to get this to run on python <3.4 which lacks subTest + with getattr(self, 'subTest', empty_context_manager)(x=x, y=y): try: past_cmp_value = cmp(x, y) except Exception: From c0510266fd62297ea54629bac89cbb4644c8786f Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 20:42:10 -0700 Subject: [PATCH 06/10] fix other python2 test issues --- tests/test_past/test_misc.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/test_past/test_misc.py b/tests/test_past/test_misc.py index 2bbdea2d..db07896f 100644 --- a/tests/test_past/test_misc.py +++ b/tests/test_past/test_misc.py @@ -11,7 +11,10 @@ from contextlib import contextmanager from future.tests.base import unittest -from past.builtins import cmp +from future.utils import PY3 + +if PY3: + from past.builtins import cmp _dir = os.path.dirname(os.path.abspath(__file__)) sys.path.append(_dir) @@ -20,7 +23,7 @@ @contextmanager def empty_context_manager(*args, **kwargs): - return dict(args=args, kwargs=kwargs) + yield dict(args=args, kwargs=kwargs) class TestCmp(unittest.TestCase): From e3f1a128a978e23b2993222cc3379a2e64f54e9a Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 21:10:26 -0700 Subject: [PATCH 07/10] include list test values --- tests/test_past/test_values.py | 281 +++++++++++++++++++-------------- 1 file changed, 160 insertions(+), 121 deletions(-) diff --git a/tests/test_past/test_values.py b/tests/test_past/test_values.py index 393ad761..7c85a8f2 100644 --- a/tests/test_past/test_values.py +++ b/tests/test_past/test_values.py @@ -4,7 +4,7 @@ test_values = [ 0, 1, 2, -1, -9999999999, 9999999, 0.0, inf, nan, pi, - # [], [[]], [1,2,3], + [], [[]], [1, 2, 3], set(), set([1, 2, 3]), " ", "", "1", "dsada saA.", "2", "dsa", b"", b"dsa", b" ", {5: 3}, dict(), dict(a=99), dict(a=1, b=2, c=3), None @@ -12,62 +12,65 @@ # cmp_python2_values are pre-calculated from running cmp under python2 first values are x and y, last is results of cmp cmp_python2_value = [[0, 1, -1], [0, 2, -1], [0, -1, 1], [0, -9999999999999999, 1], [0, 9999999999999999, -1], - [0, 0.0, 0], [0, inf, -1], [0, nan, -1], [0, 3.141592653589793, -1], [0, '', -1], [0, ' ', -1], - [0, '1', -1], [0, 'a bee cd.', -1], [0, '', -1], [0, ' ', -1], [0, '1', -1], [0, 'a bee cd.', -1], - [0, set([]), -1], [0, set([1, 2, 3]), -1], [0, {5: 3}, -1], [0, {}, -1], [0, {'a': 99}, -1], - [0, {'a': 1, 'c': 3, 'b': 2}, -1], [0, {'a': 99, 'c': 3, 'b': 5}, -1], [0, None, 1], [1, 0, 1], - [1, 2, -1], [1, -1, 1], [1, -9999999999999999, 1], [1, 9999999999999999, -1], [1, 0.0, 1], - [1, inf, -1], [1, nan, -1], [1, 3.141592653589793, -1], [1, '', -1], [1, ' ', -1], [1, '1', -1], - [1, 'a bee cd.', -1], [1, '', -1], [1, ' ', -1], [1, '1', -1], [1, 'a bee cd.', -1], - [1, set([]), -1], [1, set([1, 2, 3]), -1], [1, {5: 3}, -1], [1, {}, -1], [1, {'a': 99}, -1], - [1, {'a': 1, 'c': 3, 'b': 2}, -1], [1, {'a': 99, 'c': 3, 'b': 5}, -1], [1, None, 1], [2, 0, 1], - [2, 1, 1], [2, -1, 1], [2, -9999999999999999, 1], [2, 9999999999999999, -1], [2, 0.0, 1], - [2, inf, -1], [2, nan, -1], [2, 3.141592653589793, -1], [2, '', -1], [2, ' ', -1], [2, '1', -1], + [0, 0.0, 0], [0, inf, -1], [0, nan, -1], [0, 3.141592653589793, -1], [0, [], -1], [0, [[]], -1], + [0, [1, 2, 3], -1], [0, '', -1], [0, ' ', -1], [0, '1', -1], [0, 'a bee cd.', -1], [0, '', -1], + [0, ' ', -1], [0, '1', -1], [0, 'a bee cd.', -1], [0, set([]), -1], [0, set([1, 2, 3]), -1], + [0, {5: 3}, -1], [0, {}, -1], [0, {'a': 99}, -1], [0, {'a': 1, 'c': 3, 'b': 2}, -1], + [0, {'a': 99, 'c': 3, 'b': 5}, -1], [0, None, 1], [1, 0, 1], [1, 2, -1], [1, -1, 1], + [1, -9999999999999999, 1], [1, 9999999999999999, -1], [1, 0.0, 1], [1, inf, -1], [1, nan, -1], + [1, 3.141592653589793, -1], [1, [], -1], [1, [[]], -1], [1, [1, 2, 3], -1], [1, '', -1], + [1, ' ', -1], [1, '1', -1], [1, 'a bee cd.', -1], [1, '', -1], [1, ' ', -1], [1, '1', -1], + [1, 'a bee cd.', -1], [1, set([]), -1], [1, set([1, 2, 3]), -1], [1, {5: 3}, -1], [1, {}, -1], + [1, {'a': 99}, -1], [1, {'a': 1, 'c': 3, 'b': 2}, -1], [1, {'a': 99, 'c': 3, 'b': 5}, -1], + [1, None, 1], [2, 0, 1], [2, 1, 1], [2, -1, 1], [2, -9999999999999999, 1], + [2, 9999999999999999, -1], [2, 0.0, 1], [2, inf, -1], [2, nan, -1], [2, 3.141592653589793, -1], + [2, [], -1], [2, [[]], -1], [2, [1, 2, 3], -1], [2, '', -1], [2, ' ', -1], [2, '1', -1], [2, 'a bee cd.', -1], [2, '', -1], [2, ' ', -1], [2, '1', -1], [2, 'a bee cd.', -1], [2, set([]), -1], [2, set([1, 2, 3]), -1], [2, {5: 3}, -1], [2, {}, -1], [2, {'a': 99}, -1], [2, {'a': 1, 'c': 3, 'b': 2}, -1], [2, {'a': 99, 'c': 3, 'b': 5}, -1], [2, None, 1], [-1, 0, -1], [-1, 1, -1], [-1, 2, -1], [-1, -9999999999999999, 1], [-1, 9999999999999999, -1], [-1, 0.0, -1], - [-1, inf, -1], [-1, nan, -1], [-1, 3.141592653589793, -1], [-1, '', -1], [-1, ' ', -1], - [-1, '1', -1], [-1, 'a bee cd.', -1], [-1, '', -1], [-1, ' ', -1], [-1, '1', -1], - [-1, 'a bee cd.', -1], [-1, set([]), -1], [-1, set([1, 2, 3]), -1], [-1, {5: 3}, -1], [-1, {}, -1], - [-1, {'a': 99}, -1], [-1, {'a': 1, 'c': 3, 'b': 2}, -1], [-1, {'a': 99, 'c': 3, 'b': 5}, -1], - [-1, None, 1], [-9999999999999999, 0, -1], [-9999999999999999, 1, -1], - [-9999999999999999, 2, -1], [-9999999999999999, -1, -1], - [-9999999999999999, 9999999999999999, -1], [-9999999999999999, 0.0, -1], - [-9999999999999999, inf, -1], [-9999999999999999, nan, -1], - [-9999999999999999, 3.141592653589793, -1], [-9999999999999999, '', -1], - [-9999999999999999, ' ', -1], [-9999999999999999, '1', -1], - [-9999999999999999, 'a bee cd.', -1], [-9999999999999999, '', -1], [-9999999999999999, ' ', -1], - [-9999999999999999, '1', -1], [-9999999999999999, 'a bee cd.', -1], - [-9999999999999999, set([]), -1], [-9999999999999999, set([1, 2, 3]), -1], - [-9999999999999999, {5: 3}, -1], [-9999999999999999, {}, -1], - [-9999999999999999, {'a': 99}, -1], [-9999999999999999, {'a': 1, 'c': 3, 'b': 2}, -1], + [-1, inf, -1], [-1, nan, -1], [-1, 3.141592653589793, -1], [-1, [], -1], [-1, [[]], -1], + [-1, [1, 2, 3], -1], [-1, '', -1], [-1, ' ', -1], [-1, '1', -1], [-1, 'a bee cd.', -1], + [-1, '', -1], [-1, ' ', -1], [-1, '1', -1], [-1, 'a bee cd.', -1], [-1, set([]), -1], + [-1, set([1, 2, 3]), -1], [-1, {5: 3}, -1], [-1, {}, -1], [-1, {'a': 99}, -1], + [-1, {'a': 1, 'c': 3, 'b': 2}, -1], [-1, {'a': 99, 'c': 3, 'b': 5}, -1], [-1, None, 1], + [-9999999999999999, 0, -1], [-9999999999999999, 1, -1], [-9999999999999999, 2, -1], + [-9999999999999999, -1, -1], [-9999999999999999, 9999999999999999, -1], + [-9999999999999999, 0.0, -1], [-9999999999999999, inf, -1], [-9999999999999999, nan, -1], + [-9999999999999999, 3.141592653589793, -1], [-9999999999999999, [], -1], + [-9999999999999999, [[]], -1], [-9999999999999999, [1, 2, 3], -1], [-9999999999999999, '', -1], + [-9999999999999999, ' ', -1], [-9999999999999999, '1', -1], [-9999999999999999, 'a bee cd.', -1], + [-9999999999999999, '', -1], [-9999999999999999, ' ', -1], [-9999999999999999, '1', -1], + [-9999999999999999, 'a bee cd.', -1], [-9999999999999999, set([]), -1], + [-9999999999999999, set([1, 2, 3]), -1], [-9999999999999999, {5: 3}, -1], + [-9999999999999999, {}, -1], [-9999999999999999, {'a': 99}, -1], + [-9999999999999999, {'a': 1, 'c': 3, 'b': 2}, -1], [-9999999999999999, {'a': 99, 'c': 3, 'b': 5}, -1], [-9999999999999999, None, 1], [9999999999999999, 0, 1], [9999999999999999, 1, 1], [9999999999999999, 2, 1], - [9999999999999999, -1, 1], [9999999999999999, -9999999999999999, 1], - [9999999999999999, 0.0, 1], [9999999999999999, inf, -1], [9999999999999999, nan, -1], - [9999999999999999, 3.141592653589793, 1], [9999999999999999, '', -1], - [9999999999999999, ' ', -1], [9999999999999999, '1', -1], [9999999999999999, 'a bee cd.', -1], + [9999999999999999, -1, 1], [9999999999999999, -9999999999999999, 1], [9999999999999999, 0.0, 1], + [9999999999999999, inf, -1], [9999999999999999, nan, -1], [9999999999999999, 3.141592653589793, 1], + [9999999999999999, [], -1], [9999999999999999, [[]], -1], [9999999999999999, [1, 2, 3], -1], [9999999999999999, '', -1], [9999999999999999, ' ', -1], [9999999999999999, '1', -1], - [9999999999999999, 'a bee cd.', -1], [9999999999999999, set([]), -1], - [9999999999999999, set([1, 2, 3]), -1], [9999999999999999, {5: 3}, -1], - [9999999999999999, {}, -1], [9999999999999999, {'a': 99}, -1], - [9999999999999999, {'a': 1, 'c': 3, 'b': 2}, -1], + [9999999999999999, 'a bee cd.', -1], [9999999999999999, '', -1], [9999999999999999, ' ', -1], + [9999999999999999, '1', -1], [9999999999999999, 'a bee cd.', -1], [9999999999999999, set([]), -1], + [9999999999999999, set([1, 2, 3]), -1], [9999999999999999, {5: 3}, -1], [9999999999999999, {}, -1], + [9999999999999999, {'a': 99}, -1], [9999999999999999, {'a': 1, 'c': 3, 'b': 2}, -1], [9999999999999999, {'a': 99, 'c': 3, 'b': 5}, -1], [9999999999999999, None, 1], [0.0, 0, 0], - [0.0, 1, -1], [0.0, 2, -1], [0.0, -1, 1], [0.0, -9999999999999999, 1], - [0.0, 9999999999999999, -1], [0.0, inf, -1], [0.0, nan, 1], [0.0, 3.141592653589793, -1], - [0.0, '', -1], [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], [0.0, '', -1], - [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], [0.0, set([]), -1], + [0.0, 1, -1], [0.0, 2, -1], [0.0, -1, 1], [0.0, -9999999999999999, 1], [0.0, 9999999999999999, -1], + [0.0, inf, -1], [0.0, nan, 1], [0.0, 3.141592653589793, -1], [0.0, [], -1], [0.0, [[]], -1], + [0.0, [1, 2, 3], -1], [0.0, '', -1], [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], + [0.0, '', -1], [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], [0.0, set([]), -1], [0.0, set([1, 2, 3]), -1], [0.0, {5: 3}, -1], [0.0, {}, -1], [0.0, {'a': 99}, -1], [0.0, {'a': 1, 'c': 3, 'b': 2}, -1], [0.0, {'a': 99, 'c': 3, 'b': 5}, -1], [0.0, None, 1], [inf, 0, 1], [inf, 1, 1], [inf, 2, 1], [inf, -1, 1], [inf, -9999999999999999, 1], [inf, 9999999999999999, 1], [inf, 0.0, 1], [inf, nan, 1], [inf, 3.141592653589793, 1], - [inf, '', -1], [inf, ' ', -1], [inf, '1', -1], [inf, 'a bee cd.', -1], [inf, '', -1], - [inf, ' ', -1], [inf, '1', -1], [inf, 'a bee cd.', -1], [inf, set([]), -1], - [inf, set([1, 2, 3]), -1], [inf, {5: 3}, -1], [inf, {}, -1], [inf, {'a': 99}, -1], - [inf, {'a': 1, 'c': 3, 'b': 2}, -1], [inf, {'a': 99, 'c': 3, 'b': 5}, -1], [inf, None, 1], - [nan, 0, 1], [nan, 1, 1], [nan, 2, 1], [nan, -1, 1], [nan, -9999999999999999, 1], - [nan, 9999999999999999, 1], [nan, 0.0, -1], [nan, inf, -1], [nan, 3.141592653589793, -1], + [inf, [], -1], [inf, [[]], -1], [inf, [1, 2, 3], -1], [inf, '', -1], [inf, ' ', -1], + [inf, '1', -1], [inf, 'a bee cd.', -1], [inf, '', -1], [inf, ' ', -1], [inf, '1', -1], + [inf, 'a bee cd.', -1], [inf, set([]), -1], [inf, set([1, 2, 3]), -1], [inf, {5: 3}, -1], + [inf, {}, -1], [inf, {'a': 99}, -1], [inf, {'a': 1, 'c': 3, 'b': 2}, -1], + [inf, {'a': 99, 'c': 3, 'b': 5}, -1], [inf, None, 1], [nan, 0, 1], [nan, 1, 1], [nan, 2, 1], + [nan, -1, 1], [nan, -9999999999999999, 1], [nan, 9999999999999999, 1], [nan, 0.0, -1], + [nan, inf, -1], [nan, 3.141592653589793, -1], [nan, [], -1], [nan, [[]], -1], [nan, [1, 2, 3], -1], [nan, '', -1], [nan, ' ', -1], [nan, '1', -1], [nan, 'a bee cd.', -1], [nan, '', -1], [nan, ' ', -1], [nan, '1', -1], [nan, 'a bee cd.', -1], [nan, set([]), -1], [nan, set([1, 2, 3]), -1], [nan, {5: 3}, -1], [nan, {}, -1], [nan, {'a': 99}, -1], @@ -75,95 +78,126 @@ [3.141592653589793, 0, 1], [3.141592653589793, 1, 1], [3.141592653589793, 2, 1], [3.141592653589793, -1, 1], [3.141592653589793, -9999999999999999, 1], [3.141592653589793, 9999999999999999, -1], [3.141592653589793, 0.0, 1], - [3.141592653589793, inf, -1], [3.141592653589793, nan, 1], [3.141592653589793, '', -1], + [3.141592653589793, inf, -1], [3.141592653589793, nan, 1], [3.141592653589793, [], -1], + [3.141592653589793, [[]], -1], [3.141592653589793, [1, 2, 3], -1], [3.141592653589793, '', -1], [3.141592653589793, ' ', -1], [3.141592653589793, '1', -1], [3.141592653589793, 'a bee cd.', -1], [3.141592653589793, '', -1], [3.141592653589793, ' ', -1], [3.141592653589793, '1', -1], [3.141592653589793, 'a bee cd.', -1], [3.141592653589793, set([]), -1], [3.141592653589793, set([1, 2, 3]), -1], [3.141592653589793, {5: 3}, -1], [3.141592653589793, {}, -1], [3.141592653589793, {'a': 99}, -1], [3.141592653589793, {'a': 1, 'c': 3, 'b': 2}, -1], - [3.141592653589793, {'a': 99, 'c': 3, 'b': 5}, -1], [3.141592653589793, None, 1], ['', 0, 1], - ['', 1, 1], ['', 2, 1], ['', -1, 1], ['', -9999999999999999, 1], ['', 9999999999999999, 1], - ['', 0.0, 1], ['', inf, 1], ['', nan, 1], ['', 3.141592653589793, 1], ['', ' ', -1], ['', '1', -1], - ['', 'a bee cd.', -1], ['', '', 0], ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], - ['', set([]), 1], ['', set([1, 2, 3]), 1], ['', {5: 3}, 1], ['', {}, 1], ['', {'a': 99}, 1], - ['', {'a': 1, 'c': 3, 'b': 2}, 1], ['', {'a': 99, 'c': 3, 'b': 5}, 1], ['', None, 1], [' ', 0, 1], - [' ', 1, 1], [' ', 2, 1], [' ', -1, 1], [' ', -9999999999999999, 1], [' ', 9999999999999999, 1], - [' ', 0.0, 1], [' ', inf, 1], [' ', nan, 1], [' ', 3.141592653589793, 1], [' ', '', 1], - [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', '', 1], [' ', ' ', 0], [' ', '1', -1], - [' ', 'a bee cd.', -1], [' ', set([]), 1], [' ', set([1, 2, 3]), 1], [' ', {5: 3}, 1], - [' ', {}, 1], [' ', {'a': 99}, 1], [' ', {'a': 1, 'c': 3, 'b': 2}, 1], + [3.141592653589793, {'a': 99, 'c': 3, 'b': 5}, -1], [3.141592653589793, None, 1], [[], 0, 1], + [[], 1, 1], [[], 2, 1], [[], -1, 1], [[], -9999999999999999, 1], [[], 9999999999999999, 1], + [[], 0.0, 1], [[], inf, 1], [[], nan, 1], [[], 3.141592653589793, 1], [[], [[]], -1], + [[], [1, 2, 3], -1], [[], '', -1], [[], ' ', -1], [[], '1', -1], [[], 'a bee cd.', -1], + [[], '', -1], [[], ' ', -1], [[], '1', -1], [[], 'a bee cd.', -1], [[], set([]), -1], + [[], set([1, 2, 3]), -1], [[], {5: 3}, 1], [[], {}, 1], [[], {'a': 99}, 1], + [[], {'a': 1, 'c': 3, 'b': 2}, 1], [[], {'a': 99, 'c': 3, 'b': 5}, 1], [[], None, 1], [[[]], 0, 1], + [[[]], 1, 1], [[[]], 2, 1], [[[]], -1, 1], [[[]], -9999999999999999, 1], + [[[]], 9999999999999999, 1], [[[]], 0.0, 1], [[[]], inf, 1], [[[]], nan, 1], + [[[]], 3.141592653589793, 1], [[[]], [], 1], [[[]], [1, 2, 3], 1], [[[]], '', -1], [[[]], ' ', -1], + [[[]], '1', -1], [[[]], 'a bee cd.', -1], [[[]], '', -1], [[[]], ' ', -1], [[[]], '1', -1], + [[[]], 'a bee cd.', -1], [[[]], set([]), -1], [[[]], set([1, 2, 3]), -1], [[[]], {5: 3}, 1], + [[[]], {}, 1], [[[]], {'a': 99}, 1], [[[]], {'a': 1, 'c': 3, 'b': 2}, 1], + [[[]], {'a': 99, 'c': 3, 'b': 5}, 1], [[[]], None, 1], [[1, 2, 3], 0, 1], [[1, 2, 3], 1, 1], + [[1, 2, 3], 2, 1], [[1, 2, 3], -1, 1], [[1, 2, 3], -9999999999999999, 1], + [[1, 2, 3], 9999999999999999, 1], [[1, 2, 3], 0.0, 1], [[1, 2, 3], inf, 1], [[1, 2, 3], nan, 1], + [[1, 2, 3], 3.141592653589793, 1], [[1, 2, 3], [], 1], [[1, 2, 3], [[]], -1], [[1, 2, 3], '', -1], + [[1, 2, 3], ' ', -1], [[1, 2, 3], '1', -1], [[1, 2, 3], 'a bee cd.', -1], [[1, 2, 3], '', -1], + [[1, 2, 3], ' ', -1], [[1, 2, 3], '1', -1], [[1, 2, 3], 'a bee cd.', -1], [[1, 2, 3], set([]), -1], + [[1, 2, 3], set([1, 2, 3]), -1], [[1, 2, 3], {5: 3}, 1], [[1, 2, 3], {}, 1], + [[1, 2, 3], {'a': 99}, 1], [[1, 2, 3], {'a': 1, 'c': 3, 'b': 2}, 1], + [[1, 2, 3], {'a': 99, 'c': 3, 'b': 5}, 1], [[1, 2, 3], None, 1], ['', 0, 1], ['', 1, 1], + ['', 2, 1], ['', -1, 1], ['', -9999999999999999, 1], ['', 9999999999999999, 1], ['', 0.0, 1], + ['', inf, 1], ['', nan, 1], ['', 3.141592653589793, 1], ['', [], 1], ['', [[]], 1], + ['', [1, 2, 3], 1], ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', '', 0], + ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', set([]), 1], ['', set([1, 2, 3]), 1], + ['', {5: 3}, 1], ['', {}, 1], ['', {'a': 99}, 1], ['', {'a': 1, 'c': 3, 'b': 2}, 1], + ['', {'a': 99, 'c': 3, 'b': 5}, 1], ['', None, 1], [' ', 0, 1], [' ', 1, 1], [' ', 2, 1], + [' ', -1, 1], [' ', -9999999999999999, 1], [' ', 9999999999999999, 1], [' ', 0.0, 1], + [' ', inf, 1], [' ', nan, 1], [' ', 3.141592653589793, 1], [' ', [], 1], [' ', [[]], 1], + [' ', [1, 2, 3], 1], [' ', '', 1], [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', '', 1], + [' ', ' ', 0], [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', set([]), 1], [' ', set([1, 2, 3]), 1], + [' ', {5: 3}, 1], [' ', {}, 1], [' ', {'a': 99}, 1], [' ', {'a': 1, 'c': 3, 'b': 2}, 1], [' ', {'a': 99, 'c': 3, 'b': 5}, 1], [' ', None, 1], ['1', 0, 1], ['1', 1, 1], ['1', 2, 1], ['1', -1, 1], ['1', -9999999999999999, 1], ['1', 9999999999999999, 1], ['1', 0.0, 1], - ['1', inf, 1], ['1', nan, 1], ['1', 3.141592653589793, 1], ['1', '', 1], ['1', ' ', 1], - ['1', 'a bee cd.', -1], ['1', '', 1], ['1', ' ', 1], ['1', '1', 0], ['1', 'a bee cd.', -1], - ['1', set([]), 1], ['1', set([1, 2, 3]), 1], ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], - ['1', {'a': 1, 'c': 3, 'b': 2}, 1], ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], - ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], - ['a bee cd.', -9999999999999999, 1], ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], - ['a bee cd.', inf, 1], ['a bee cd.', nan, 1], ['a bee cd.', 3.141592653589793, 1], - ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', '', 1], - ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', 'a bee cd.', 0], - ['a bee cd.', set([]), 1], ['a bee cd.', set([1, 2, 3]), 1], ['a bee cd.', {5: 3}, 1], - ['a bee cd.', {}, 1], ['a bee cd.', {'a': 99}, 1], ['a bee cd.', {'a': 1, 'c': 3, 'b': 2}, 1], - ['a bee cd.', {'a': 99, 'c': 3, 'b': 5}, 1], ['a bee cd.', None, 1], ['', 0, 1], ['', 1, 1], - ['', 2, 1], ['', -1, 1], ['', -9999999999999999, 1], ['', 9999999999999999, 1], ['', 0.0, 1], - ['', inf, 1], ['', nan, 1], ['', 3.141592653589793, 1], ['', '', 0], ['', ' ', -1], ['', '1', -1], - ['', 'a bee cd.', -1], ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', set([]), 1], - ['', set([1, 2, 3]), 1], ['', {5: 3}, 1], ['', {}, 1], ['', {'a': 99}, 1], - ['', {'a': 1, 'c': 3, 'b': 2}, 1], ['', {'a': 99, 'c': 3, 'b': 5}, 1], ['', None, 1], [' ', 0, 1], - [' ', 1, 1], [' ', 2, 1], [' ', -1, 1], [' ', -9999999999999999, 1], [' ', 9999999999999999, 1], - [' ', 0.0, 1], [' ', inf, 1], [' ', nan, 1], [' ', 3.141592653589793, 1], [' ', '', 1], + ['1', inf, 1], ['1', nan, 1], ['1', 3.141592653589793, 1], ['1', [], 1], ['1', [[]], 1], + ['1', [1, 2, 3], 1], ['1', '', 1], ['1', ' ', 1], ['1', 'a bee cd.', -1], ['1', '', 1], + ['1', ' ', 1], ['1', '1', 0], ['1', 'a bee cd.', -1], ['1', set([]), 1], ['1', set([1, 2, 3]), 1], + ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], ['1', {'a': 1, 'c': 3, 'b': 2}, 1], + ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], + ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], ['a bee cd.', -9999999999999999, 1], + ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], ['a bee cd.', inf, 1], + ['a bee cd.', nan, 1], ['a bee cd.', 3.141592653589793, 1], ['a bee cd.', [], 1], + ['a bee cd.', [[]], 1], ['a bee cd.', [1, 2, 3], 1], ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], + ['a bee cd.', '1', 1], ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], + ['a bee cd.', 'a bee cd.', 0], ['a bee cd.', set([]), 1], ['a bee cd.', set([1, 2, 3]), 1], + ['a bee cd.', {5: 3}, 1], ['a bee cd.', {}, 1], ['a bee cd.', {'a': 99}, 1], + ['a bee cd.', {'a': 1, 'c': 3, 'b': 2}, 1], ['a bee cd.', {'a': 99, 'c': 3, 'b': 5}, 1], + ['a bee cd.', None, 1], ['', 0, 1], ['', 1, 1], ['', 2, 1], ['', -1, 1], + ['', -9999999999999999, 1], ['', 9999999999999999, 1], ['', 0.0, 1], ['', inf, 1], ['', nan, 1], + ['', 3.141592653589793, 1], ['', [], 1], ['', [[]], 1], ['', [1, 2, 3], 1], ['', '', 0], + ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', ' ', -1], ['', '1', -1], + ['', 'a bee cd.', -1], ['', set([]), 1], ['', set([1, 2, 3]), 1], ['', {5: 3}, 1], ['', {}, 1], + ['', {'a': 99}, 1], ['', {'a': 1, 'c': 3, 'b': 2}, 1], ['', {'a': 99, 'c': 3, 'b': 5}, 1], + ['', None, 1], [' ', 0, 1], [' ', 1, 1], [' ', 2, 1], [' ', -1, 1], [' ', -9999999999999999, 1], + [' ', 9999999999999999, 1], [' ', 0.0, 1], [' ', inf, 1], [' ', nan, 1], + [' ', 3.141592653589793, 1], [' ', [], 1], [' ', [[]], 1], [' ', [1, 2, 3], 1], [' ', '', 1], [' ', ' ', 0], [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', '', 1], [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', set([]), 1], [' ', set([1, 2, 3]), 1], [' ', {5: 3}, 1], [' ', {}, 1], [' ', {'a': 99}, 1], [' ', {'a': 1, 'c': 3, 'b': 2}, 1], [' ', {'a': 99, 'c': 3, 'b': 5}, 1], [' ', None, 1], ['1', 0, 1], ['1', 1, 1], ['1', 2, 1], ['1', -1, 1], ['1', -9999999999999999, 1], ['1', 9999999999999999, 1], ['1', 0.0, 1], - ['1', inf, 1], ['1', nan, 1], ['1', 3.141592653589793, 1], ['1', '', 1], ['1', ' ', 1], - ['1', '1', 0], ['1', 'a bee cd.', -1], ['1', '', 1], ['1', ' ', 1], ['1', 'a bee cd.', -1], - ['1', set([]), 1], ['1', set([1, 2, 3]), 1], ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], - ['1', {'a': 1, 'c': 3, 'b': 2}, 1], ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], - ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], - ['a bee cd.', -9999999999999999, 1], ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], - ['a bee cd.', inf, 1], ['a bee cd.', nan, 1], ['a bee cd.', 3.141592653589793, 1], - ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', 'a bee cd.', 0], - ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', set([]), 1], - ['a bee cd.', set([1, 2, 3]), 1], ['a bee cd.', {5: 3}, 1], ['a bee cd.', {}, 1], - ['a bee cd.', {'a': 99}, 1], ['a bee cd.', {'a': 1, 'c': 3, 'b': 2}, 1], - ['a bee cd.', {'a': 99, 'c': 3, 'b': 5}, 1], ['a bee cd.', None, 1], [set([]), 0, 1], - [set([]), 1, 1], [set([]), 2, 1], [set([]), -1, 1], [set([]), -9999999999999999, 1], - [set([]), 9999999999999999, 1], [set([]), 0.0, 1], [set([]), inf, 1], [set([]), nan, 1], - [set([]), 3.141592653589793, 1], [set([]), '', -1], [set([]), ' ', -1], [set([]), '1', -1], - [set([]), 'a bee cd.', -1], [set([]), '', -1], [set([]), ' ', -1], [set([]), '1', -1], - [set([]), 'a bee cd.', -1], + ['1', inf, 1], ['1', nan, 1], ['1', 3.141592653589793, 1], ['1', [], 1], ['1', [[]], 1], + ['1', [1, 2, 3], 1], ['1', '', 1], ['1', ' ', 1], ['1', '1', 0], ['1', 'a bee cd.', -1], + ['1', '', 1], ['1', ' ', 1], ['1', 'a bee cd.', -1], ['1', set([]), 1], ['1', set([1, 2, 3]), 1], + ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], ['1', {'a': 1, 'c': 3, 'b': 2}, 1], + ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], + ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], ['a bee cd.', -9999999999999999, 1], + ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], ['a bee cd.', inf, 1], + ['a bee cd.', nan, 1], ['a bee cd.', 3.141592653589793, 1], ['a bee cd.', [], 1], + ['a bee cd.', [[]], 1], ['a bee cd.', [1, 2, 3], 1], ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], + ['a bee cd.', '1', 1], ['a bee cd.', 'a bee cd.', 0], ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], + ['a bee cd.', '1', 1], ['a bee cd.', set([]), 1], ['a bee cd.', set([1, 2, 3]), 1], + ['a bee cd.', {5: 3}, 1], ['a bee cd.', {}, 1], ['a bee cd.', {'a': 99}, 1], + ['a bee cd.', {'a': 1, 'c': 3, 'b': 2}, 1], ['a bee cd.', {'a': 99, 'c': 3, 'b': 5}, 1], + ['a bee cd.', None, 1], [set([]), 0, 1], [set([]), 1, 1], [set([]), 2, 1], [set([]), -1, 1], + [set([]), -9999999999999999, 1], [set([]), 9999999999999999, 1], [set([]), 0.0, 1], + [set([]), inf, 1], [set([]), nan, 1], [set([]), 3.141592653589793, 1], [set([]), [], 1], + [set([]), [[]], 1], [set([]), [1, 2, 3], 1], [set([]), '', -1], [set([]), ' ', -1], + [set([]), '1', -1], [set([]), 'a bee cd.', -1], [set([]), '', -1], [set([]), ' ', -1], + [set([]), '1', -1], [set([]), 'a bee cd.', -1], [set([]), set([1, 2, 3]), 'TypeError: cannot compare sets using cmp()'], [set([]), {5: 3}, 1], [set([]), {}, 1], [set([]), {'a': 99}, 1], [set([]), {'a': 1, 'c': 3, 'b': 2}, 1], [set([]), {'a': 99, 'c': 3, 'b': 5}, 1], [set([]), None, 1], [set([1, 2, 3]), 0, 1], [set([1, 2, 3]), 1, 1], [set([1, 2, 3]), 2, 1], [set([1, 2, 3]), -1, 1], [set([1, 2, 3]), -9999999999999999, 1], [set([1, 2, 3]), 9999999999999999, 1], [set([1, 2, 3]), 0.0, 1], [set([1, 2, 3]), inf, 1], [set([1, 2, 3]), nan, 1], - [set([1, 2, 3]), 3.141592653589793, 1], [set([1, 2, 3]), '', -1], [set([1, 2, 3]), ' ', -1], + [set([1, 2, 3]), 3.141592653589793, 1], [set([1, 2, 3]), [], 1], [set([1, 2, 3]), [[]], 1], + [set([1, 2, 3]), [1, 2, 3], 1], [set([1, 2, 3]), '', -1], [set([1, 2, 3]), ' ', -1], [set([1, 2, 3]), '1', -1], [set([1, 2, 3]), 'a bee cd.', -1], [set([1, 2, 3]), '', -1], [set([1, 2, 3]), ' ', -1], [set([1, 2, 3]), '1', -1], [set([1, 2, 3]), 'a bee cd.', -1], [set([1, 2, 3]), set([]), 'TypeError: cannot compare sets using cmp()'], [set([1, 2, 3]), {5: 3}, 1], [set([1, 2, 3]), {}, 1], [set([1, 2, 3]), {'a': 99}, 1], [set([1, 2, 3]), {'a': 1, 'c': 3, 'b': 2}, 1], [set([1, 2, 3]), {'a': 99, 'c': 3, 'b': 5}, 1], [set([1, 2, 3]), None, 1], [{5: 3}, 0, 1], [{5: 3}, 1, 1], [{5: 3}, 2, 1], [{5: 3}, -1, 1], - [{5: 3}, -9999999999999999, 1], [{5: 3}, 9999999999999999, 1], [{5: 3}, 0.0, 1], - [{5: 3}, inf, 1], [{5: 3}, nan, 1], [{5: 3}, 3.141592653589793, 1], [{5: 3}, '', -1], - [{5: 3}, ' ', -1], [{5: 3}, '1', -1], [{5: 3}, 'a bee cd.', -1], [{5: 3}, '', -1], - [{5: 3}, ' ', -1], [{5: 3}, '1', -1], [{5: 3}, 'a bee cd.', -1], [{5: 3}, set([]), -1], - [{5: 3}, set([1, 2, 3]), -1], [{5: 3}, {}, 1], [{5: 3}, {'a': 99}, -1], - [{5: 3}, {'a': 1, 'c': 3, 'b': 2}, -1], [{5: 3}, {'a': 99, 'c': 3, 'b': 5}, -1], [{5: 3}, None, 1], - [{}, 0, 1], [{}, 1, 1], [{}, 2, 1], [{}, -1, 1], [{}, -9999999999999999, 1], - [{}, 9999999999999999, 1], [{}, 0.0, 1], [{}, inf, 1], [{}, nan, 1], [{}, 3.141592653589793, 1], + [{5: 3}, -9999999999999999, 1], [{5: 3}, 9999999999999999, 1], [{5: 3}, 0.0, 1], [{5: 3}, inf, 1], + [{5: 3}, nan, 1], [{5: 3}, 3.141592653589793, 1], [{5: 3}, [], -1], [{5: 3}, [[]], -1], + [{5: 3}, [1, 2, 3], -1], [{5: 3}, '', -1], [{5: 3}, ' ', -1], [{5: 3}, '1', -1], + [{5: 3}, 'a bee cd.', -1], [{5: 3}, '', -1], [{5: 3}, ' ', -1], [{5: 3}, '1', -1], + [{5: 3}, 'a bee cd.', -1], [{5: 3}, set([]), -1], [{5: 3}, set([1, 2, 3]), -1], [{5: 3}, {}, 1], + [{5: 3}, {'a': 99}, -1], [{5: 3}, {'a': 1, 'c': 3, 'b': 2}, -1], + [{5: 3}, {'a': 99, 'c': 3, 'b': 5}, -1], [{5: 3}, None, 1], [{}, 0, 1], [{}, 1, 1], [{}, 2, 1], + [{}, -1, 1], [{}, -9999999999999999, 1], [{}, 9999999999999999, 1], [{}, 0.0, 1], [{}, inf, 1], + [{}, nan, 1], [{}, 3.141592653589793, 1], [{}, [], -1], [{}, [[]], -1], [{}, [1, 2, 3], -1], [{}, '', -1], [{}, ' ', -1], [{}, '1', -1], [{}, 'a bee cd.', -1], [{}, '', -1], [{}, ' ', -1], [{}, '1', -1], [{}, 'a bee cd.', -1], [{}, set([]), -1], [{}, set([1, 2, 3]), -1], [{}, {5: 3}, -1], [{}, {'a': 99}, -1], [{}, {'a': 1, 'c': 3, 'b': 2}, -1], [{}, {'a': 99, 'c': 3, 'b': 5}, -1], [{}, None, 1], [{'a': 99}, 0, 1], [{'a': 99}, 1, 1], [{'a': 99}, 2, 1], [{'a': 99}, -1, 1], [{'a': 99}, -9999999999999999, 1], [{'a': 99}, 9999999999999999, 1], [{'a': 99}, 0.0, 1], [{'a': 99}, inf, 1], [{'a': 99}, nan, 1], - [{'a': 99}, 3.141592653589793, 1], [{'a': 99}, '', -1], [{'a': 99}, ' ', -1], [{'a': 99}, '1', -1], + [{'a': 99}, 3.141592653589793, 1], [{'a': 99}, [], -1], [{'a': 99}, [[]], -1], + [{'a': 99}, [1, 2, 3], -1], [{'a': 99}, '', -1], [{'a': 99}, ' ', -1], [{'a': 99}, '1', -1], [{'a': 99}, 'a bee cd.', -1], [{'a': 99}, '', -1], [{'a': 99}, ' ', -1], [{'a': 99}, '1', -1], [{'a': 99}, 'a bee cd.', -1], [{'a': 99}, set([]), -1], [{'a': 99}, set([1, 2, 3]), -1], [{'a': 99}, {5: 3}, 1], [{'a': 99}, {}, 1], [{'a': 99}, {'a': 1, 'c': 3, 'b': 2}, -1], @@ -172,30 +206,35 @@ [{'a': 1, 'c': 3, 'b': 2}, -1, 1], [{'a': 1, 'c': 3, 'b': 2}, -9999999999999999, 1], [{'a': 1, 'c': 3, 'b': 2}, 9999999999999999, 1], [{'a': 1, 'c': 3, 'b': 2}, 0.0, 1], [{'a': 1, 'c': 3, 'b': 2}, inf, 1], [{'a': 1, 'c': 3, 'b': 2}, nan, 1], - [{'a': 1, 'c': 3, 'b': 2}, 3.141592653589793, 1], [{'a': 1, 'c': 3, 'b': 2}, '', -1], - [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], [{'a': 1, 'c': 3, 'b': 2}, '1', -1], - [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], [{'a': 1, 'c': 3, 'b': 2}, '', -1], - [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], [{'a': 1, 'c': 3, 'b': 2}, '1', -1], - [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], [{'a': 1, 'c': 3, 'b': 2}, set([]), -1], - [{'a': 1, 'c': 3, 'b': 2}, set([1, 2, 3]), -1], [{'a': 1, 'c': 3, 'b': 2}, {5: 3}, 1], - [{'a': 1, 'c': 3, 'b': 2}, {}, 1], [{'a': 1, 'c': 3, 'b': 2}, {'a': 99}, 1], + [{'a': 1, 'c': 3, 'b': 2}, 3.141592653589793, 1], [{'a': 1, 'c': 3, 'b': 2}, [], -1], + [{'a': 1, 'c': 3, 'b': 2}, [[]], -1], [{'a': 1, 'c': 3, 'b': 2}, [1, 2, 3], -1], + [{'a': 1, 'c': 3, 'b': 2}, '', -1], [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], + [{'a': 1, 'c': 3, 'b': 2}, '1', -1], [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], + [{'a': 1, 'c': 3, 'b': 2}, '', -1], [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], + [{'a': 1, 'c': 3, 'b': 2}, '1', -1], [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], + [{'a': 1, 'c': 3, 'b': 2}, set([]), -1], [{'a': 1, 'c': 3, 'b': 2}, set([1, 2, 3]), -1], + [{'a': 1, 'c': 3, 'b': 2}, {5: 3}, 1], [{'a': 1, 'c': 3, 'b': 2}, {}, 1], + [{'a': 1, 'c': 3, 'b': 2}, {'a': 99}, 1], [{'a': 1, 'c': 3, 'b': 2}, {'a': 99, 'c': 3, 'b': 5}, -1], [{'a': 1, 'c': 3, 'b': 2}, None, 1], [{'a': 99, 'c': 3, 'b': 5}, 0, 1], [{'a': 99, 'c': 3, 'b': 5}, 1, 1], [{'a': 99, 'c': 3, 'b': 5}, 2, 1], [{'a': 99, 'c': 3, 'b': 5}, -1, 1], [{'a': 99, 'c': 3, 'b': 5}, -9999999999999999, 1], [{'a': 99, 'c': 3, 'b': 5}, 9999999999999999, 1], [{'a': 99, 'c': 3, 'b': 5}, 0.0, 1], [{'a': 99, 'c': 3, 'b': 5}, inf, 1], [{'a': 99, 'c': 3, 'b': 5}, nan, 1], - [{'a': 99, 'c': 3, 'b': 5}, 3.141592653589793, 1], [{'a': 99, 'c': 3, 'b': 5}, '', -1], - [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], [{'a': 99, 'c': 3, 'b': 5}, '1', -1], - [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], [{'a': 99, 'c': 3, 'b': 5}, '', -1], - [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], [{'a': 99, 'c': 3, 'b': 5}, '1', -1], - [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], [{'a': 99, 'c': 3, 'b': 5}, set([]), -1], - [{'a': 99, 'c': 3, 'b': 5}, set([1, 2, 3]), -1], [{'a': 99, 'c': 3, 'b': 5}, {5: 3}, 1], - [{'a': 99, 'c': 3, 'b': 5}, {}, 1], [{'a': 99, 'c': 3, 'b': 5}, {'a': 99}, 1], + [{'a': 99, 'c': 3, 'b': 5}, 3.141592653589793, 1], [{'a': 99, 'c': 3, 'b': 5}, [], -1], + [{'a': 99, 'c': 3, 'b': 5}, [[]], -1], [{'a': 99, 'c': 3, 'b': 5}, [1, 2, 3], -1], + [{'a': 99, 'c': 3, 'b': 5}, '', -1], [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], + [{'a': 99, 'c': 3, 'b': 5}, '1', -1], [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], + [{'a': 99, 'c': 3, 'b': 5}, '', -1], [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], + [{'a': 99, 'c': 3, 'b': 5}, '1', -1], [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], + [{'a': 99, 'c': 3, 'b': 5}, set([]), -1], [{'a': 99, 'c': 3, 'b': 5}, set([1, 2, 3]), -1], + [{'a': 99, 'c': 3, 'b': 5}, {5: 3}, 1], [{'a': 99, 'c': 3, 'b': 5}, {}, 1], + [{'a': 99, 'c': 3, 'b': 5}, {'a': 99}, 1], [{'a': 99, 'c': 3, 'b': 5}, {'a': 1, 'c': 3, 'b': 2}, 1], [{'a': 99, 'c': 3, 'b': 5}, None, 1], [None, 0, -1], [None, 1, -1], [None, 2, -1], [None, -1, -1], [None, -9999999999999999, -1], [None, 9999999999999999, -1], [None, 0.0, -1], [None, inf, -1], [None, nan, -1], - [None, 3.141592653589793, -1], [None, '', -1], [None, ' ', -1], [None, '1', -1], - [None, 'a bee cd.', -1], [None, '', -1], [None, ' ', -1], [None, '1', -1], [None, 'a bee cd.', -1], - [None, set([]), -1], [None, set([1, 2, 3]), -1], [None, {5: 3}, -1], [None, {}, -1], - [None, {'a': 99}, -1], [None, {'a': 1, 'c': 3, 'b': 2}, -1], [None, {'a': 99, 'c': 3, 'b': 5}, -1]] + [None, 3.141592653589793, -1], [None, [], -1], [None, [[]], -1], [None, [1, 2, 3], -1], + [None, '', -1], [None, ' ', -1], [None, '1', -1], [None, 'a bee cd.', -1], [None, '', -1], + [None, ' ', -1], [None, '1', -1], [None, 'a bee cd.', -1], [None, set([]), -1], + [None, set([1, 2, 3]), -1], [None, {5: 3}, -1], [None, {}, -1], [None, {'a': 99}, -1], + [None, {'a': 1, 'c': 3, 'b': 2}, -1], [None, {'a': 99, 'c': 3, 'b': 5}, -1]] From 4dbded1fa5a25087acf1dc073268f2d427fba402 Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 21:23:37 -0700 Subject: [PATCH 08/10] remove nan test --- tests/test_past/test_values.py | 275 ++++++++++++++++----------------- 1 file changed, 130 insertions(+), 145 deletions(-) diff --git a/tests/test_past/test_values.py b/tests/test_past/test_values.py index 7c85a8f2..11872084 100644 --- a/tests/test_past/test_values.py +++ b/tests/test_past/test_values.py @@ -3,7 +3,7 @@ inf, nan = float('inf'), float('nan') test_values = [ 0, 1, 2, -1, -9999999999, 9999999, - 0.0, inf, nan, pi, + 0.0, inf, pi, [], [[]], [1, 2, 3], set(), set([1, 2, 3]), " ", "", "1", "dsada saA.", "2", "dsa", b"", b"dsa", b" ", @@ -12,96 +12,86 @@ # cmp_python2_values are pre-calculated from running cmp under python2 first values are x and y, last is results of cmp cmp_python2_value = [[0, 1, -1], [0, 2, -1], [0, -1, 1], [0, -9999999999999999, 1], [0, 9999999999999999, -1], - [0, 0.0, 0], [0, inf, -1], [0, nan, -1], [0, 3.141592653589793, -1], [0, [], -1], [0, [[]], -1], + [0, 0.0, 0], [0, inf, -1], [0, 3.141592653589793, -1], [0, [], -1], [0, [[]], -1], [0, [1, 2, 3], -1], [0, '', -1], [0, ' ', -1], [0, '1', -1], [0, 'a bee cd.', -1], [0, '', -1], [0, ' ', -1], [0, '1', -1], [0, 'a bee cd.', -1], [0, set([]), -1], [0, set([1, 2, 3]), -1], [0, {5: 3}, -1], [0, {}, -1], [0, {'a': 99}, -1], [0, {'a': 1, 'c': 3, 'b': 2}, -1], [0, {'a': 99, 'c': 3, 'b': 5}, -1], [0, None, 1], [1, 0, 1], [1, 2, -1], [1, -1, 1], - [1, -9999999999999999, 1], [1, 9999999999999999, -1], [1, 0.0, 1], [1, inf, -1], [1, nan, -1], + [1, -9999999999999999, 1], [1, 9999999999999999, -1], [1, 0.0, 1], [1, inf, -1], [1, 3.141592653589793, -1], [1, [], -1], [1, [[]], -1], [1, [1, 2, 3], -1], [1, '', -1], [1, ' ', -1], [1, '1', -1], [1, 'a bee cd.', -1], [1, '', -1], [1, ' ', -1], [1, '1', -1], [1, 'a bee cd.', -1], [1, set([]), -1], [1, set([1, 2, 3]), -1], [1, {5: 3}, -1], [1, {}, -1], [1, {'a': 99}, -1], [1, {'a': 1, 'c': 3, 'b': 2}, -1], [1, {'a': 99, 'c': 3, 'b': 5}, -1], [1, None, 1], [2, 0, 1], [2, 1, 1], [2, -1, 1], [2, -9999999999999999, 1], - [2, 9999999999999999, -1], [2, 0.0, 1], [2, inf, -1], [2, nan, -1], [2, 3.141592653589793, -1], - [2, [], -1], [2, [[]], -1], [2, [1, 2, 3], -1], [2, '', -1], [2, ' ', -1], [2, '1', -1], - [2, 'a bee cd.', -1], [2, '', -1], [2, ' ', -1], [2, '1', -1], [2, 'a bee cd.', -1], - [2, set([]), -1], [2, set([1, 2, 3]), -1], [2, {5: 3}, -1], [2, {}, -1], [2, {'a': 99}, -1], + [2, 9999999999999999, -1], [2, 0.0, 1], [2, inf, -1], [2, 3.141592653589793, -1], [2, [], -1], + [2, [[]], -1], [2, [1, 2, 3], -1], [2, '', -1], [2, ' ', -1], [2, '1', -1], [2, 'a bee cd.', -1], + [2, '', -1], [2, ' ', -1], [2, '1', -1], [2, 'a bee cd.', -1], [2, set([]), -1], + [2, set([1, 2, 3]), -1], [2, {5: 3}, -1], [2, {}, -1], [2, {'a': 99}, -1], [2, {'a': 1, 'c': 3, 'b': 2}, -1], [2, {'a': 99, 'c': 3, 'b': 5}, -1], [2, None, 1], [-1, 0, -1], [-1, 1, -1], [-1, 2, -1], [-1, -9999999999999999, 1], [-1, 9999999999999999, -1], [-1, 0.0, -1], - [-1, inf, -1], [-1, nan, -1], [-1, 3.141592653589793, -1], [-1, [], -1], [-1, [[]], -1], - [-1, [1, 2, 3], -1], [-1, '', -1], [-1, ' ', -1], [-1, '1', -1], [-1, 'a bee cd.', -1], - [-1, '', -1], [-1, ' ', -1], [-1, '1', -1], [-1, 'a bee cd.', -1], [-1, set([]), -1], - [-1, set([1, 2, 3]), -1], [-1, {5: 3}, -1], [-1, {}, -1], [-1, {'a': 99}, -1], - [-1, {'a': 1, 'c': 3, 'b': 2}, -1], [-1, {'a': 99, 'c': 3, 'b': 5}, -1], [-1, None, 1], - [-9999999999999999, 0, -1], [-9999999999999999, 1, -1], [-9999999999999999, 2, -1], - [-9999999999999999, -1, -1], [-9999999999999999, 9999999999999999, -1], - [-9999999999999999, 0.0, -1], [-9999999999999999, inf, -1], [-9999999999999999, nan, -1], - [-9999999999999999, 3.141592653589793, -1], [-9999999999999999, [], -1], - [-9999999999999999, [[]], -1], [-9999999999999999, [1, 2, 3], -1], [-9999999999999999, '', -1], - [-9999999999999999, ' ', -1], [-9999999999999999, '1', -1], [-9999999999999999, 'a bee cd.', -1], + [-1, inf, -1], [-1, 3.141592653589793, -1], [-1, [], -1], [-1, [[]], -1], [-1, [1, 2, 3], -1], + [-1, '', -1], [-1, ' ', -1], [-1, '1', -1], [-1, 'a bee cd.', -1], [-1, '', -1], [-1, ' ', -1], + [-1, '1', -1], [-1, 'a bee cd.', -1], [-1, set([]), -1], [-1, set([1, 2, 3]), -1], + [-1, {5: 3}, -1], [-1, {}, -1], [-1, {'a': 99}, -1], [-1, {'a': 1, 'c': 3, 'b': 2}, -1], + [-1, {'a': 99, 'c': 3, 'b': 5}, -1], [-1, None, 1], [-9999999999999999, 0, -1], + [-9999999999999999, 1, -1], [-9999999999999999, 2, -1], [-9999999999999999, -1, -1], + [-9999999999999999, 9999999999999999, -1], [-9999999999999999, 0.0, -1], + [-9999999999999999, inf, -1], [-9999999999999999, 3.141592653589793, -1], + [-9999999999999999, [], -1], [-9999999999999999, [[]], -1], [-9999999999999999, [1, 2, 3], -1], [-9999999999999999, '', -1], [-9999999999999999, ' ', -1], [-9999999999999999, '1', -1], - [-9999999999999999, 'a bee cd.', -1], [-9999999999999999, set([]), -1], - [-9999999999999999, set([1, 2, 3]), -1], [-9999999999999999, {5: 3}, -1], - [-9999999999999999, {}, -1], [-9999999999999999, {'a': 99}, -1], + [-9999999999999999, 'a bee cd.', -1], [-9999999999999999, '', -1], [-9999999999999999, ' ', -1], + [-9999999999999999, '1', -1], [-9999999999999999, 'a bee cd.', -1], + [-9999999999999999, set([]), -1], [-9999999999999999, set([1, 2, 3]), -1], + [-9999999999999999, {5: 3}, -1], [-9999999999999999, {}, -1], [-9999999999999999, {'a': 99}, -1], [-9999999999999999, {'a': 1, 'c': 3, 'b': 2}, -1], [-9999999999999999, {'a': 99, 'c': 3, 'b': 5}, -1], [-9999999999999999, None, 1], [9999999999999999, 0, 1], [9999999999999999, 1, 1], [9999999999999999, 2, 1], [9999999999999999, -1, 1], [9999999999999999, -9999999999999999, 1], [9999999999999999, 0.0, 1], - [9999999999999999, inf, -1], [9999999999999999, nan, -1], [9999999999999999, 3.141592653589793, 1], - [9999999999999999, [], -1], [9999999999999999, [[]], -1], [9999999999999999, [1, 2, 3], -1], + [9999999999999999, inf, -1], [9999999999999999, 3.141592653589793, 1], [9999999999999999, [], -1], + [9999999999999999, [[]], -1], [9999999999999999, [1, 2, 3], -1], [9999999999999999, '', -1], + [9999999999999999, ' ', -1], [9999999999999999, '1', -1], [9999999999999999, 'a bee cd.', -1], [9999999999999999, '', -1], [9999999999999999, ' ', -1], [9999999999999999, '1', -1], - [9999999999999999, 'a bee cd.', -1], [9999999999999999, '', -1], [9999999999999999, ' ', -1], - [9999999999999999, '1', -1], [9999999999999999, 'a bee cd.', -1], [9999999999999999, set([]), -1], + [9999999999999999, 'a bee cd.', -1], [9999999999999999, set([]), -1], [9999999999999999, set([1, 2, 3]), -1], [9999999999999999, {5: 3}, -1], [9999999999999999, {}, -1], [9999999999999999, {'a': 99}, -1], [9999999999999999, {'a': 1, 'c': 3, 'b': 2}, -1], [9999999999999999, {'a': 99, 'c': 3, 'b': 5}, -1], [9999999999999999, None, 1], [0.0, 0, 0], [0.0, 1, -1], [0.0, 2, -1], [0.0, -1, 1], [0.0, -9999999999999999, 1], [0.0, 9999999999999999, -1], - [0.0, inf, -1], [0.0, nan, 1], [0.0, 3.141592653589793, -1], [0.0, [], -1], [0.0, [[]], -1], - [0.0, [1, 2, 3], -1], [0.0, '', -1], [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], - [0.0, '', -1], [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], [0.0, set([]), -1], + [0.0, inf, -1], [0.0, 3.141592653589793, -1], [0.0, [], -1], [0.0, [[]], -1], [0.0, [1, 2, 3], -1], + [0.0, '', -1], [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], [0.0, '', -1], + [0.0, ' ', -1], [0.0, '1', -1], [0.0, 'a bee cd.', -1], [0.0, set([]), -1], [0.0, set([1, 2, 3]), -1], [0.0, {5: 3}, -1], [0.0, {}, -1], [0.0, {'a': 99}, -1], [0.0, {'a': 1, 'c': 3, 'b': 2}, -1], [0.0, {'a': 99, 'c': 3, 'b': 5}, -1], [0.0, None, 1], [inf, 0, 1], [inf, 1, 1], [inf, 2, 1], [inf, -1, 1], [inf, -9999999999999999, 1], - [inf, 9999999999999999, 1], [inf, 0.0, 1], [inf, nan, 1], [inf, 3.141592653589793, 1], - [inf, [], -1], [inf, [[]], -1], [inf, [1, 2, 3], -1], [inf, '', -1], [inf, ' ', -1], - [inf, '1', -1], [inf, 'a bee cd.', -1], [inf, '', -1], [inf, ' ', -1], [inf, '1', -1], - [inf, 'a bee cd.', -1], [inf, set([]), -1], [inf, set([1, 2, 3]), -1], [inf, {5: 3}, -1], - [inf, {}, -1], [inf, {'a': 99}, -1], [inf, {'a': 1, 'c': 3, 'b': 2}, -1], - [inf, {'a': 99, 'c': 3, 'b': 5}, -1], [inf, None, 1], [nan, 0, 1], [nan, 1, 1], [nan, 2, 1], - [nan, -1, 1], [nan, -9999999999999999, 1], [nan, 9999999999999999, 1], [nan, 0.0, -1], - [nan, inf, -1], [nan, 3.141592653589793, -1], [nan, [], -1], [nan, [[]], -1], [nan, [1, 2, 3], -1], - [nan, '', -1], [nan, ' ', -1], [nan, '1', -1], [nan, 'a bee cd.', -1], [nan, '', -1], - [nan, ' ', -1], [nan, '1', -1], [nan, 'a bee cd.', -1], [nan, set([]), -1], - [nan, set([1, 2, 3]), -1], [nan, {5: 3}, -1], [nan, {}, -1], [nan, {'a': 99}, -1], - [nan, {'a': 1, 'c': 3, 'b': 2}, -1], [nan, {'a': 99, 'c': 3, 'b': 5}, -1], [nan, None, 1], - [3.141592653589793, 0, 1], [3.141592653589793, 1, 1], [3.141592653589793, 2, 1], + [inf, 9999999999999999, 1], [inf, 0.0, 1], [inf, 3.141592653589793, 1], [inf, [], -1], + [inf, [[]], -1], [inf, [1, 2, 3], -1], [inf, '', -1], [inf, ' ', -1], [inf, '1', -1], + [inf, 'a bee cd.', -1], [inf, '', -1], [inf, ' ', -1], [inf, '1', -1], [inf, 'a bee cd.', -1], + [inf, set([]), -1], [inf, set([1, 2, 3]), -1], [inf, {5: 3}, -1], [inf, {}, -1], + [inf, {'a': 99}, -1], [inf, {'a': 1, 'c': 3, 'b': 2}, -1], [inf, {'a': 99, 'c': 3, 'b': 5}, -1], + [inf, None, 1], [3.141592653589793, 0, 1], [3.141592653589793, 1, 1], [3.141592653589793, 2, 1], [3.141592653589793, -1, 1], [3.141592653589793, -9999999999999999, 1], [3.141592653589793, 9999999999999999, -1], [3.141592653589793, 0.0, 1], - [3.141592653589793, inf, -1], [3.141592653589793, nan, 1], [3.141592653589793, [], -1], - [3.141592653589793, [[]], -1], [3.141592653589793, [1, 2, 3], -1], [3.141592653589793, '', -1], + [3.141592653589793, inf, -1], [3.141592653589793, [], -1], [3.141592653589793, [[]], -1], + [3.141592653589793, [1, 2, 3], -1], [3.141592653589793, '', -1], [3.141592653589793, ' ', -1], + [3.141592653589793, '1', -1], [3.141592653589793, 'a bee cd.', -1], [3.141592653589793, '', -1], [3.141592653589793, ' ', -1], [3.141592653589793, '1', -1], [3.141592653589793, 'a bee cd.', -1], - [3.141592653589793, '', -1], [3.141592653589793, ' ', -1], [3.141592653589793, '1', -1], - [3.141592653589793, 'a bee cd.', -1], [3.141592653589793, set([]), -1], - [3.141592653589793, set([1, 2, 3]), -1], [3.141592653589793, {5: 3}, -1], - [3.141592653589793, {}, -1], [3.141592653589793, {'a': 99}, -1], + [3.141592653589793, set([]), -1], [3.141592653589793, set([1, 2, 3]), -1], + [3.141592653589793, {5: 3}, -1], [3.141592653589793, {}, -1], [3.141592653589793, {'a': 99}, -1], [3.141592653589793, {'a': 1, 'c': 3, 'b': 2}, -1], [3.141592653589793, {'a': 99, 'c': 3, 'b': 5}, -1], [3.141592653589793, None, 1], [[], 0, 1], [[], 1, 1], [[], 2, 1], [[], -1, 1], [[], -9999999999999999, 1], [[], 9999999999999999, 1], - [[], 0.0, 1], [[], inf, 1], [[], nan, 1], [[], 3.141592653589793, 1], [[], [[]], -1], - [[], [1, 2, 3], -1], [[], '', -1], [[], ' ', -1], [[], '1', -1], [[], 'a bee cd.', -1], - [[], '', -1], [[], ' ', -1], [[], '1', -1], [[], 'a bee cd.', -1], [[], set([]), -1], - [[], set([1, 2, 3]), -1], [[], {5: 3}, 1], [[], {}, 1], [[], {'a': 99}, 1], - [[], {'a': 1, 'c': 3, 'b': 2}, 1], [[], {'a': 99, 'c': 3, 'b': 5}, 1], [[], None, 1], [[[]], 0, 1], - [[[]], 1, 1], [[[]], 2, 1], [[[]], -1, 1], [[[]], -9999999999999999, 1], - [[[]], 9999999999999999, 1], [[[]], 0.0, 1], [[[]], inf, 1], [[[]], nan, 1], - [[[]], 3.141592653589793, 1], [[[]], [], 1], [[[]], [1, 2, 3], 1], [[[]], '', -1], [[[]], ' ', -1], - [[[]], '1', -1], [[[]], 'a bee cd.', -1], [[[]], '', -1], [[[]], ' ', -1], [[[]], '1', -1], - [[[]], 'a bee cd.', -1], [[[]], set([]), -1], [[[]], set([1, 2, 3]), -1], [[[]], {5: 3}, 1], - [[[]], {}, 1], [[[]], {'a': 99}, 1], [[[]], {'a': 1, 'c': 3, 'b': 2}, 1], + [[], 0.0, 1], [[], inf, 1], [[], 3.141592653589793, 1], [[], [[]], -1], [[], [1, 2, 3], -1], + [[], '', -1], [[], ' ', -1], [[], '1', -1], [[], 'a bee cd.', -1], [[], '', -1], [[], ' ', -1], + [[], '1', -1], [[], 'a bee cd.', -1], [[], set([]), -1], [[], set([1, 2, 3]), -1], [[], {5: 3}, 1], + [[], {}, 1], [[], {'a': 99}, 1], [[], {'a': 1, 'c': 3, 'b': 2}, 1], + [[], {'a': 99, 'c': 3, 'b': 5}, 1], [[], None, 1], [[[]], 0, 1], [[[]], 1, 1], [[[]], 2, 1], + [[[]], -1, 1], [[[]], -9999999999999999, 1], [[[]], 9999999999999999, 1], [[[]], 0.0, 1], + [[[]], inf, 1], [[[]], 3.141592653589793, 1], [[[]], [], 1], [[[]], [1, 2, 3], 1], [[[]], '', -1], + [[[]], ' ', -1], [[[]], '1', -1], [[[]], 'a bee cd.', -1], [[[]], '', -1], [[[]], ' ', -1], + [[[]], '1', -1], [[[]], 'a bee cd.', -1], [[[]], set([]), -1], [[[]], set([1, 2, 3]), -1], + [[[]], {5: 3}, 1], [[[]], {}, 1], [[[]], {'a': 99}, 1], [[[]], {'a': 1, 'c': 3, 'b': 2}, 1], [[[]], {'a': 99, 'c': 3, 'b': 5}, 1], [[[]], None, 1], [[1, 2, 3], 0, 1], [[1, 2, 3], 1, 1], [[1, 2, 3], 2, 1], [[1, 2, 3], -1, 1], [[1, 2, 3], -9999999999999999, 1], - [[1, 2, 3], 9999999999999999, 1], [[1, 2, 3], 0.0, 1], [[1, 2, 3], inf, 1], [[1, 2, 3], nan, 1], + [[1, 2, 3], 9999999999999999, 1], [[1, 2, 3], 0.0, 1], [[1, 2, 3], inf, 1], [[1, 2, 3], 3.141592653589793, 1], [[1, 2, 3], [], 1], [[1, 2, 3], [[]], -1], [[1, 2, 3], '', -1], [[1, 2, 3], ' ', -1], [[1, 2, 3], '1', -1], [[1, 2, 3], 'a bee cd.', -1], [[1, 2, 3], '', -1], [[1, 2, 3], ' ', -1], [[1, 2, 3], '1', -1], [[1, 2, 3], 'a bee cd.', -1], [[1, 2, 3], set([]), -1], @@ -109,53 +99,51 @@ [[1, 2, 3], {'a': 99}, 1], [[1, 2, 3], {'a': 1, 'c': 3, 'b': 2}, 1], [[1, 2, 3], {'a': 99, 'c': 3, 'b': 5}, 1], [[1, 2, 3], None, 1], ['', 0, 1], ['', 1, 1], ['', 2, 1], ['', -1, 1], ['', -9999999999999999, 1], ['', 9999999999999999, 1], ['', 0.0, 1], - ['', inf, 1], ['', nan, 1], ['', 3.141592653589793, 1], ['', [], 1], ['', [[]], 1], - ['', [1, 2, 3], 1], ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', '', 0], - ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', set([]), 1], ['', set([1, 2, 3]), 1], - ['', {5: 3}, 1], ['', {}, 1], ['', {'a': 99}, 1], ['', {'a': 1, 'c': 3, 'b': 2}, 1], - ['', {'a': 99, 'c': 3, 'b': 5}, 1], ['', None, 1], [' ', 0, 1], [' ', 1, 1], [' ', 2, 1], - [' ', -1, 1], [' ', -9999999999999999, 1], [' ', 9999999999999999, 1], [' ', 0.0, 1], - [' ', inf, 1], [' ', nan, 1], [' ', 3.141592653589793, 1], [' ', [], 1], [' ', [[]], 1], - [' ', [1, 2, 3], 1], [' ', '', 1], [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', '', 1], - [' ', ' ', 0], [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', set([]), 1], [' ', set([1, 2, 3]), 1], - [' ', {5: 3}, 1], [' ', {}, 1], [' ', {'a': 99}, 1], [' ', {'a': 1, 'c': 3, 'b': 2}, 1], - [' ', {'a': 99, 'c': 3, 'b': 5}, 1], [' ', None, 1], ['1', 0, 1], ['1', 1, 1], ['1', 2, 1], - ['1', -1, 1], ['1', -9999999999999999, 1], ['1', 9999999999999999, 1], ['1', 0.0, 1], - ['1', inf, 1], ['1', nan, 1], ['1', 3.141592653589793, 1], ['1', [], 1], ['1', [[]], 1], - ['1', [1, 2, 3], 1], ['1', '', 1], ['1', ' ', 1], ['1', 'a bee cd.', -1], ['1', '', 1], - ['1', ' ', 1], ['1', '1', 0], ['1', 'a bee cd.', -1], ['1', set([]), 1], ['1', set([1, 2, 3]), 1], - ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], ['1', {'a': 1, 'c': 3, 'b': 2}, 1], - ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], - ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], ['a bee cd.', -9999999999999999, 1], - ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], ['a bee cd.', inf, 1], - ['a bee cd.', nan, 1], ['a bee cd.', 3.141592653589793, 1], ['a bee cd.', [], 1], + ['', inf, 1], ['', 3.141592653589793, 1], ['', [], 1], ['', [[]], 1], ['', [1, 2, 3], 1], + ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', '', 0], ['', ' ', -1], ['', '1', -1], + ['', 'a bee cd.', -1], ['', set([]), 1], ['', set([1, 2, 3]), 1], ['', {5: 3}, 1], ['', {}, 1], + ['', {'a': 99}, 1], ['', {'a': 1, 'c': 3, 'b': 2}, 1], ['', {'a': 99, 'c': 3, 'b': 5}, 1], + ['', None, 1], [' ', 0, 1], [' ', 1, 1], [' ', 2, 1], [' ', -1, 1], [' ', -9999999999999999, 1], + [' ', 9999999999999999, 1], [' ', 0.0, 1], [' ', inf, 1], [' ', 3.141592653589793, 1], + [' ', [], 1], [' ', [[]], 1], [' ', [1, 2, 3], 1], [' ', '', 1], [' ', '1', -1], + [' ', 'a bee cd.', -1], [' ', '', 1], [' ', ' ', 0], [' ', '1', -1], [' ', 'a bee cd.', -1], + [' ', set([]), 1], [' ', set([1, 2, 3]), 1], [' ', {5: 3}, 1], [' ', {}, 1], [' ', {'a': 99}, 1], + [' ', {'a': 1, 'c': 3, 'b': 2}, 1], [' ', {'a': 99, 'c': 3, 'b': 5}, 1], [' ', None, 1], + ['1', 0, 1], ['1', 1, 1], ['1', 2, 1], ['1', -1, 1], ['1', -9999999999999999, 1], + ['1', 9999999999999999, 1], ['1', 0.0, 1], ['1', inf, 1], ['1', 3.141592653589793, 1], + ['1', [], 1], ['1', [[]], 1], ['1', [1, 2, 3], 1], ['1', '', 1], ['1', ' ', 1], + ['1', 'a bee cd.', -1], ['1', '', 1], ['1', ' ', 1], ['1', '1', 0], ['1', 'a bee cd.', -1], + ['1', set([]), 1], ['1', set([1, 2, 3]), 1], ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], + ['1', {'a': 1, 'c': 3, 'b': 2}, 1], ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], + ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], + ['a bee cd.', -9999999999999999, 1], ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], + ['a bee cd.', inf, 1], ['a bee cd.', 3.141592653589793, 1], ['a bee cd.', [], 1], ['a bee cd.', [[]], 1], ['a bee cd.', [1, 2, 3], 1], ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', 'a bee cd.', 0], ['a bee cd.', set([]), 1], ['a bee cd.', set([1, 2, 3]), 1], ['a bee cd.', {5: 3}, 1], ['a bee cd.', {}, 1], ['a bee cd.', {'a': 99}, 1], ['a bee cd.', {'a': 1, 'c': 3, 'b': 2}, 1], ['a bee cd.', {'a': 99, 'c': 3, 'b': 5}, 1], ['a bee cd.', None, 1], ['', 0, 1], ['', 1, 1], ['', 2, 1], ['', -1, 1], - ['', -9999999999999999, 1], ['', 9999999999999999, 1], ['', 0.0, 1], ['', inf, 1], ['', nan, 1], + ['', -9999999999999999, 1], ['', 9999999999999999, 1], ['', 0.0, 1], ['', inf, 1], ['', 3.141592653589793, 1], ['', [], 1], ['', [[]], 1], ['', [1, 2, 3], 1], ['', '', 0], ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', ' ', -1], ['', '1', -1], ['', 'a bee cd.', -1], ['', set([]), 1], ['', set([1, 2, 3]), 1], ['', {5: 3}, 1], ['', {}, 1], ['', {'a': 99}, 1], ['', {'a': 1, 'c': 3, 'b': 2}, 1], ['', {'a': 99, 'c': 3, 'b': 5}, 1], ['', None, 1], [' ', 0, 1], [' ', 1, 1], [' ', 2, 1], [' ', -1, 1], [' ', -9999999999999999, 1], - [' ', 9999999999999999, 1], [' ', 0.0, 1], [' ', inf, 1], [' ', nan, 1], - [' ', 3.141592653589793, 1], [' ', [], 1], [' ', [[]], 1], [' ', [1, 2, 3], 1], [' ', '', 1], - [' ', ' ', 0], [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', '', 1], [' ', '1', -1], - [' ', 'a bee cd.', -1], [' ', set([]), 1], [' ', set([1, 2, 3]), 1], [' ', {5: 3}, 1], - [' ', {}, 1], [' ', {'a': 99}, 1], [' ', {'a': 1, 'c': 3, 'b': 2}, 1], - [' ', {'a': 99, 'c': 3, 'b': 5}, 1], [' ', None, 1], ['1', 0, 1], ['1', 1, 1], ['1', 2, 1], - ['1', -1, 1], ['1', -9999999999999999, 1], ['1', 9999999999999999, 1], ['1', 0.0, 1], - ['1', inf, 1], ['1', nan, 1], ['1', 3.141592653589793, 1], ['1', [], 1], ['1', [[]], 1], - ['1', [1, 2, 3], 1], ['1', '', 1], ['1', ' ', 1], ['1', '1', 0], ['1', 'a bee cd.', -1], - ['1', '', 1], ['1', ' ', 1], ['1', 'a bee cd.', -1], ['1', set([]), 1], ['1', set([1, 2, 3]), 1], - ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], ['1', {'a': 1, 'c': 3, 'b': 2}, 1], - ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], - ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], ['a bee cd.', -9999999999999999, 1], - ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], ['a bee cd.', inf, 1], - ['a bee cd.', nan, 1], ['a bee cd.', 3.141592653589793, 1], ['a bee cd.', [], 1], + [' ', 9999999999999999, 1], [' ', 0.0, 1], [' ', inf, 1], [' ', 3.141592653589793, 1], + [' ', [], 1], [' ', [[]], 1], [' ', [1, 2, 3], 1], [' ', '', 1], [' ', ' ', 0], [' ', '1', -1], + [' ', 'a bee cd.', -1], [' ', '', 1], [' ', '1', -1], [' ', 'a bee cd.', -1], [' ', set([]), 1], + [' ', set([1, 2, 3]), 1], [' ', {5: 3}, 1], [' ', {}, 1], [' ', {'a': 99}, 1], + [' ', {'a': 1, 'c': 3, 'b': 2}, 1], [' ', {'a': 99, 'c': 3, 'b': 5}, 1], [' ', None, 1], + ['1', 0, 1], ['1', 1, 1], ['1', 2, 1], ['1', -1, 1], ['1', -9999999999999999, 1], + ['1', 9999999999999999, 1], ['1', 0.0, 1], ['1', inf, 1], ['1', 3.141592653589793, 1], + ['1', [], 1], ['1', [[]], 1], ['1', [1, 2, 3], 1], ['1', '', 1], ['1', ' ', 1], ['1', '1', 0], + ['1', 'a bee cd.', -1], ['1', '', 1], ['1', ' ', 1], ['1', 'a bee cd.', -1], ['1', set([]), 1], + ['1', set([1, 2, 3]), 1], ['1', {5: 3}, 1], ['1', {}, 1], ['1', {'a': 99}, 1], + ['1', {'a': 1, 'c': 3, 'b': 2}, 1], ['1', {'a': 99, 'c': 3, 'b': 5}, 1], ['1', None, 1], + ['a bee cd.', 0, 1], ['a bee cd.', 1, 1], ['a bee cd.', 2, 1], ['a bee cd.', -1, 1], + ['a bee cd.', -9999999999999999, 1], ['a bee cd.', 9999999999999999, 1], ['a bee cd.', 0.0, 1], + ['a bee cd.', inf, 1], ['a bee cd.', 3.141592653589793, 1], ['a bee cd.', [], 1], ['a bee cd.', [[]], 1], ['a bee cd.', [1, 2, 3], 1], ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', 'a bee cd.', 0], ['a bee cd.', '', 1], ['a bee cd.', ' ', 1], ['a bee cd.', '1', 1], ['a bee cd.', set([]), 1], ['a bee cd.', set([1, 2, 3]), 1], @@ -163,40 +151,39 @@ ['a bee cd.', {'a': 1, 'c': 3, 'b': 2}, 1], ['a bee cd.', {'a': 99, 'c': 3, 'b': 5}, 1], ['a bee cd.', None, 1], [set([]), 0, 1], [set([]), 1, 1], [set([]), 2, 1], [set([]), -1, 1], [set([]), -9999999999999999, 1], [set([]), 9999999999999999, 1], [set([]), 0.0, 1], - [set([]), inf, 1], [set([]), nan, 1], [set([]), 3.141592653589793, 1], [set([]), [], 1], - [set([]), [[]], 1], [set([]), [1, 2, 3], 1], [set([]), '', -1], [set([]), ' ', -1], - [set([]), '1', -1], [set([]), 'a bee cd.', -1], [set([]), '', -1], [set([]), ' ', -1], - [set([]), '1', -1], [set([]), 'a bee cd.', -1], + [set([]), inf, 1], [set([]), 3.141592653589793, 1], [set([]), [], 1], [set([]), [[]], 1], + [set([]), [1, 2, 3], 1], [set([]), '', -1], [set([]), ' ', -1], [set([]), '1', -1], + [set([]), 'a bee cd.', -1], [set([]), '', -1], [set([]), ' ', -1], [set([]), '1', -1], + [set([]), 'a bee cd.', -1], [set([]), set([1, 2, 3]), 'TypeError: cannot compare sets using cmp()'], [set([]), {5: 3}, 1], [set([]), {}, 1], [set([]), {'a': 99}, 1], [set([]), {'a': 1, 'c': 3, 'b': 2}, 1], [set([]), {'a': 99, 'c': 3, 'b': 5}, 1], [set([]), None, 1], [set([1, 2, 3]), 0, 1], [set([1, 2, 3]), 1, 1], [set([1, 2, 3]), 2, 1], [set([1, 2, 3]), -1, 1], [set([1, 2, 3]), -9999999999999999, 1], [set([1, 2, 3]), 9999999999999999, 1], - [set([1, 2, 3]), 0.0, 1], [set([1, 2, 3]), inf, 1], [set([1, 2, 3]), nan, 1], - [set([1, 2, 3]), 3.141592653589793, 1], [set([1, 2, 3]), [], 1], [set([1, 2, 3]), [[]], 1], - [set([1, 2, 3]), [1, 2, 3], 1], [set([1, 2, 3]), '', -1], [set([1, 2, 3]), ' ', -1], - [set([1, 2, 3]), '1', -1], [set([1, 2, 3]), 'a bee cd.', -1], [set([1, 2, 3]), '', -1], - [set([1, 2, 3]), ' ', -1], [set([1, 2, 3]), '1', -1], [set([1, 2, 3]), 'a bee cd.', -1], + [set([1, 2, 3]), 0.0, 1], [set([1, 2, 3]), inf, 1], [set([1, 2, 3]), 3.141592653589793, 1], + [set([1, 2, 3]), [], 1], [set([1, 2, 3]), [[]], 1], [set([1, 2, 3]), [1, 2, 3], 1], + [set([1, 2, 3]), '', -1], [set([1, 2, 3]), ' ', -1], [set([1, 2, 3]), '1', -1], + [set([1, 2, 3]), 'a bee cd.', -1], [set([1, 2, 3]), '', -1], [set([1, 2, 3]), ' ', -1], + [set([1, 2, 3]), '1', -1], [set([1, 2, 3]), 'a bee cd.', -1], [set([1, 2, 3]), set([]), 'TypeError: cannot compare sets using cmp()'], [set([1, 2, 3]), {5: 3}, 1], [set([1, 2, 3]), {}, 1], [set([1, 2, 3]), {'a': 99}, 1], [set([1, 2, 3]), {'a': 1, 'c': 3, 'b': 2}, 1], [set([1, 2, 3]), {'a': 99, 'c': 3, 'b': 5}, 1], [set([1, 2, 3]), None, 1], [{5: 3}, 0, 1], [{5: 3}, 1, 1], [{5: 3}, 2, 1], [{5: 3}, -1, 1], [{5: 3}, -9999999999999999, 1], [{5: 3}, 9999999999999999, 1], [{5: 3}, 0.0, 1], [{5: 3}, inf, 1], - [{5: 3}, nan, 1], [{5: 3}, 3.141592653589793, 1], [{5: 3}, [], -1], [{5: 3}, [[]], -1], - [{5: 3}, [1, 2, 3], -1], [{5: 3}, '', -1], [{5: 3}, ' ', -1], [{5: 3}, '1', -1], - [{5: 3}, 'a bee cd.', -1], [{5: 3}, '', -1], [{5: 3}, ' ', -1], [{5: 3}, '1', -1], - [{5: 3}, 'a bee cd.', -1], [{5: 3}, set([]), -1], [{5: 3}, set([1, 2, 3]), -1], [{5: 3}, {}, 1], - [{5: 3}, {'a': 99}, -1], [{5: 3}, {'a': 1, 'c': 3, 'b': 2}, -1], - [{5: 3}, {'a': 99, 'c': 3, 'b': 5}, -1], [{5: 3}, None, 1], [{}, 0, 1], [{}, 1, 1], [{}, 2, 1], - [{}, -1, 1], [{}, -9999999999999999, 1], [{}, 9999999999999999, 1], [{}, 0.0, 1], [{}, inf, 1], - [{}, nan, 1], [{}, 3.141592653589793, 1], [{}, [], -1], [{}, [[]], -1], [{}, [1, 2, 3], -1], - [{}, '', -1], [{}, ' ', -1], [{}, '1', -1], [{}, 'a bee cd.', -1], [{}, '', -1], [{}, ' ', -1], - [{}, '1', -1], [{}, 'a bee cd.', -1], [{}, set([]), -1], [{}, set([1, 2, 3]), -1], - [{}, {5: 3}, -1], [{}, {'a': 99}, -1], [{}, {'a': 1, 'c': 3, 'b': 2}, -1], - [{}, {'a': 99, 'c': 3, 'b': 5}, -1], [{}, None, 1], [{'a': 99}, 0, 1], [{'a': 99}, 1, 1], - [{'a': 99}, 2, 1], [{'a': 99}, -1, 1], [{'a': 99}, -9999999999999999, 1], - [{'a': 99}, 9999999999999999, 1], [{'a': 99}, 0.0, 1], [{'a': 99}, inf, 1], [{'a': 99}, nan, 1], - [{'a': 99}, 3.141592653589793, 1], [{'a': 99}, [], -1], [{'a': 99}, [[]], -1], + [{5: 3}, 3.141592653589793, 1], [{5: 3}, [], -1], [{5: 3}, [[]], -1], [{5: 3}, [1, 2, 3], -1], + [{5: 3}, '', -1], [{5: 3}, ' ', -1], [{5: 3}, '1', -1], [{5: 3}, 'a bee cd.', -1], + [{5: 3}, '', -1], [{5: 3}, ' ', -1], [{5: 3}, '1', -1], [{5: 3}, 'a bee cd.', -1], + [{5: 3}, set([]), -1], [{5: 3}, set([1, 2, 3]), -1], [{5: 3}, {}, 1], [{5: 3}, {'a': 99}, -1], + [{5: 3}, {'a': 1, 'c': 3, 'b': 2}, -1], [{5: 3}, {'a': 99, 'c': 3, 'b': 5}, -1], [{5: 3}, None, 1], + [{}, 0, 1], [{}, 1, 1], [{}, 2, 1], [{}, -1, 1], [{}, -9999999999999999, 1], + [{}, 9999999999999999, 1], [{}, 0.0, 1], [{}, inf, 1], [{}, 3.141592653589793, 1], [{}, [], -1], + [{}, [[]], -1], [{}, [1, 2, 3], -1], [{}, '', -1], [{}, ' ', -1], [{}, '1', -1], + [{}, 'a bee cd.', -1], [{}, '', -1], [{}, ' ', -1], [{}, '1', -1], [{}, 'a bee cd.', -1], + [{}, set([]), -1], [{}, set([1, 2, 3]), -1], [{}, {5: 3}, -1], [{}, {'a': 99}, -1], + [{}, {'a': 1, 'c': 3, 'b': 2}, -1], [{}, {'a': 99, 'c': 3, 'b': 5}, -1], [{}, None, 1], + [{'a': 99}, 0, 1], [{'a': 99}, 1, 1], [{'a': 99}, 2, 1], [{'a': 99}, -1, 1], + [{'a': 99}, -9999999999999999, 1], [{'a': 99}, 9999999999999999, 1], [{'a': 99}, 0.0, 1], + [{'a': 99}, inf, 1], [{'a': 99}, 3.141592653589793, 1], [{'a': 99}, [], -1], [{'a': 99}, [[]], -1], [{'a': 99}, [1, 2, 3], -1], [{'a': 99}, '', -1], [{'a': 99}, ' ', -1], [{'a': 99}, '1', -1], [{'a': 99}, 'a bee cd.', -1], [{'a': 99}, '', -1], [{'a': 99}, ' ', -1], [{'a': 99}, '1', -1], [{'a': 99}, 'a bee cd.', -1], [{'a': 99}, set([]), -1], [{'a': 99}, set([1, 2, 3]), -1], @@ -205,36 +192,34 @@ [{'a': 1, 'c': 3, 'b': 2}, 1, 1], [{'a': 1, 'c': 3, 'b': 2}, 2, 1], [{'a': 1, 'c': 3, 'b': 2}, -1, 1], [{'a': 1, 'c': 3, 'b': 2}, -9999999999999999, 1], [{'a': 1, 'c': 3, 'b': 2}, 9999999999999999, 1], [{'a': 1, 'c': 3, 'b': 2}, 0.0, 1], - [{'a': 1, 'c': 3, 'b': 2}, inf, 1], [{'a': 1, 'c': 3, 'b': 2}, nan, 1], - [{'a': 1, 'c': 3, 'b': 2}, 3.141592653589793, 1], [{'a': 1, 'c': 3, 'b': 2}, [], -1], - [{'a': 1, 'c': 3, 'b': 2}, [[]], -1], [{'a': 1, 'c': 3, 'b': 2}, [1, 2, 3], -1], - [{'a': 1, 'c': 3, 'b': 2}, '', -1], [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], - [{'a': 1, 'c': 3, 'b': 2}, '1', -1], [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], - [{'a': 1, 'c': 3, 'b': 2}, '', -1], [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], - [{'a': 1, 'c': 3, 'b': 2}, '1', -1], [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], - [{'a': 1, 'c': 3, 'b': 2}, set([]), -1], [{'a': 1, 'c': 3, 'b': 2}, set([1, 2, 3]), -1], - [{'a': 1, 'c': 3, 'b': 2}, {5: 3}, 1], [{'a': 1, 'c': 3, 'b': 2}, {}, 1], - [{'a': 1, 'c': 3, 'b': 2}, {'a': 99}, 1], + [{'a': 1, 'c': 3, 'b': 2}, inf, 1], [{'a': 1, 'c': 3, 'b': 2}, 3.141592653589793, 1], + [{'a': 1, 'c': 3, 'b': 2}, [], -1], [{'a': 1, 'c': 3, 'b': 2}, [[]], -1], + [{'a': 1, 'c': 3, 'b': 2}, [1, 2, 3], -1], [{'a': 1, 'c': 3, 'b': 2}, '', -1], + [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], [{'a': 1, 'c': 3, 'b': 2}, '1', -1], + [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], [{'a': 1, 'c': 3, 'b': 2}, '', -1], + [{'a': 1, 'c': 3, 'b': 2}, ' ', -1], [{'a': 1, 'c': 3, 'b': 2}, '1', -1], + [{'a': 1, 'c': 3, 'b': 2}, 'a bee cd.', -1], [{'a': 1, 'c': 3, 'b': 2}, set([]), -1], + [{'a': 1, 'c': 3, 'b': 2}, set([1, 2, 3]), -1], [{'a': 1, 'c': 3, 'b': 2}, {5: 3}, 1], + [{'a': 1, 'c': 3, 'b': 2}, {}, 1], [{'a': 1, 'c': 3, 'b': 2}, {'a': 99}, 1], [{'a': 1, 'c': 3, 'b': 2}, {'a': 99, 'c': 3, 'b': 5}, -1], [{'a': 1, 'c': 3, 'b': 2}, None, 1], [{'a': 99, 'c': 3, 'b': 5}, 0, 1], [{'a': 99, 'c': 3, 'b': 5}, 1, 1], [{'a': 99, 'c': 3, 'b': 5}, 2, 1], [{'a': 99, 'c': 3, 'b': 5}, -1, 1], [{'a': 99, 'c': 3, 'b': 5}, -9999999999999999, 1], [{'a': 99, 'c': 3, 'b': 5}, 9999999999999999, 1], [{'a': 99, 'c': 3, 'b': 5}, 0.0, 1], - [{'a': 99, 'c': 3, 'b': 5}, inf, 1], [{'a': 99, 'c': 3, 'b': 5}, nan, 1], - [{'a': 99, 'c': 3, 'b': 5}, 3.141592653589793, 1], [{'a': 99, 'c': 3, 'b': 5}, [], -1], - [{'a': 99, 'c': 3, 'b': 5}, [[]], -1], [{'a': 99, 'c': 3, 'b': 5}, [1, 2, 3], -1], - [{'a': 99, 'c': 3, 'b': 5}, '', -1], [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], - [{'a': 99, 'c': 3, 'b': 5}, '1', -1], [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], - [{'a': 99, 'c': 3, 'b': 5}, '', -1], [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], - [{'a': 99, 'c': 3, 'b': 5}, '1', -1], [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], - [{'a': 99, 'c': 3, 'b': 5}, set([]), -1], [{'a': 99, 'c': 3, 'b': 5}, set([1, 2, 3]), -1], - [{'a': 99, 'c': 3, 'b': 5}, {5: 3}, 1], [{'a': 99, 'c': 3, 'b': 5}, {}, 1], - [{'a': 99, 'c': 3, 'b': 5}, {'a': 99}, 1], + [{'a': 99, 'c': 3, 'b': 5}, inf, 1], [{'a': 99, 'c': 3, 'b': 5}, 3.141592653589793, 1], + [{'a': 99, 'c': 3, 'b': 5}, [], -1], [{'a': 99, 'c': 3, 'b': 5}, [[]], -1], + [{'a': 99, 'c': 3, 'b': 5}, [1, 2, 3], -1], [{'a': 99, 'c': 3, 'b': 5}, '', -1], + [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], [{'a': 99, 'c': 3, 'b': 5}, '1', -1], + [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], [{'a': 99, 'c': 3, 'b': 5}, '', -1], + [{'a': 99, 'c': 3, 'b': 5}, ' ', -1], [{'a': 99, 'c': 3, 'b': 5}, '1', -1], + [{'a': 99, 'c': 3, 'b': 5}, 'a bee cd.', -1], [{'a': 99, 'c': 3, 'b': 5}, set([]), -1], + [{'a': 99, 'c': 3, 'b': 5}, set([1, 2, 3]), -1], [{'a': 99, 'c': 3, 'b': 5}, {5: 3}, 1], + [{'a': 99, 'c': 3, 'b': 5}, {}, 1], [{'a': 99, 'c': 3, 'b': 5}, {'a': 99}, 1], [{'a': 99, 'c': 3, 'b': 5}, {'a': 1, 'c': 3, 'b': 2}, 1], [{'a': 99, 'c': 3, 'b': 5}, None, 1], [None, 0, -1], [None, 1, -1], [None, 2, -1], [None, -1, -1], [None, -9999999999999999, -1], - [None, 9999999999999999, -1], [None, 0.0, -1], [None, inf, -1], [None, nan, -1], - [None, 3.141592653589793, -1], [None, [], -1], [None, [[]], -1], [None, [1, 2, 3], -1], - [None, '', -1], [None, ' ', -1], [None, '1', -1], [None, 'a bee cd.', -1], [None, '', -1], - [None, ' ', -1], [None, '1', -1], [None, 'a bee cd.', -1], [None, set([]), -1], - [None, set([1, 2, 3]), -1], [None, {5: 3}, -1], [None, {}, -1], [None, {'a': 99}, -1], - [None, {'a': 1, 'c': 3, 'b': 2}, -1], [None, {'a': 99, 'c': 3, 'b': 5}, -1]] + [None, 9999999999999999, -1], [None, 0.0, -1], [None, inf, -1], [None, 3.141592653589793, -1], + [None, [], -1], [None, [[]], -1], [None, [1, 2, 3], -1], [None, '', -1], [None, ' ', -1], + [None, '1', -1], [None, 'a bee cd.', -1], [None, '', -1], [None, ' ', -1], [None, '1', -1], + [None, 'a bee cd.', -1], [None, set([]), -1], [None, set([1, 2, 3]), -1], [None, {5: 3}, -1], + [None, {}, -1], [None, {'a': 99}, -1], [None, {'a': 1, 'c': 3, 'b': 2}, -1], + [None, {'a': 99, 'c': 3, 'b': 5}, -1]] From 3f1ff7eddff8df70137bcd7d627e7af59c8816ed Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 22:01:21 -0700 Subject: [PATCH 09/10] fix 2.6 test --- tests/test_past/test_misc.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_past/test_misc.py b/tests/test_past/test_misc.py index db07896f..ab67bfdd 100644 --- a/tests/test_past/test_misc.py +++ b/tests/test_past/test_misc.py @@ -11,7 +11,7 @@ from contextlib import contextmanager from future.tests.base import unittest -from future.utils import PY3 +from future.utils import PY3, PY26 if PY3: from past.builtins import cmp @@ -29,6 +29,10 @@ def empty_context_manager(*args, **kwargs): class TestCmp(unittest.TestCase): def test_cmp(self): for x, y, cmp_python2_value in test_values.cmp_python2_value: + if PY26: + # set comparison works a bit differently in 2.6 + if isinstance(x, set) or isinstance(y, set): + continue # to get this to run on python <3.4 which lacks subTest with getattr(self, 'subTest', empty_context_manager)(x=x, y=y): try: From ddedcb9abf98fd1cc85fb43ee35a12b2e898a5d7 Mon Sep 17 00:00:00 2001 From: "Roman A. Taycher" Date: Sun, 30 Aug 2020 22:06:42 -0700 Subject: [PATCH 10/10] fix 2.6 test, better comment --- tests/test_past/test_misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_past/test_misc.py b/tests/test_past/test_misc.py index ab67bfdd..0367b3db 100644 --- a/tests/test_past/test_misc.py +++ b/tests/test_past/test_misc.py @@ -30,7 +30,7 @@ class TestCmp(unittest.TestCase): def test_cmp(self): for x, y, cmp_python2_value in test_values.cmp_python2_value: if PY26: - # set comparison works a bit differently in 2.6 + # set cmp works a bit differently in 2.6, we try to emulate 2.7 behavior, so skip set cmp tests if isinstance(x, set) or isinstance(y, set): continue # to get this to run on python <3.4 which lacks subTest