diff -r 94710cbcac47 Lib/_pyio.py --- a/Lib/_pyio.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/_pyio.py Thu Sep 01 21:17:49 2016 +0300 @@ -576,7 +576,7 @@ class RawIOBase(IOBase): size = -1 if size < 0: return self.readall() - b = bytearray(size.__index__()) + b = bytearray(b'\0') * size.__index__() n = self.readinto(b) if n is None: return None diff -r 94710cbcac47 Lib/base64.py --- a/Lib/base64.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/base64.py Thu Sep 01 21:17:49 2016 +0300 @@ -155,7 +155,7 @@ def b32encode(s): leftover = len(s) % 5 # Pad the last quantum with zero bits if necessary if leftover: - s = s + bytes(5 - leftover) # Don't use += ! + s = s + b'\0' * (5 - leftover) # Don't use += ! encoded = bytearray() from_bytes = int.from_bytes b32tab2 = _b32tab2 diff -r 94710cbcac47 Lib/ctypes/test/test_bitfields.py --- a/Lib/ctypes/test/test_bitfields.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/ctypes/test/test_bitfields.py Thu Sep 01 21:17:49 2016 +0300 @@ -265,7 +265,7 @@ class BitFieldTest(unittest.TestCase): _fields_ = [("a", c_uint32, 24), ("b", c_uint32, 4), ("c", c_uint32, 4)] - b = bytearray(4) + b = bytearray(b'\0') * 4 x = Little.from_buffer(b) x.a = 0xabcdef x.b = 1 @@ -279,7 +279,7 @@ class BitFieldTest(unittest.TestCase): _fields_ = [("a", c_uint32, 24), ("b", c_uint32, 4), ("c", c_uint32, 4)] - b = bytearray(4) + b = bytearray(b'\0') * 4 x = Big.from_buffer(b) x.a = 0xabcdef x.b = 1 diff -r 94710cbcac47 Lib/gzip.py --- a/Lib/gzip.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/gzip.py Thu Sep 01 21:17:49 2016 +0300 @@ -357,10 +357,10 @@ class GzipFile(_compression.BaseStream): if offset < self.offset: raise OSError('Negative seek in write mode') count = offset - self.offset - chunk = bytes(1024) + chunk = b'\0' * 1024 for i in range(count // 1024): self.write(chunk) - self.write(bytes(count % 1024)) + self.write(b'\0' * (count % 1024)) elif self.mode == READ: self._check_not_closed() return self._buffer.seek(offset, whence) diff -r 94710cbcac47 Lib/hmac.py --- a/Lib/hmac.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/hmac.py Thu Sep 01 21:17:49 2016 +0300 @@ -77,7 +77,7 @@ class HMAC: if len(key) > blocksize: key = self.digest_cons(key).digest() - key = key + bytes(blocksize - len(key)) + key = key.ljust(blocksize, b'\0') self.outer.update(key.translate(trans_5C)) self.inner.update(key.translate(trans_36)) if msg is not None: diff -r 94710cbcac47 Lib/http/client.py --- a/Lib/http/client.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/http/client.py Thu Sep 01 21:17:49 2016 +0300 @@ -445,7 +445,7 @@ class HTTPResponse(io.BufferedIOBase): if amt is not None: # Amount is given, implement using readinto - b = bytearray(amt) + b = bytearray(b'\0') * amt n = self.readinto(b) return memoryview(b)[:n].tobytes() else: diff -r 94710cbcac47 Lib/pickletools.py --- a/Lib/pickletools.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/pickletools.py Thu Sep 01 21:17:49 2016 +0300 @@ -707,7 +707,7 @@ def read_unicodestring8(f): >>> enc = s.encode('utf-8') >>> enc b'abcd\xea\xaf\x8d' - >>> n = bytes([len(enc)]) + bytes(7) # little-endian 8-byte length + >>> n = bytes([len(enc)]) + b'\0' * 7 # little-endian 8-byte length >>> t = read_unicodestring8(io.BytesIO(n + enc + b'junk')) >>> s == t True diff -r 94710cbcac47 Lib/sre_compile.py --- a/Lib/sre_compile.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/sre_compile.py Thu Sep 01 21:17:49 2016 +0300 @@ -249,7 +249,7 @@ def _optimize_charset(charset, fixup, fi # internal: optimize character set out = [] tail = [] - charmap = bytearray(256) + charmap = bytearray(b'\0') * 256 for op, av in charset: while True: try: @@ -351,7 +351,7 @@ def _optimize_charset(charset, fixup, fi charmap = bytes(charmap) # should be hashable comps = {} - mapping = bytearray(256) + mapping = bytearray(b'\0') * 256 block = 0 data = bytearray() for i in range(0, 65536, 256): diff -r 94710cbcac47 Lib/test/eintrdata/eintr_tester.py --- a/Lib/test/eintrdata/eintr_tester.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/eintrdata/eintr_tester.py Thu Sep 01 21:17:49 2016 +0300 @@ -242,7 +242,7 @@ class SocketEINTRTest(EINTRBaseTest): ' # let the parent block on send()', ' time.sleep(sleep_time)', '', - ' received_data = bytearray(data_len)', + ' received_data = bytearray(b"\\0") * data_len', ' n = 0', ' while n < data_len:', ' n += rd.recv_into(memoryview(received_data)[n:])', diff -r 94710cbcac47 Lib/test/test_audioop.py --- a/Lib/test/test_audioop.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_audioop.py Thu Sep 01 21:17:49 2016 +0300 @@ -416,7 +416,7 @@ class TestAudioop(unittest.TestCase): def test_tomono(self): for w in 1, 2, 3, 4: data1 = datas[w] - data2 = bytearray(2 * len(data1)) + data2 = bytearray(b'\0') * (2 * len(data1)) for k in range(w): data2[k::2*w] = data1[k::w] self.assertEqual(audioop.tomono(data2, w, 1, 0), data1) @@ -432,7 +432,7 @@ class TestAudioop(unittest.TestCase): def test_tostereo(self): for w in 1, 2, 3, 4: data1 = datas[w] - data2 = bytearray(2 * len(data1)) + data2 = bytearray(b'\0') * (2 * len(data1)) for k in range(w): data2[k::2*w] = data1[k::w] self.assertEqual(audioop.tostereo(data1, w, 1, 0), data2) diff -r 94710cbcac47 Lib/test/test_buffer.py --- a/Lib/test/test_buffer.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_buffer.py Thu Sep 01 21:17:49 2016 +0300 @@ -2833,7 +2833,7 @@ class TestBufferProtocol(unittest.TestCa self.assertRaises(NotImplementedError, m.tolist) def test_memoryview_repr(self): - m = memoryview(bytearray(9)) + m = memoryview(bytearray(b'\0') * 9) r = m.__repr__() self.assertTrue(r.startswith("= 0 else 9999) + b = bytearray(b'\0') * (n if n >= 0 else 9999) n = bufio.readinto(b) return bytes(b[:n]) self.check_flush_and_read(_readinto) @@ -2065,7 +2065,7 @@ class BufferedRandomTest(BufferedReaderT def test_writes_and_readintos(self): def _read(bufio): bufio.seek(-1, 1) - bufio.readinto(bytearray(1)) + bufio.readinto(bytearray(b'\0')) self.check_writes(_read) def test_write_after_readahead(self): @@ -2135,7 +2135,7 @@ class BufferedRandomTest(BufferedReaderT f.write(b'2') self.assertEqual(f.read1(1), b'd') f.write(b'3') - buf = bytearray(1) + buf = bytearray(b'\0') f.readinto(buf) self.assertEqual(buf, b'f') f.write(b'4') @@ -3470,9 +3470,9 @@ class MiscIOTest(unittest.TestCase): if hasattr(f, "readall"): self.assertRaises(ValueError, f.readall) if hasattr(f, "readinto"): - self.assertRaises(ValueError, f.readinto, bytearray(1024)) + self.assertRaises(ValueError, f.readinto, bytearray(b'\0') * 1024) if hasattr(f, "readinto1"): - self.assertRaises(ValueError, f.readinto1, bytearray(1024)) + self.assertRaises(ValueError, f.readinto1, bytearray(b'\0') * 1024) self.assertRaises(ValueError, f.readline) self.assertRaises(ValueError, f.readlines) self.assertRaises(ValueError, f.seek, 0) @@ -3669,7 +3669,7 @@ class CMiscIOTest(MiscIOTest): def read(self, n=-1): return b'x' * 10**6 bufio = BadReader() - b = bytearray(2) + b = bytearray(b'\0') * 2 self.assertRaises(ValueError, bufio.readinto, b) @unittest.skipUnless(threading, 'Threading required for this test.') diff -r 94710cbcac47 Lib/test/test_ipaddress.py --- a/Lib/test/test_ipaddress.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_ipaddress.py Thu Sep 01 21:17:49 2016 +0300 @@ -119,7 +119,7 @@ class CommonTestMixin_v4(CommonTestMixin def test_bad_packed_length(self): def assertBadLength(length): - addr = bytes(length) + addr = b'\0' * length msg = "%r (len %d != 4) is not permitted as an IPv4 address" with self.assertAddressError(re.escape(msg % (addr, length))): self.factory(addr) @@ -139,11 +139,11 @@ class CommonTestMixin_v6(CommonTestMixin self.assertInstancesEqual(3232235521, "::c0a8:1") def test_packed(self): - addr = bytes(12) + bytes.fromhex("00000000") + addr = b'\0'*12 + bytes.fromhex("00000000") self.assertInstancesEqual(addr, "::") - addr = bytes(12) + bytes.fromhex("c0a80001") + addr = b'\0'*12 + bytes.fromhex("c0a80001") self.assertInstancesEqual(addr, "::c0a8:1") - addr = bytes.fromhex("c0a80001") + bytes(12) + addr = bytes.fromhex("c0a80001") + b'\0'*12 self.assertInstancesEqual(addr, "c0a8:1::") def test_negative_ints_rejected(self): @@ -158,7 +158,7 @@ class CommonTestMixin_v6(CommonTestMixin def test_bad_packed_length(self): def assertBadLength(length): - addr = bytes(length) + addr = b'\0' * length msg = "%r (len %d != 16) is not permitted as an IPv6 address" with self.assertAddressError(re.escape(msg % (addr, length))): self.factory(addr) diff -r 94710cbcac47 Lib/test/test_lzma.py --- a/Lib/test/test_lzma.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_lzma.py Thu Sep 01 21:17:49 2016 +0300 @@ -928,11 +928,11 @@ class FileTestCase(unittest.TestCase): def test_decompress_limited(self): """Decompressed data buffering should be limited""" - bomb = lzma.compress(bytes(int(2e6)), preset=6) + bomb = lzma.compress(b'\0' * int(2e6), preset=6) self.assertLess(len(bomb), _compression.BUFFER_SIZE) decomp = LZMAFile(BytesIO(bomb)) - self.assertEqual(bytes(1), decomp.read(1)) + self.assertEqual(decomp.read(1), b'\0') max_decomp = 1 + DEFAULT_BUFFER_SIZE self.assertLessEqual(decomp._buffer.raw.tell(), max_decomp, "Excessive amount of data was decompressed") diff -r 94710cbcac47 Lib/test/test_memoryio.py --- a/Lib/test/test_memoryio.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_memoryio.py Thu Sep 01 21:17:49 2016 +0300 @@ -775,7 +775,7 @@ class CBytesIOTest(PyBytesIOTest): # BytesIO should accept only Bytes for copy-on-write sharing, since # arbitrary buffer-exporting objects like bytearray() aren't guaranteed # to be immutable. - ba = bytearray(1024) + ba = bytearray(b'\0') * 1024 old_rc = sys.getrefcount(ba) memio = self.ioclass(ba) self.assertEqual(sys.getrefcount(ba), old_rc) diff -r 94710cbcac47 Lib/test/test_os.py --- a/Lib/test/test_os.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_os.py Thu Sep 01 21:17:49 2016 +0300 @@ -1550,7 +1550,7 @@ class TestInvalidFD(unittest.TestCase): @unittest.skipUnless(hasattr(os, 'readv'), 'test needs os.readv()') def test_readv(self): - buf = bytearray(10) + buf = bytearray(b'\0') * 10 self.check(os.readv, [buf]) @unittest.skipUnless(hasattr(os, 'tcsetpgrp'), 'test needs os.tcsetpgrp()') diff -r 94710cbcac47 Lib/test/test_posix.py --- a/Lib/test/test_posix.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_posix.py Thu Sep 01 21:17:49 2016 +0300 @@ -304,7 +304,7 @@ class PosixTester(unittest.TestCase): try: os.write(fd, b'test1tt2t3') os.lseek(fd, 0, os.SEEK_SET) - buf = [bytearray(i) for i in [5, 3, 2]] + buf = [bytearray(b'\0') * i for i in [5, 3, 2]] self.assertEqual(posix.readv(fd, buf), 10) self.assertEqual([b'test1', b'tt2', b't3'], [bytes(i) for i in buf]) diff -r 94710cbcac47 Lib/test/test_socket.py --- a/Lib/test/test_socket.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_socket.py Thu Sep 01 21:17:49 2016 +0300 @@ -2047,7 +2047,7 @@ class RecvmsgIntoMixin(SendrecvmsgBase): # Mixin to implement doRecvmsg() using recvmsg_into(). def doRecvmsg(self, sock, bufsize, *args): - buf = bytearray(bufsize) + buf = bytearray(b'\0') * bufsize result = sock.recvmsg_into([buf], *args) self.registerRecvmsgResult(result) self.assertGreaterEqual(result[0], 0) @@ -2506,7 +2506,7 @@ class RecvmsgTests(RecvmsgGenericTests): self.assertRaises(ValueError, self.serv_sock.recvmsg, len(MSG), -1, 0) self.assertRaises(TypeError, self.serv_sock.recvmsg, - [bytearray(10)], 0, 0) + [bytearray(b'\0') * 10], 0, 0) self.assertRaises(TypeError, self.serv_sock.recvmsg, object(), 0, 0) self.assertRaises(TypeError, self.serv_sock.recvmsg, @@ -2529,7 +2529,7 @@ class RecvmsgIntoTests(RecvmsgIntoMixin, def testRecvmsgIntoBadArgs(self): # Check that recvmsg_into() rejects invalid arguments. - buf = bytearray(len(MSG)) + buf = bytearray(b'\0') * len(MSG) self.assertRaises(TypeError, self.serv_sock.recvmsg_into) self.assertRaises(TypeError, self.serv_sock.recvmsg_into, len(MSG), 0, 0) @@ -2560,7 +2560,7 @@ class RecvmsgIntoTests(RecvmsgIntoMixin, def testRecvmsgIntoGenerator(self): # Receive into buffer obtained from a generator (not a sequence). - buf = bytearray(len(MSG)) + buf = bytearray(b'\0') * len(MSG) nbytes, ancdata, flags, addr = self.serv_sock.recvmsg_into( (o for o in [buf])) self.assertEqual(nbytes, len(MSG)) @@ -3690,13 +3690,13 @@ class InterruptedRecvTimeoutTest(Interru self.checkInterruptedRecv(self.serv.recv, 1024) def testInterruptedRecvIntoTimeout(self): - self.checkInterruptedRecv(self.serv.recv_into, bytearray(1024)) + self.checkInterruptedRecv(self.serv.recv_into, bytearray(b'\0') * 1024) def testInterruptedRecvfromTimeout(self): self.checkInterruptedRecv(self.serv.recvfrom, 1024) def testInterruptedRecvfromIntoTimeout(self): - self.checkInterruptedRecv(self.serv.recvfrom_into, bytearray(1024)) + self.checkInterruptedRecv(self.serv.recvfrom_into, bytearray(b'\0') * 1024) @requireAttrs(socket.socket, "recvmsg") def testInterruptedRecvmsgTimeout(self): @@ -3704,7 +3704,7 @@ class InterruptedRecvTimeoutTest(Interru @requireAttrs(socket.socket, "recvmsg_into") def testInterruptedRecvmsgIntoTimeout(self): - self.checkInterruptedRecv(self.serv.recvmsg_into, [bytearray(1024)]) + self.checkInterruptedRecv(self.serv.recvmsg_into, [bytearray(b'\0') * 1024]) # Require siginterrupt() in order to ensure that system calls are @@ -4165,7 +4165,7 @@ class UnbufferedFileObjectClassTestCase( def testSmallReadNonBlocking(self): self.cli_conn.setblocking(False) - self.assertEqual(self.read_file.readinto(bytearray(10)), None) + self.assertEqual(self.read_file.readinto(bytearray(b'\0') * 10), None) self.assertEqual(self.read_file.read(len(self.read_msg) - 3), None) self.evt1.set() self.evt2.wait(1.0) @@ -4174,12 +4174,12 @@ class UnbufferedFileObjectClassTestCase( # Data not arrived (can happen under Windows), wait a bit time.sleep(0.5) first_seg = self.read_file.read(len(self.read_msg) - 3) - buf = bytearray(10) + buf = bytearray(b'\0') * 10 n = self.read_file.readinto(buf) self.assertEqual(n, 3) msg = first_seg + buf[:n] self.assertEqual(msg, self.read_msg) - self.assertEqual(self.read_file.readinto(bytearray(16)), None) + self.assertEqual(self.read_file.readinto(bytearray(b'\0') * 16), None) self.assertEqual(self.read_file.read(1), None) def _testSmallReadNonBlocking(self): @@ -4637,7 +4637,7 @@ class BufferIOTest(SocketConnectedTest): SocketConnectedTest.__init__(self, methodName=methodName) def testRecvIntoArray(self): - buf = bytearray(1024) + buf = bytearray(b'\0') * 1024 nbytes = self.cli_conn.recv_into(buf) self.assertEqual(nbytes, len(MSG)) msg = buf[:len(MSG)] @@ -4648,7 +4648,7 @@ class BufferIOTest(SocketConnectedTest): self.serv_conn.send(buf) def testRecvIntoBytearray(self): - buf = bytearray(1024) + buf = bytearray(b'\0') * 1024 nbytes = self.cli_conn.recv_into(buf) self.assertEqual(nbytes, len(MSG)) msg = buf[:len(MSG)] @@ -4657,7 +4657,7 @@ class BufferIOTest(SocketConnectedTest): _testRecvIntoBytearray = _testRecvIntoArray def testRecvIntoMemoryview(self): - buf = bytearray(1024) + buf = bytearray(b'\0') * 1024 nbytes = self.cli_conn.recv_into(memoryview(buf)) self.assertEqual(nbytes, len(MSG)) msg = buf[:len(MSG)] @@ -4666,7 +4666,7 @@ class BufferIOTest(SocketConnectedTest): _testRecvIntoMemoryview = _testRecvIntoArray def testRecvFromIntoArray(self): - buf = bytearray(1024) + buf = bytearray(b'\0') * 1024 nbytes, addr = self.cli_conn.recvfrom_into(buf) self.assertEqual(nbytes, len(MSG)) msg = buf[:len(MSG)] @@ -4677,7 +4677,7 @@ class BufferIOTest(SocketConnectedTest): self.serv_conn.send(buf) def testRecvFromIntoBytearray(self): - buf = bytearray(1024) + buf = bytearray(b'\0') * 1024 nbytes, addr = self.cli_conn.recvfrom_into(buf) self.assertEqual(nbytes, len(MSG)) msg = buf[:len(MSG)] @@ -4686,7 +4686,7 @@ class BufferIOTest(SocketConnectedTest): _testRecvFromIntoBytearray = _testRecvFromIntoArray def testRecvFromIntoMemoryview(self): - buf = bytearray(1024) + buf = bytearray(b'\0') * 1024 nbytes, addr = self.cli_conn.recvfrom_into(memoryview(buf)) self.assertEqual(nbytes, len(MSG)) msg = buf[:len(MSG)] @@ -4696,7 +4696,7 @@ class BufferIOTest(SocketConnectedTest): def testRecvFromIntoSmallBuffer(self): # See issue #20246. - buf = bytearray(8) + buf = bytearray(b'\0') * 8 self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024) def _testRecvFromIntoSmallBuffer(self): diff -r 94710cbcac47 Lib/test/test_socketserver.py --- a/Lib/test/test_socketserver.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_socketserver.py Thu Sep 01 21:17:49 2016 +0300 @@ -406,7 +406,7 @@ class SocketWriterTest(unittest.TestCase self.server.sent1 = self.wfile.write(b'write data\n') # Should be sent immediately, without requiring flush() self.server.received = self.rfile.readline() - big_chunk = bytes(test.support.SOCK_MAX_SIZE) + big_chunk = b'\0' * test.support.SOCK_MAX_SIZE self.server.sent2 = self.wfile.write(big_chunk) server = socketserver.TCPServer((HOST, 0), Handler) diff -r 94710cbcac47 Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_ssl.py Thu Sep 01 21:17:49 2016 +0300 @@ -2791,7 +2791,7 @@ if _have_threads: # read(-1, buffer) is supported, even though read(-1) is not data = b"data" s.send(data) - buffer = bytearray(len(data)) + buffer = bytearray(b'\0') * len(data) self.assertEqual(s.read(-1, buffer), len(data)) self.assertEqual(buffer, data) @@ -2801,7 +2801,7 @@ if _have_threads: self.assertRaises(NotImplementedError, s.sendmsg, [b"data"]) self.assertRaises(NotImplementedError, s.recvmsg, 100) self.assertRaises(NotImplementedError, - s.recvmsg_into, bytearray(100)) + s.recvmsg_into, bytearray(b'\0') * 100) s.write(b"over\n") @@ -2849,7 +2849,7 @@ if _have_threads: # If we keep sending data, at some point the buffers # will be full and the call will block - buf = bytearray(8192) + buf = bytearray(b'\0') * 8192 def fill_buffer(): while True: s.send(buf) diff -r 94710cbcac47 Lib/test/test_wsgiref.py --- a/Lib/test/test_wsgiref.py Thu Sep 01 13:55:33 2016 -0400 +++ b/Lib/test/test_wsgiref.py Thu Sep 01 21:17:49 2016 +0300 @@ -258,7 +258,7 @@ class IntegrationTests(TestCase): def app(environ, start_response): start_response("200 OK", []) - return [bytes(support.SOCK_MAX_SIZE)] + return [b'\0' * support.SOCK_MAX_SIZE] class WsgiHandler(NoLogRequestHandler, WSGIRequestHandler): pass