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

Skip to content

Commit 2b14022

Browse files
pferatepferate
committed
Updating string buffers to byte buffers
1 parent c9abbbd commit 2b14022

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

‎tests/test_discovery.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ def test_simple_media_upload_no_max_size_provided(self):
596596
zoo = build('zoo', 'v1', http=self.http)
597597
request = zoo.animals().crossbreed(media_body=datafile('small.png'))
598598
self.assertEquals('image/png', request.headers['content-type'])
599-
self.assertEquals('PNG', request.body[1:4])
599+
self.assertEquals(b'PNG', request.body[1:4])
600600

601601
def test_simple_media_raise_correct_exceptions(self):
602602
self.http = HttpMock(datafile('zoo.json'), {'status': '200'})
@@ -620,7 +620,7 @@ def test_simple_media_good_upload(self):
620620

621621
request = zoo.animals().insert(media_body=datafile('small.png'))
622622
self.assertEquals('image/png', request.headers['content-type'])
623-
self.assertEquals('PNG', request.body[1:4])
623+
self.assertEquals(b'PNG', request.body[1:4])
624624
assertUrisEqual(self,
625625
'https://www.googleapis.com/upload/zoo/v1/animals?uploadType=media&alt=json',
626626
request.uri)
@@ -852,7 +852,7 @@ def test_media_io_base_stream_unlimited_chunksize_resume(self):
852852
zoo = build('zoo', 'v1', http=self.http)
853853

854854
# Set up a seekable stream and try to upload in single chunk.
855-
fd = BytesIO('01234"56789"')
855+
fd = BytesIO(b'01234"56789"')
856856
media_upload = MediaIoBaseUpload(
857857
fd=fd, mimetype='text/plain', chunksize=-1, resumable=True)
858858

@@ -876,7 +876,7 @@ def test_media_io_base_stream_chunksize_resume(self):
876876
zoo = build('zoo', 'v1', http=self.http)
877877

878878
# Set up a seekable stream and try to upload in chunks.
879-
fd = BytesIO('0123456789')
879+
fd = BytesIO(b'0123456789')
880880
media_upload = MediaIoBaseUpload(
881881
fd=fd, mimetype='text/plain', chunksize=5, resumable=True)
882882

@@ -892,7 +892,7 @@ def test_media_io_base_stream_chunksize_resume(self):
892892
try:
893893
body = request.execute(http=http)
894894
except HttpError as e:
895-
self.assertEqual('01234', e.content)
895+
self.assertEqual(b'01234', e.content)
896896

897897
def test_resumable_media_handle_uploads_of_unknown_size(self):
898898
http = HttpMockSequence([
@@ -1001,7 +1001,7 @@ def test_resumable_media_handle_uploads_of_unknown_size_eof(self):
10011001
self.http = HttpMock(datafile('zoo.json'), {'status': '200'})
10021002
zoo = build('zoo', 'v1', http=self.http)
10031003

1004-
fd = BytesIO('data goes here')
1004+
fd = BytesIO(b'data goes here')
10051005

10061006
# Create an upload that doesn't know the full size of the media.
10071007
upload = MediaIoBaseUpload(
@@ -1025,7 +1025,7 @@ def test_resumable_media_handle_resume_of_upload_of_unknown_size(self):
10251025
zoo = build('zoo', 'v1', http=self.http)
10261026

10271027
# Create an upload that doesn't know the full size of the media.
1028-
fd = BytesIO('data goes here')
1028+
fd = BytesIO(b'data goes here')
10291029

10301030
upload = MediaIoBaseUpload(
10311031
fd=fd, mimetype='image/png', chunksize=500, resumable=True)

‎tests/test_http.py

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def test_media_file_upload_to_from_json(self):
137137
self.assertEqual(190, upload.size())
138138
self.assertEqual(True, upload.resumable())
139139
self.assertEqual(500, upload.chunksize())
140-
self.assertEqual('PNG', upload.getbytes(1, 3))
140+
self.assertEqual(b'PNG', upload.getbytes(1, 3))
141141

142142
json = upload.to_json()
143143
new_upload = MediaUpload.new_from_json(json)
@@ -146,20 +146,20 @@ def test_media_file_upload_to_from_json(self):
146146
self.assertEqual(190, new_upload.size())
147147
self.assertEqual(True, new_upload.resumable())
148148
self.assertEqual(500, new_upload.chunksize())
149-
self.assertEqual('PNG', new_upload.getbytes(1, 3))
149+
self.assertEqual(b'PNG', new_upload.getbytes(1, 3))
150150

151151
def test_media_file_upload_raises_on_invalid_chunksize(self):
152152
self.assertRaises(InvalidChunkSizeError, MediaFileUpload,
153153
datafile('small.png'), mimetype='image/png', chunksize=-2,
154154
resumable=True)
155155

156156
def test_media_inmemory_upload(self):
157-
media = MediaInMemoryUpload('abcdef', mimetype='text/plain', chunksize=10,
157+
media = MediaInMemoryUpload(b'abcdef', mimetype='text/plain', chunksize=10,
158158
resumable=True)
159159
self.assertEqual('text/plain', media.mimetype())
160160
self.assertEqual(10, media.chunksize())
161161
self.assertTrue(media.resumable())
162-
self.assertEqual('bc', media.getbytes(1, 2))
162+
self.assertEqual(b'bc', media.getbytes(1, 2))
163163
self.assertEqual(6, media.size())
164164

165165
def test_http_request_to_from_json(self):
@@ -205,21 +205,21 @@ def test_media_io_base_upload_from_file_io(self):
205205
self.assertEqual(190, upload.size())
206206
self.assertEqual(True, upload.resumable())
207207
self.assertEqual(500, upload.chunksize())
208-
self.assertEqual('PNG', upload.getbytes(1, 3))
208+
self.assertEqual(b'PNG', upload.getbytes(1, 3))
209209

210210
def test_media_io_base_upload_from_file_object(self):
211-
f = open(datafile('small.png'), 'r')
211+
f = open(datafile('small.png'), 'rb')
212212
upload = MediaIoBaseUpload(
213213
fd=f, mimetype='image/png', chunksize=500, resumable=True)
214214
self.assertEqual('image/png', upload.mimetype())
215215
self.assertEqual(190, upload.size())
216216
self.assertEqual(True, upload.resumable())
217217
self.assertEqual(500, upload.chunksize())
218-
self.assertEqual('PNG', upload.getbytes(1, 3))
218+
self.assertEqual(b'PNG', upload.getbytes(1, 3))
219219
f.close()
220220

221221
def test_media_io_base_upload_serializable(self):
222-
f = open(datafile('small.png'), 'r')
222+
f = open(datafile('small.png'), 'rb')
223223
upload = MediaIoBaseUpload(fd=f, mimetype='image/png')
224224

225225
try:
@@ -229,7 +229,7 @@ def test_media_io_base_upload_serializable(self):
229229
pass
230230

231231
def test_media_io_base_upload_from_string_io(self):
232-
f = open(datafile('small.png'), 'r')
232+
f = open(datafile('small.png'), 'rb')
233233
fd = StringIO(f.read())
234234
f.close()
235235

@@ -239,35 +239,35 @@ def test_media_io_base_upload_from_string_io(self):
239239
self.assertEqual(190, upload.size())
240240
self.assertEqual(True, upload.resumable())
241241
self.assertEqual(500, upload.chunksize())
242-
self.assertEqual('PNG', upload.getbytes(1, 3))
242+
self.assertEqual(b'PNG', upload.getbytes(1, 3))
243243
f.close()
244244

245245
def test_media_io_base_upload_from_bytes(self):
246-
f = open(datafile('small.png'), 'r')
246+
f = open(datafile('small.png'), 'rb')
247247
fd = BytesIO(f.read())
248248
upload = MediaIoBaseUpload(
249249
fd=fd, mimetype='image/png', chunksize=500, resumable=True)
250250
self.assertEqual('image/png', upload.mimetype())
251251
self.assertEqual(190, upload.size())
252252
self.assertEqual(True, upload.resumable())
253253
self.assertEqual(500, upload.chunksize())
254-
self.assertEqual('PNG', upload.getbytes(1, 3))
254+
self.assertEqual(b'PNG', upload.getbytes(1, 3))
255255

256256
def test_media_io_base_upload_raises_on_invalid_chunksize(self):
257-
f = open(datafile('small.png'), 'r')
257+
f = open(datafile('small.png'), 'rb')
258258
fd = BytesIO(f.read())
259259
self.assertRaises(InvalidChunkSizeError, MediaIoBaseUpload,
260260
fd, 'image/png', chunksize=-2, resumable=True)
261261

262262
def test_media_io_base_upload_streamable(self):
263-
fd = BytesIO('stuff')
263+
fd = BytesIO(b'stuff')
264264
upload = MediaIoBaseUpload(
265265
fd=fd, mimetype='image/png', chunksize=500, resumable=True)
266266
self.assertEqual(True, upload.has_stream())
267267
self.assertEqual(fd, upload.stream())
268268

269269
def test_media_io_base_next_chunk_retries(self):
270-
f = open(datafile('small.png'), 'r')
270+
f = open(datafile('small.png'), 'rb')
271271
fd = BytesIO(f.read())
272272
upload = MediaIoBaseUpload(
273273
fd=fd, mimetype='image/png', chunksize=500, resumable=True)
@@ -315,9 +315,9 @@ def setUp(self):
315315
def test_media_io_base_download(self):
316316
self.request.http = HttpMockSequence([
317317
({'status': '200',
318-
'content-range': '0-2/5'}, '123'),
318+
'content-range': '0-2/5'}, b'123'),
319319
({'status': '200',
320-
'content-range': '3-4/5'}, '45'),
320+
'content-range': '3-4/5'}, b'45'),
321321
])
322322
self.assertEqual(True, self.request.http.follow_redirects)
323323

@@ -333,25 +333,25 @@ def test_media_io_base_download(self):
333333

334334
status, done = download.next_chunk()
335335

336-
self.assertEqual(self.fd.getvalue(), '123')
336+
self.assertEqual(self.fd.getvalue(), b'123')
337337
self.assertEqual(False, done)
338338
self.assertEqual(3, download._progress)
339339
self.assertEqual(5, download._total_size)
340340
self.assertEqual(3, status.resumable_progress)
341341

342342
status, done = download.next_chunk()
343343

344-
self.assertEqual(self.fd.getvalue(), '12345')
344+
self.assertEqual(self.fd.getvalue(), b'12345')
345345
self.assertEqual(True, done)
346346
self.assertEqual(5, download._progress)
347347
self.assertEqual(5, download._total_size)
348348

349349
def test_media_io_base_download_handle_redirects(self):
350350
self.request.http = HttpMockSequence([
351351
({'status': '200',
352-
'content-location': 'https://secure.example.net/lion'}, ''),
352+
'content-location': 'https://secure.example.net/lion'}, b''),
353353
({'status': '200',
354-
'content-range': '0-2/5'}, 'abc'),
354+
'content-range': '0-2/5'}, b'abc'),
355355
])
356356

357357
download = MediaIoBaseDownload(
@@ -378,25 +378,25 @@ def test_media_io_base_download_handle_4xx(self):
378378
# Even after raising an exception we can pick up where we left off.
379379
self.request.http = HttpMockSequence([
380380
({'status': '200',
381-
'content-range': '0-2/5'}, '123'),
381+
'content-range': '0-2/5'}, b'123'),
382382
])
383383

384384
status, done = download.next_chunk()
385385

386-
self.assertEqual(self.fd.getvalue(), '123')
386+
self.assertEqual(self.fd.getvalue(), b'123')
387387

388388
def test_media_io_base_download_retries_5xx(self):
389389
self.request.http = HttpMockSequence([
390390
({'status': '500'}, ''),
391391
({'status': '500'}, ''),
392392
({'status': '500'}, ''),
393393
({'status': '200',
394-
'content-range': '0-2/5'}, '123'),
394+
'content-range': '0-2/5'}, b'123'),
395395
({'status': '503'}, ''),
396396
({'status': '503'}, ''),
397397
({'status': '503'}, ''),
398398
({'status': '200',
399-
'content-range': '3-4/5'}, '45'),
399+
'content-range': '3-4/5'}, b'45'),
400400
])
401401

402402
download = MediaIoBaseDownload(
@@ -419,7 +419,7 @@ def test_media_io_base_download_retries_5xx(self):
419419
# Check for exponential backoff using the rand function above.
420420
self.assertEqual([20, 40, 80], sleeptimes)
421421

422-
self.assertEqual(self.fd.getvalue(), '123')
422+
self.assertEqual(self.fd.getvalue(), b'123')
423423
self.assertEqual(False, done)
424424
self.assertEqual(3, download._progress)
425425
self.assertEqual(5, download._total_size)
@@ -433,7 +433,7 @@ def test_media_io_base_download_retries_5xx(self):
433433
# Check for exponential backoff using the rand function above.
434434
self.assertEqual([20, 40, 80], sleeptimes)
435435

436-
self.assertEqual(self.fd.getvalue(), '12345')
436+
self.assertEqual(self.fd.getvalue(), b'12345')
437437
self.assertEqual(True, done)
438438
self.assertEqual(5, download._progress)
439439
self.assertEqual(5, download._total_size)
@@ -670,7 +670,7 @@ def test_serialize_request(self):
670670
None,
671671
'https://www.googleapis.com/someapi/v1/collection/?foo=bar',
672672
method='POST',
673-
body='{}',
673+
body=u'{}',
674674
headers={'content-type': 'application/json'},
675675
methodId=None,
676676
resumable=None)
@@ -679,7 +679,7 @@ def test_serialize_request(self):
679679

680680
def test_serialize_request_media_body(self):
681681
batch = BatchHttpRequest()
682-
f = open(datafile('small.png'))
682+
f = open(datafile('small.png'), 'rb')
683683
body = f.read()
684684
f.close()
685685

@@ -702,7 +702,7 @@ def test_serialize_request_no_body(self):
702702
None,
703703
'https://www.googleapis.com/someapi/v1/collection/?foo=bar',
704704
method='POST',
705-
body='',
705+
body=b'',
706706
headers={'content-type': 'application/json'},
707707
methodId=None,
708708
resumable=None)
@@ -940,21 +940,21 @@ class TestStreamSlice(unittest.TestCase):
940940
"""Test _StreamSlice."""
941941

942942
def setUp(self):
943-
self.stream = BytesIO('0123456789')
943+
self.stream = BytesIO(b'0123456789')
944944

945945
def test_read(self):
946946
s = _StreamSlice(self.stream, 0, 4)
947-
self.assertEqual('', s.read(0))
948-
self.assertEqual('0', s.read(1))
949-
self.assertEqual('123', s.read())
947+
self.assertEqual(b'', s.read(0))
948+
self.assertEqual(b'0', s.read(1))
949+
self.assertEqual(b'123', s.read())
950950

951951
def test_read_too_much(self):
952952
s = _StreamSlice(self.stream, 1, 4)
953-
self.assertEqual('1234', s.read(6))
953+
self.assertEqual(b'1234', s.read(6))
954954

955955
def test_read_all(self):
956956
s = _StreamSlice(self.stream, 2, 1)
957-
self.assertEqual('2', s.read(-1))
957+
self.assertEqual(b'2', s.read(-1))
958958

959959

960960
class TestResponseCallback(unittest.TestCase):

0 commit comments

Comments
 (0)