Skip to content

Commit bcc1423

Browse files
committed
fix mime_type not work
1 parent 549817f commit bcc1423

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

qiniu/services/storage/uploaders/form_uploader.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ def upload(
116116
fields=fields,
117117
file_name=file_name,
118118
data=data,
119-
data_size=data_size
119+
data_size=data_size,
120+
mime_type=mime_type
120121
)
121122
finally:
122123
if file_path:
@@ -131,7 +132,7 @@ def __upload_data(
131132
file_name,
132133
data,
133134
data_size=None,
134-
mimetype='application/octet-stream'
135+
mime_type='application/octet-stream'
135136
):
136137
"""
137138
Parameters
@@ -141,7 +142,7 @@ def __upload_data(
141142
file_name: str
142143
data: IOBase
143144
data_size: int
144-
mimetype: str
145+
mime_type: str
145146
146147
Returns
147148
-------
@@ -157,7 +158,7 @@ def __upload_data(
157158
url=up_host,
158159
data=fields,
159160
files={
160-
'file': (file_name, data, mimetype)
161+
'file': (file_name, data, mime_type)
161162
}
162163
)
163164
if resp.ok() and ret:

qiniu/services/storage/uploaders/resume_uploader_v1.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ def complete_parts(
378378
file_name = kwargs.get('file_name', None)
379379
params = kwargs.get('params', None)
380380
metadata = kwargs.get('metadata', None)
381+
mime_type = kwargs.get('mime_type', None)
381382

382383
# sort contexts
383384
sorted_parts = sorted(context.parts, key=lambda part: part.part_no)
@@ -388,6 +389,7 @@ def complete_parts(
388389
url = self.__get_mkfile_url(
389390
up_host=up_host,
390391
data_size=data_size,
392+
mime_type=mime_type,
391393
key=key,
392394
file_name=file_name,
393395
params=params,
@@ -506,6 +508,7 @@ def upload(
506508
context=context,
507509

508510
key=key,
511+
mime_type=mime_type,
509512
file_name=file_name,
510513
params=custom_vars,
511514
metadata=metadata

qiniu/services/storage/uploaders/resume_uploader_v2.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ def complete_parts(
403403
"""
404404
key = kwargs.get('key', None)
405405
file_name = kwargs.get('file_name', None)
406-
mimetype = kwargs.get('mimetype', None)
406+
mime_type = kwargs.get('mime_type', None)
407407
params = kwargs.get('params', None)
408408
metadata = kwargs.get('metadata', None)
409409

@@ -429,7 +429,7 @@ def complete_parts(
429429
for p in sorted_parts
430430
],
431431
'fname': file_name,
432-
'mimeType': mimetype,
432+
'mimeType': mime_type,
433433
'customVars': params,
434434
'metadata': metadata
435435
}
@@ -561,6 +561,7 @@ def upload(
561561
context=context,
562562

563563
key=key,
564+
mime_type=mime_type,
564565
file_name=file_name,
565566
params=custom_vars,
566567
metadata=metadata

0 commit comments

Comments
 (0)