Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: r'' prefix default values for mimetypes.guess_mime()
authorGregory Szorc <gregory.szorc@gmail.com>
Fri, 12 Oct 2018 19:49:02 +0200
changeset 40211 d216ae4cc3f6
parent 40210 8f192f2c4a1e
child 40212 885d5cf9b6a4
py3: r'' prefix default values for mimetypes.guess_mime() As suggested by @yuja in D4967. Differential Revision: https://phab.mercurial-scm.org/D5020
mercurial/hgweb/common.py file | annotate | diff | comparison | revisions
mercurial/hgweb/webcommands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hgweb/common.py	Fri Oct 12 20:03:29 2018 +0000
+++ b/mercurial/hgweb/common.py	Fri Oct 12 19:49:02 2018 +0200
@@ -183,7 +183,7 @@
     try:
         os.stat(path)
         ct = pycompat.sysbytes(
-            mimetypes.guess_type(pycompat.fsdecode(path))[0] or "text/plain")
+            mimetypes.guess_type(pycompat.fsdecode(path))[0] or r"text/plain")
         with open(path, 'rb') as fh:
             data = fh.read()
 
--- a/mercurial/hgweb/webcommands.py	Fri Oct 12 20:03:29 2018 +0000
+++ b/mercurial/hgweb/webcommands.py	Fri Oct 12 19:49:02 2018 +0200
@@ -151,7 +151,7 @@
     if stringutil.binary(text):
         mt = pycompat.sysbytes(
             mimetypes.guess_type(pycompat.fsdecode(f))[0]
-            or 'application/octet-stream')
+            or r'application/octet-stream')
         text = '(binary:%s)' % mt
 
     def lines(context):
@@ -864,7 +864,7 @@
         if f.isbinary():
             mt = pycompat.sysbytes(
                 mimetypes.guess_type(pycompat.fsdecode(f.path()))[0]
-                or 'application/octet-stream')
+                or r'application/octet-stream')
             return [_('(binary file %s, hash: %s)') % (mt, hex(f.filenode()))]
         return f.data().splitlines()
 
@@ -952,7 +952,7 @@
         if fctx.isbinary():
             mt = pycompat.sysbytes(
                 mimetypes.guess_type(pycompat.fsdecode(fctx.path()))[0]
-                or 'application/octet-stream')
+                or r'application/octet-stream')
             lines = [dagop.annotateline(fctx=fctx.filectx(fctx.filerev()),
                                         lineno=1, text='(binary:%s)' % mt)]
         else:
Mercurial