Skip to content

Commit 9c5da7b

Browse files
committed
support python3.8
1 parent bb74862 commit 9c5da7b

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

oss2/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ def read(self, amt=None):
416416
if not content:
417417
self.read_all = True
418418
_invoke_progress_callback(self.progress_callback, self.offset, None)
419-
return ''
419+
return to_bytes('')
420420
else:
421421
_invoke_progress_callback(self.progress_callback, self.offset, None)
422422

@@ -488,7 +488,7 @@ def next(self):
488488

489489
def read(self, amt=None):
490490
if self.offset >= self.size:
491-
return ''
491+
return to_bytes('')
492492

493493
if amt is None or amt < 0:
494494
bytes_to_read = self.size - self.offset

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
'Programming Language :: Python :: 3.4',
5050
'Programming Language :: Python :: 3.5',
5151
'Programming Language :: Python :: 3.6',
52-
'Programming Language :: Python :: 3.7'
52+
'Programming Language :: Python :: 3.7',
53+
'Programming Language :: Python :: 3.8'
5354
]
5455
)

tests/test_headers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ def test_check_requestHeader(self):
99
myHeader = RequestHeader()
1010

1111
myHeader.set_server_side_encryption(algorithm="AES256")
12-
self.assertTrue(myHeader["x-oss-server-side-encryption"] is "AES256")
12+
self.assertEqual(myHeader["x-oss-server-side-encryption"], "AES256")
1313

1414
myHeader.set_server_side_encryption(algorithm='KMS')
15-
self.assertTrue(myHeader["x-oss-server-side-encryption"] is "KMS")
15+
self.assertEqual(myHeader["x-oss-server-side-encryption"], "KMS")
1616
self.assertTrue("x-oss-server-side-encryption-key-id" not in myHeader)
1717

1818
myHeader.set_server_side_encryption(algorithm="KMS", cmk_id="1111")
19-
self.assertTrue(myHeader["x-oss-server-side-encryption"] is "KMS")
20-
self.assertTrue(myHeader["x-oss-server-side-encryption-key-id"] is "1111")
19+
self.assertEqual(myHeader["x-oss-server-side-encryption"], "KMS")
20+
self.assertEqual(myHeader["x-oss-server-side-encryption-key-id"], "1111")
2121

2222
myHeader.set_server_side_encryption(algorithm="aaa")
2323
self.assertTrue("x-oss-server-side-encryption" not in myHeader)

tests/test_object.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ def test_get_object_iterator(self):
309309
content_got = b''
310310

311311
for chunk in result:
312-
content_got += oss2.to_bytes(chunk)
312+
content_got += chunk
313313

314314
self.assertEqual(len(content), len(content_got))
315315
self.assertEqual(content, content_got)

0 commit comments

Comments
 (0)