Skip to content

Commit 8c892f2

Browse files
ChJRChJR
committed
Merge branch 'master' into feature/format_float
2 parents cf2aa74 + dcfa60b commit 8c892f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2424
-1708
lines changed

‎Cargo.lock

Lines changed: 41 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Lib/test/list_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def test_repr(self):
6565
self.assertEqual(repr(a2), "[0, 1, 2, [...], 3]")
6666

6767
# TODO: RUSTPYTHON
68-
@unittest.skip("TODO: RUSTPYTHON")
68+
@unittest.expectedFailure
6969
def test_repr_deep(self):
7070
a = self.type2test([])
7171
for i in range(sys.getrecursionlimit() + 100):

‎Lib/test/mapping_tests.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ def test_getitem(self):
170170

171171
self.assertRaises(TypeError, d.__getitem__)
172172

173-
@unittest.skip("TODO: RUSTPYTHON")
174173
def test_update(self):
175174
# mapping argument
176175
d = self._empty_mapping()

‎Lib/test/test_asyncgen.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ async def gen():
179179
else:
180180
self.fail('StopAsyncIteration was not raised')
181181

182-
@unittest.skip("TODO: RUSTPYTHON")
182+
# TODO: RUSTPYTHON
183+
@unittest.expectedFailure
183184
def test_async_gen_exception_03(self):
184185
async def gen():
185186
await awaitable()
@@ -229,7 +230,6 @@ async def gen():
229230
'async generator.*StopIteration'):
230231
to_list(gen())
231232

232-
@unittest.skip("TODO: RUSTPYTHON")
233233
def test_async_gen_exception_07(self):
234234
def sync_gen():
235235
try:
@@ -253,7 +253,6 @@ async def async_gen():
253253

254254
self.compare_generators(sync_gen(), async_gen())
255255

256-
@unittest.skip("TODO: RUSTPYTHON")
257256
def test_async_gen_exception_08(self):
258257
def sync_gen():
259258
try:
@@ -279,7 +278,6 @@ async def async_gen():
279278

280279
self.compare_generators(sync_gen(), async_gen())
281280

282-
@unittest.skip("TODO: RUSTPYTHON")
283281
def test_async_gen_exception_09(self):
284282
def sync_gen():
285283
try:
@@ -935,7 +933,8 @@ async def run():
935933
self.loop.run_until_complete(run())
936934
self.assertEqual(DONE, 1)
937935

938-
@unittest.skip("TODO: RUSTPYTHON")
936+
# TODO: RUSTPYTHON
937+
@unittest.expectedFailure
939938
def test_async_gen_asyncio_athrow_02(self):
940939
DONE = 0
941940

@@ -1054,7 +1053,8 @@ async def run():
10541053

10551054
self.loop.run_until_complete(run())
10561055

1057-
@unittest.skip("TODO: RUSTPYTHON")
1056+
# TODO: RUSTPYTHON
1057+
@unittest.expectedFailure
10581058
def test_async_gen_asyncio_shutdown_01(self):
10591059
finalized = 0
10601060

‎Lib/test/test_builtin.py

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@ class C3(C2): pass
286286
c3 = C3()
287287
self.assertTrue(callable(c3))
288288

289-
@unittest.skip("TODO: RUSTPYTHON")
289+
# TODO: RUSTPYTHON
290+
@unittest.expectedFailure
290291
def test_chr(self):
291292
self.assertEqual(chr(32), ' ')
292293
self.assertEqual(chr(65), 'A')
@@ -312,7 +313,8 @@ def test_chr(self):
312313
def test_cmp(self):
313314
self.assertTrue(not hasattr(builtins, "cmp"))
314315

315-
@unittest.skip("TODO: RUSTPYTHON")
316+
# TODO: RUSTPYTHON
317+
@unittest.expectedFailure
316318
def test_compile(self):
317319
compile('print(1)\n', '', 'exec')
318320
bom = b'\xef\xbb\xbf'
@@ -464,7 +466,8 @@ def test_divmod(self):
464466

465467
self.assertRaises(TypeError, divmod)
466468

467-
@unittest.skip("TODO: RUSTPYTHON")
469+
# TODO: RUSTPYTHON
470+
@unittest.expectedFailure
468471
def test_eval(self):
469472
self.assertEqual(eval('1+1'), 2)
470473
self.assertEqual(eval(' 1+1\n'), 2)
@@ -488,7 +491,8 @@ def __getitem__(self, key):
488491
raise ValueError
489492
self.assertRaises(ValueError, eval, "foo", {}, X())
490493

491-
@unittest.skip("TODO: RUSTPYTHON")
494+
# TODO: RUSTPYTHON
495+
@unittest.expectedFailure
492496
def test_general_eval(self):
493497
# Tests that general mappings can be used for the locals argument
494498

@@ -658,7 +662,8 @@ def badfunc():
658662
self.assertEqual(list(filter(lambda x: x>=3, (1, 2, 3, 4))), [3, 4])
659663
self.assertRaises(TypeError, list, filter(42, (1, 2)))
660664

661-
@unittest.skip("TODO: RUSTPYTHON")
665+
# TODO: RUSTPYTHON
666+
@unittest.expectedFailure
662667
def test_filter_pickle(self):
663668
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
664669
f1 = filter(filter_char, "abcdeabcde")
@@ -866,7 +871,8 @@ def badfunc(x):
866871
raise RuntimeError
867872
self.assertRaises(RuntimeError, list, map(badfunc, range(5)))
868873

869-
@unittest.skip("TODO: RUSTPYTHON")
874+
# TODO: RUSTPYTHON
875+
@unittest.expectedFailure
870876
def test_map_pickle(self):
871877
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
872878
m1 = map(map_char, "Is this the real life?")
@@ -927,8 +933,6 @@ def __getitem__(self, index):
927933
self.assertEqual(max(data, key=f),
928934
sorted(reversed(data), key=f)[-1])
929935

930-
# TODO: RUSTPYTHON
931-
@unittest.expectedFailure
932936
def test_min(self):
933937
self.assertEqual(min('123123'), '1')
934938
self.assertEqual(min(1, 2, 3), 1)
@@ -1027,7 +1031,6 @@ def write_testfile(self):
10271031
fp.write('XXX'*100)
10281032
fp.write('YYY'*100)
10291033

1030-
@unittest.skip("TODO: RUSTPYTHON")
10311034
def test_open(self):
10321035
self.write_testfile()
10331036
fp = open(TESTFN, 'r')
@@ -1043,7 +1046,8 @@ def test_open(self):
10431046
self.assertRaises(ValueError, open, 'a\x00b')
10441047
self.assertRaises(ValueError, open, b'a\x00b')
10451048

1046-
@unittest.skip("TODO: RUSTPYTHON")
1049+
# TODO: RUSTPYTHON
1050+
@unittest.expectedFailure
10471051
@unittest.skipIf(sys.flags.utf8_mode, "utf-8 mode is enabled")
10481052
def test_open_default_encoding(self):
10491053
old_environ = dict(os.environ)
@@ -1064,7 +1068,7 @@ def test_open_default_encoding(self):
10641068
os.environ.clear()
10651069
os.environ.update(old_environ)
10661070

1067-
@unittest.skip("TODO: RUSTPYTHON")
1071+
@unittest.skipIf(sys.platform == 'win32', 'TODO: RUSTPYTHON Windows')
10681072
def test_open_non_inheritable(self):
10691073
fileobj = open(__file__)
10701074
with fileobj:
@@ -1097,7 +1101,6 @@ def test_ord(self):
10971101
self.assertEqual(ord("\U0010FFFE"), 0x0010FFFE)
10981102
self.assertEqual(ord("\U0010FFFF"), 0x0010FFFF)
10991103

1100-
@unittest.skip("TODO: RUSTPYTHON")
11011104
def test_pow(self):
11021105
self.assertEqual(pow(0,0), 1)
11031106
self.assertEqual(pow(0,1), 0)
@@ -1147,7 +1150,6 @@ def test_pow(self):
11471150

11481151
self.assertRaises(TypeError, pow)
11491152

1150-
@unittest.skip("TODO: RUSTPYTHON")
11511153
def test_input(self):
11521154
self.write_testfile()
11531155
fp = open(TESTFN, 'r')
@@ -1198,7 +1200,8 @@ def test_repr(self):
11981200
a[0] = a
11991201
self.assertEqual(repr(a), '{0: {...}}')
12001202

1201-
@unittest.skip("TODO: RUSTPYTHON")
1203+
# TODO: RUSTPYTHON
1204+
@unittest.expectedFailure
12021205
def test_round(self):
12031206
self.assertEqual(round(0.0), 0.0)
12041207
self.assertEqual(type(round(0.0)), int)
@@ -1294,7 +1297,8 @@ def test_round_large(self):
12941297
self.assertEqual(round(5e15+2), 5e15+2)
12951298
self.assertEqual(round(5e15+3), 5e15+3)
12961299

1297-
@unittest.skip("TODO: RUSTPYTHON")
1300+
# TODO: RUSTPYTHON
1301+
@unittest.expectedFailure
12981302
def test_bug_27936(self):
12991303
# Verify that ndigits=None means the same as passing in no argument
13001304
for x in [1234,
@@ -1312,7 +1316,8 @@ def test_setattr(self):
13121316

13131317
# test_str(): see test_unicode.py and test_bytes.py for str() tests.
13141318

1315-
@unittest.skip("TODO: RUSTPYTHON")
1319+
# TODO: RUSTPYTHON
1320+
@unittest.expectedFailure
13161321
def test_sum(self):
13171322
self.assertEqual(sum([]), 0)
13181323
self.assertEqual(sum(list(range(2,8))), 27)
@@ -1421,7 +1426,8 @@ def __getitem__(self, i):
14211426
return i
14221427
self.assertRaises(ValueError, list, zip(BadSeq(), BadSeq()))
14231428

1424-
@unittest.skip("TODO: RUSTPYTHON")
1429+
# TODO: RUSTPYTHON
1430+
@unittest.expectedFailure
14251431
def test_zip_pickle(self):
14261432
a = (1, 2, 3)
14271433
b = (4, 5, 6)
@@ -1542,7 +1548,8 @@ def test_bin(self):
15421548
self.assertEqual(bin(-(2**65)), '-0b1' + '0' * 65)
15431549
self.assertEqual(bin(-(2**65-1)), '-0b' + '1' * 65)
15441550

1545-
@unittest.skip("TODO: RUSTPYTHON")
1551+
# TODO: RUSTPYTHON
1552+
@unittest.expectedFailure
15461553
def test_bytearray_translate(self):
15471554
x = bytearray(b"abc")
15481555
self.assertRaises(ValueError, x.translate, b"1", 1)
@@ -1826,7 +1833,8 @@ def test_baddecorator(self):
18261833

18271834
class ShutdownTest(unittest.TestCase):
18281835

1829-
@unittest.skip("TODO: RUSTPYTHON")
1836+
# TODO: RUSTPYTHON
1837+
@unittest.expectedFailure
18301838
def test_cleanup(self):
18311839
# Issue #19255: builtins are still available at shutdown
18321840
code = """if 1:
@@ -2015,7 +2023,7 @@ class B:
20152023
with self.assertRaises(TypeError):
20162024
type('A', (B,), {'__slots__': '__weakref__'})
20172025

2018-
@unittest.skip("TODO: RUSTPYTHON")
2026+
@unittest.skip("TODO: RUSTPYTHON; random failure")
20192027
def test_namespace_order(self):
20202028
# bpo-34320: namespace should preserve order
20212029
od = collections.OrderedDict([('a', 1), ('b', 2)])

‎Lib/test/test_class.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,8 @@ class Empty: pass
341341
slice(None, 24, None),
342342
24, 100)))])
343343

344-
@unittest.skip("TODO: RUSTPYTHON")
344+
# TODO: RUSTPYTHON
345+
@unittest.expectedFailure
345346
def testUnaryOps(self):
346347
testme = AllTests()
347348

@@ -446,7 +447,6 @@ def __delattr__(self, *args):
446447
del testme.cardinal
447448
self.assertCallStack([('__delattr__', (testme, "cardinal"))])
448449

449-
@unittest.skip("TODO: RUSTPYTHON")
450450
def testDel(self):
451451
x = []
452452

@@ -459,7 +459,6 @@ def __del__(self):
459459
gc.collect()
460460
self.assertEqual(["crab people, crab people"], x)
461461

462-
@unittest.skip("TODO: RUSTPYTHON")
463462
def testBadTypeReturned(self):
464463
# return values of some method are type-checked
465464
class BadTypeClass:
@@ -511,7 +510,8 @@ class A:
511510
else:
512511
self.fail("Failed to raise RecursionError")
513512

514-
@unittest.skip("TODO: RUSTPYTHON")
513+
# TODO: RUSTPYTHON
514+
@unittest.expectedFailure
515515
def testForExceptionsRaisedInInstanceGetattr2(self):
516516
# Tests for exceptions raised in instance_getattr2().
517517

‎Lib/test/test_complex.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,6 @@ def test_hash(self):
461461
x /= 3.0 # now check against floating point
462462
self.assertEqual(hash(x), hash(complex(x, 0.)))
463463

464-
# TODO: RUSTPYTHON
465-
@unittest.expectedFailure
466464
def test_abs(self):
467465
nums = [complex(x/3., y/7.) for x in range(-9,9) for y in range(-9,9)]
468466
for num in nums:

0 commit comments

Comments
 (0)