Skip to content

Commit 0dba870

Browse files
jakearmendarizjakearmendariz
committed
Merged marshaling module
2 parents aadaf18 + 0dc086c commit 0dba870

Some content is hidden

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

66 files changed

+2185
-829
lines changed

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
target: i686-unknown-linux-gnu
8989

9090
- name: Install gcc-multilib
91-
run: sudo apt-get install gcc-multilib
91+
run: sudo apt-get update && sudo apt-get install gcc-multilib
9292
- name: Check compilation for x86 32bit
9393
uses: actions-rs/cargo@v1
9494
with:

‎Cargo.lock

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

‎Lib/codecs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
class CodecInfo(tuple):
8484
"""Codec details when looking up the codec registry"""
8585

86-
# Private API to allow Python 3.4 to blacklist the known non-Unicode
86+
# Private API to allow Python 3.4 to denylist the known non-Unicode
8787
# codecs in the standard library. A more general mechanism to
8888
# reliably distinguish test encodings from other codecs will hopefully
8989
# be defined for Python 3.5
@@ -386,7 +386,7 @@ def writelines(self, list):
386386

387387
def reset(self):
388388

389-
""" Flushes and resets the codec buffers used for keeping state.
389+
""" Resets the codec buffers used for keeping internal state.
390390
391391
Calling this method should ensure that the data on the
392392
output is put into a clean state, that allows appending
@@ -620,7 +620,7 @@ def readlines(self, sizehint=None, keepends=True):
620620

621621
def reset(self):
622622

623-
""" Resets the codec buffers used for keeping state.
623+
""" Resets the codec buffers used for keeping internal state.
624624
625625
Note that no stream repositioning should take place.
626626
This method is primarily intended to be able to recover

‎Lib/test/list_tests.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,16 @@ def test_init(self):
3232
self.assertNotEqual(id(a), id(b))
3333
self.assertEqual(a, b)
3434

35+
# TODO: RUSTPYTHON
36+
@unittest.expectedFailure
3537
def test_getitem_error(self):
3638
a = []
3739
msg = "list indices must be integers or slices"
3840
with self.assertRaisesRegex(TypeError, msg):
3941
a['a']
4042

43+
# TODO: RUSTPYTHON
44+
@unittest.expectedFailure
4145
def test_setitem_error(self):
4246
a = []
4347
msg = "list indices must be integers or slices"
@@ -102,6 +106,8 @@ def test_reversed(self):
102106
# Bug 3689: make sure list-reversed-iterator doesn't have __len__
103107
self.assertRaises(TypeError, len, reversed([1,2,3]))
104108

109+
# TODO: RUSTPYTHON
110+
@unittest.expectedFailure
105111
def test_setitem(self):
106112
a = self.type2test([0, 1])
107113
a[0] = 0

‎Lib/test/test_augassign.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ def testBasic(self):
1818
x /= 2
1919
self.assertEqual(x, 3.0)
2020

21-
# TODO: RUSTPYTHON
22-
@unittest.expectedFailure
2321
def test_with_unpacking(self):
2422
self.assertRaises(SyntaxError, compile, "x, b += 3", "<test>", "exec")
2523

‎Lib/test/test_bool.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,6 @@ def test_operator(self):
273273
self.assertIs(operator.is_not(True, True), False)
274274
self.assertIs(operator.is_not(True, False), True)
275275

276-
# TODO: RUSTPYTHON
277-
@unittest.expectedFailure
278276
def test_marshal(self):
279277
import marshal
280278
self.assertIs(marshal.loads(marshal.dumps(True)), True)

‎Lib/test/test_bytes.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,8 @@ def test_sq_item(self):
989989
class BytesTest(BaseBytesTest, unittest.TestCase):
990990
type2test = bytes
991991

992+
# TODO: RUSTPYTHON
993+
@unittest.expectedFailure
992994
def test_getitem_error(self):
993995
b = b'python'
994996
msg = "byte indices must be integers or slices"
@@ -1181,12 +1183,16 @@ class BufferBlocked(bytearray):
11811183
class ByteArrayTest(BaseBytesTest, unittest.TestCase):
11821184
type2test = bytearray
11831185

1186+
# TODO: RUSTPYTHON
1187+
@unittest.expectedFailure
11841188
def test_getitem_error(self):
11851189
b = bytearray(b'python')
11861190
msg = "bytearray indices must be integers or slices"
11871191
with self.assertRaisesRegex(TypeError, msg):
11881192
b['a']
11891193

1194+
# TODO: RUSTPYTHON
1195+
@unittest.expectedFailure
11901196
def test_setitem_error(self):
11911197
b = bytearray(b'python')
11921198
msg = "bytearray indices must be integers or slices"

0 commit comments

Comments
 (0)