Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e22905a

Browse files
gvanrossumgvanrossum
committed
More changes needed to make things work once bytes and str are truly divorced.
1 parent 25a29a9 commit e22905a

7 files changed

Lines changed: 80 additions & 75 deletions

File tree

‎Lib/hashlib.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
__doc__ = """hashlib module - A common interface to many hash functions.
88
9-
new(name, string='') - returns a new hash object implementing the
10-
given hash function; initializing the hash
11-
using the given string data.
9+
new(name, data=b'') - returns a new hash object implementing the
10+
given hash function; initializing the hash
11+
using the given binary data.
1212
1313
Named constructor functions are also available, these are much faster
1414
than using new():
@@ -39,14 +39,14 @@
3939
4040
>>> import hashlib
4141
>>> m = hashlib.md5()
42-
>>> m.update("Nobody inspects")
43-
>>> m.update(" the spammish repetition")
42+
>>> m.update(b"Nobody inspects")
43+
>>> m.update(b" the spammish repetition")
4444
>>> m.digest()
45-
'\xbbd\x9c\x83\xdd\x1e\xa5\xc9\xd9\xde\xc9\xa1\x8d\xf0\xff\xe9'
45+
b'\xbbd\x9c\x83\xdd\x1e\xa5\xc9\xd9\xde\xc9\xa1\x8d\xf0\xff\xe9'
4646
4747
More condensed:
4848
49-
>>> hashlib.sha224("Nobody inspects the spammish repetition").hexdigest()
49+
>>> hashlib.sha224(b"Nobody inspects the spammish repetition").hexdigest()
5050
'a4337bc45a8fc544c03f52dc550cd6e1e87021bc896588bd79e901e2'
5151
5252
"""
@@ -77,25 +77,25 @@ def __get_builtin_constructor(name):
7777
raise ValueError, "unsupported hash type"
7878

7979

80-
def __py_new(name, string=''):
81-
"""new(name, string='') - Return a new hashing object using the named algorithm;
82-
optionally initialized with a string.
80+
def __py_new(name, data=b''):
81+
"""new(name, data='') - Return a new hashing object using the named algorithm;
82+
optionally initialized with data (which must be bytes).
8383
"""
84-
return __get_builtin_constructor(name)(string)
84+
return __get_builtin_constructor(name)(data)
8585

8686

87-
def __hash_new(name, string=''):
88-
"""new(name, string='') - Return a new hashing object using the named algorithm;
89-
optionally initialized with a string.
87+
def __hash_new(name, data=b''):
88+
"""new(name, data=b'') - Return a new hashing object using the named algorithm;
89+
optionally initialized with data (which must be bytes).
9090
"""
9191
try:
92-
return _hashlib.new(name, string)
92+
return _hashlib.new(name, data)
9393
except ValueError:
9494
# If the _hashlib module (OpenSSL) doesn't support the named
9595
# hash, try using our builtin implementations.
9696
# This allows for SHA224/256 and SHA384/512 support even though
9797
# the OpenSSL library prior to 0.9.8 doesn't provide them.
98-
return __get_builtin_constructor(name)(string)
98+
return __get_builtin_constructor(name)(data)
9999

100100

101101
try:

‎Lib/test/test_file.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def tearDown(self):
2121
def testWeakRefs(self):
2222
# verify weak references
2323
p = proxy(self.f)
24-
p.write('teststring')
24+
p.write(b'teststring')
2525
self.assertEquals(self.f.tell(), p.tell())
2626
self.f.close()
2727
self.f = None
@@ -36,7 +36,7 @@ def testAttributes(self):
3636

3737
def testReadinto(self):
3838
# verify readinto
39-
self.f.write('12')
39+
self.f.write(b'12')
4040
self.f.close()
4141
a = array('b', b'x'*10)
4242
self.f = open(TESTFN, 'rb')
@@ -215,7 +215,7 @@ def testIteration(self):
215215
# Test the complex interaction when mixing file-iteration and the
216216
# various read* methods.
217217
dataoffset = 16384
218-
filler = "ham\n"
218+
filler = b"ham\n"
219219
assert not dataoffset % len(filler), \
220220
"dataoffset must be multiple of len(filler)"
221221
nchunks = dataoffset // len(filler)

‎Lib/test/test_fileinput.py‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ def writeTmp(i, lines, mode='w'): # opening in text mode is the default
2727

2828
def remove_tempfiles(*names):
2929
for name in names:
30-
safe_unlink(name)
30+
if name:
31+
safe_unlink(name)
3132

3233
class BufferSizesTests(unittest.TestCase):
3334
def test_buffer_sizes(self):
@@ -191,30 +192,33 @@ def test_opening_mode(self):
191192
self.fail("FileInput should reject invalid mode argument")
192193
except ValueError:
193194
pass
195+
t1 = None
194196
try:
195197
# try opening in universal newline mode
196-
t1 = writeTmp(1, ["A\nB\r\nC\rD"], mode="wb")
198+
t1 = writeTmp(1, [b"A\nB\r\nC\rD"], mode="wb")
197199
fi = FileInput(files=t1, mode="U")
198200
lines = list(fi)
199201
self.assertEqual(lines, ["A\n", "B\n", "C\n", "D"])
200202
finally:
201203
remove_tempfiles(t1)
202204

203-
## def test_file_opening_hook(self):
204-
## # XXX The rot13 codec was removed.
205-
## # So this test needs to be changed to use something else.
206-
## try:
207-
## # cannot use openhook and inplace mode
208-
## fi = FileInput(inplace=1, openhook=lambda f, m: None)
209-
## self.fail("FileInput should raise if both inplace "
210-
## "and openhook arguments are given")
211-
## except ValueError:
212-
## pass
213-
## try:
214-
## fi = FileInput(openhook=1)
215-
## self.fail("FileInput should check openhook for being callable")
216-
## except ValueError:
217-
## pass
205+
def test_file_opening_hook(self):
206+
try:
207+
# cannot use openhook and inplace mode
208+
fi = FileInput(inplace=1, openhook=lambda f, m: None)
209+
self.fail("FileInput should raise if both inplace "
210+
"and openhook arguments are given")
211+
except ValueError:
212+
pass
213+
try:
214+
fi = FileInput(openhook=1)
215+
self.fail("FileInput should check openhook for being callable")
216+
except ValueError:
217+
pass
218+
# XXX The rot13 codec was removed.
219+
# So this test needs to be changed to use something else.
220+
# (Or perhaps the API needs to change so we can just pass
221+
# an encoding rather than using a hook?)
218222
## try:
219223
## t1 = writeTmp(1, ["A\nB"], mode="wb")
220224
## fi = FileInput(files=t1, openhook=hook_encoded("rot13"))

‎Lib/test/test_hashlib.py‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ def test_hexdigest(self):
4141

4242

4343
def test_large_update(self):
44-
aas = 'a' * 128
45-
bees = 'b' * 127
46-
cees = 'c' * 126
44+
aas = b'a' * 128
45+
bees = b'b' * 127
46+
cees = b'c' * 126
4747

4848
for name in self.supported_hash_names:
4949
m1 = hashlib.new(name)
@@ -104,83 +104,83 @@ def test_case_sha1_3(self):
104104
# http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
105105

106106
def test_case_sha224_0(self):
107-
self.check('sha224', "",
107+
self.check('sha224', b"",
108108
"d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f")
109109

110110
def test_case_sha224_1(self):
111-
self.check('sha224', "abc",
111+
self.check('sha224', b"abc",
112112
"23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7")
113113

114114
def test_case_sha224_2(self):
115115
self.check('sha224',
116-
"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
116+
b"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
117117
"75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525")
118118

119119
def test_case_sha224_3(self):
120-
self.check('sha224', "a" * 1000000,
120+
self.check('sha224', b"a" * 1000000,
121121
"20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67")
122122

123123

124124
def test_case_sha256_0(self):
125-
self.check('sha256', "",
125+
self.check('sha256', b"",
126126
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
127127

128128
def test_case_sha256_1(self):
129-
self.check('sha256', "abc",
129+
self.check('sha256', b"abc",
130130
"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
131131

132132
def test_case_sha256_2(self):
133133
self.check('sha256',
134-
"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
134+
b"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
135135
"248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1")
136136

137137
def test_case_sha256_3(self):
138-
self.check('sha256', "a" * 1000000,
138+
self.check('sha256', b"a" * 1000000,
139139
"cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0")
140140

141141

142142
def test_case_sha384_0(self):
143-
self.check('sha384', "",
143+
self.check('sha384', b"",
144144
"38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da"+
145145
"274edebfe76f65fbd51ad2f14898b95b")
146146

147147
def test_case_sha384_1(self):
148-
self.check('sha384', "abc",
148+
self.check('sha384', b"abc",
149149
"cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed"+
150150
"8086072ba1e7cc2358baeca134c825a7")
151151

152152
def test_case_sha384_2(self):
153153
self.check('sha384',
154-
"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"+
155-
"hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
154+
b"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"+
155+
b"hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
156156
"09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712"+
157157
"fcc7c71a557e2db966c3e9fa91746039")
158158

159159
def test_case_sha384_3(self):
160-
self.check('sha384', "a" * 1000000,
160+
self.check('sha384', b"a" * 1000000,
161161
"9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b"+
162162
"07b8b3dc38ecc4ebae97ddd87f3d8985")
163163

164164

165165
def test_case_sha512_0(self):
166-
self.check('sha512', "",
166+
self.check('sha512', b"",
167167
"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce"+
168168
"47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")
169169

170170
def test_case_sha512_1(self):
171-
self.check('sha512', "abc",
171+
self.check('sha512', b"abc",
172172
"ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a"+
173173
"2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f")
174174

175175
def test_case_sha512_2(self):
176176
self.check('sha512',
177-
"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"+
178-
"hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
177+
b"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"+
178+
b"hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
179179
"8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018"+
180180
"501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909")
181181

182182
def test_case_sha512_3(self):
183-
self.check('sha512', "a" * 1000000,
183+
self.check('sha512', b"a" * 1000000,
184184
"e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973eb"+
185185
"de0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b")
186186

‎Lib/test/test_largefile.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# 2**31 == 2147483648
4040
f.seek(2147483649)
4141
# Seeking is not enough of a test: you must write and flush, too!
42-
f.write("x")
42+
f.write(b"x")
4343
f.flush()
4444
except (IOError, OverflowError):
4545
f.close()
@@ -70,10 +70,10 @@ def expect(got_this, expect_this):
7070
print('create large file via seek (may be sparse file) ...')
7171
f = open(name, 'wb')
7272
try:
73-
f.write('z')
73+
f.write(b'z')
7474
f.seek(0)
7575
f.seek(size)
76-
f.write('a')
76+
f.write(b'a')
7777
f.flush()
7878
if test_support.verbose:
7979
print('check file size with os.fstat')

‎Lib/test/test_multibytecodec.py‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -114,27 +114,28 @@ def test_dbcs(self):
114114
def test_dbcs_keep_buffer(self):
115115
decoder = codecs.getincrementaldecoder('cp949')()
116116
self.assertEqual(decoder.decode(b'\xc6\xc4\xc0'), '\ud30c')
117-
self.assertRaises(UnicodeDecodeError, decoder.decode, '', True)
117+
self.assertRaises(UnicodeDecodeError, decoder.decode, b'', True)
118118
self.assertEqual(decoder.decode(b'\xcc'), '\uc774')
119119

120120
self.assertEqual(decoder.decode(b'\xc6\xc4\xc0'), '\ud30c')
121-
self.assertRaises(UnicodeDecodeError, decoder.decode, '\xcc\xbd', True)
121+
self.assertRaises(UnicodeDecodeError, decoder.decode,
122+
b'\xcc\xbd', True)
122123
self.assertEqual(decoder.decode(b'\xcc'), '\uc774')
123124

124125
def test_iso2022(self):
125126
decoder = codecs.getincrementaldecoder('iso2022-jp')()
126-
ESC = '\x1b'
127-
self.assertEqual(decoder.decode(ESC + '('), '')
128-
self.assertEqual(decoder.decode('B', True), '')
129-
self.assertEqual(decoder.decode(ESC + '$'), '')
130-
self.assertEqual(decoder.decode('B@$'), '\u4e16')
131-
self.assertEqual(decoder.decode('@$@'), '\u4e16')
132-
self.assertEqual(decoder.decode('$', True), '\u4e16')
127+
ESC = b'\x1b'
128+
self.assertEqual(decoder.decode(ESC + b'('), '')
129+
self.assertEqual(decoder.decode(b'B', True), '')
130+
self.assertEqual(decoder.decode(ESC + b'$'), '')
131+
self.assertEqual(decoder.decode(b'B@$'), '\u4e16')
132+
self.assertEqual(decoder.decode(b'@$@'), '\u4e16')
133+
self.assertEqual(decoder.decode(b'$', True), '\u4e16')
133134
self.assertEqual(decoder.reset(), None)
134-
self.assertEqual(decoder.decode('@$'), '@$')
135-
self.assertEqual(decoder.decode(ESC + '$'), '')
136-
self.assertRaises(UnicodeDecodeError, decoder.decode, '', True)
137-
self.assertEqual(decoder.decode('B@$'), '\u4e16')
135+
self.assertEqual(decoder.decode(b'@$'), '@$')
136+
self.assertEqual(decoder.decode(ESC + b'$'), '')
137+
self.assertRaises(UnicodeDecodeError, decoder.decode, b'', True)
138+
self.assertEqual(decoder.decode(b'B@$'), '\u4e16')
138139

139140
class Test_StreamReader(unittest.TestCase):
140141
def test_bug1728403(self):
@@ -213,7 +214,7 @@ def test_streamwriter_strwrite(self):
213214

214215
class Test_ISO2022(unittest.TestCase):
215216
def test_g2(self):
216-
iso2022jp2 = '\x1b(B:hu4:unit\x1b.A\x1bNi de famille'
217+
iso2022jp2 = b'\x1b(B:hu4:unit\x1b.A\x1bNi de famille'
217218
uni = ':hu4:unit\xe9 de famille'
218219
self.assertEqual(iso2022jp2.decode('iso2022-jp-2'), uni)
219220

‎Modules/socketmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
11471147
struct sockaddr_un* addr;
11481148
char *path;
11491149
int len;
1150-
if (!PyArg_Parse(args, "t#", &path, &len))
1150+
if (!PyArg_Parse(args, "s#", &path, &len))
11511151
return 0;
11521152

11531153
addr = (struct sockaddr_un*)addr_ret;

0 commit comments

Comments
 (0)