mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-05 12:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7136 from minrk/octet-stream

Browse Source 
set default mimetype to octet-stream for binary files
This commit is contained in:
Thomas Kluyver 2014-12-08 18:23:31 -08:00
commit 9f48e86477
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IPython/html/services/contents/filemanager.py
View File

@ -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