File tree 4 files changed +9
-8
lines changed
4 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -416,7 +416,7 @@ def read(self, amt=None):
416
416
if not content :
417
417
self .read_all = True
418
418
_invoke_progress_callback (self .progress_callback , self .offset , None )
419
- return ''
419
+ return to_bytes ( '' )
420
420
else :
421
421
_invoke_progress_callback (self .progress_callback , self .offset , None )
422
422
@@ -488,7 +488,7 @@ def next(self):
488
488
489
489
def read (self , amt = None ):
490
490
if self .offset >= self .size :
491
- return ''
491
+ return to_bytes ( '' )
492
492
493
493
if amt is None or amt < 0 :
494
494
bytes_to_read = self .size - self .offset
Original file line number Diff line number Diff line change 49
49
'Programming Language :: Python :: 3.4' ,
50
50
'Programming Language :: Python :: 3.5' ,
51
51
'Programming Language :: Python :: 3.6' ,
52
- 'Programming Language :: Python :: 3.7'
52
+ 'Programming Language :: Python :: 3.7' ,
53
+ 'Programming Language :: Python :: 3.8'
53
54
]
54
55
)
Original file line number Diff line number Diff line change @@ -9,15 +9,15 @@ def test_check_requestHeader(self):
9
9
myHeader = RequestHeader ()
10
10
11
11
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" )
13
13
14
14
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" )
16
16
self .assertTrue ("x-oss-server-side-encryption-key-id" not in myHeader )
17
17
18
18
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" )
21
21
22
22
myHeader .set_server_side_encryption (algorithm = "aaa" )
23
23
self .assertTrue ("x-oss-server-side-encryption" not in myHeader )
Original file line number Diff line number Diff line change @@ -309,7 +309,7 @@ def test_get_object_iterator(self):
309
309
content_got = b''
310
310
311
311
for chunk in result :
312
- content_got += oss2 . to_bytes ( chunk )
312
+ content_got += chunk
313
313
314
314
self .assertEqual (len (content ), len (content_got ))
315
315
self .assertEqual (content , content_got )
You can’t perform that action at this time.
0 commit comments