mirror of
https://github.com/jupyter/notebook.git
synced 2024-12-27 04:20:22 +08:00
set default mimetype to octet-stream for binary files
mimetype only specified if content=True
This commit is contained in:
parent
8160308bb2
commit
407e63cb80
@ -268,7 +268,6 @@ class FileContentsManager(ContentsManager):
|
||||
model['type'] = 'file'
|
||||
|
||||
os_path = self._get_os_path(path)
|
||||
model['mimetype'] = mimetypes.guess_type(os_path)[0] or 'text/plain'
|
||||
|
||||
if content:
|
||||
if not os.path.isfile(os_path):
|
||||
@ -285,10 +284,14 @@ class FileContentsManager(ContentsManager):
|
||||
raise web.HTTPError(400, "%s is not UTF-8 encoded" % path)
|
||||
else:
|
||||
model['format'] = 'text'
|
||||
default_mime = 'text/plain'
|
||||
|
||||
if model['content'] is None:
|
||||
model['content'] = base64.encodestring(bcontent).decode('ascii')
|
||||
model['format'] = 'base64'
|
||||
default_mime = 'application/octet-stream'
|
||||
|
||||
model['mimetype'] = mimetypes.guess_type(os_path)[0] or default_mime
|
||||
|
||||
return model
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user