diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-09 12:01:37 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-09 12:01:37 +0100 |
| commit | 172bcb270783c0a6765ba4fdb09cfebbb06162bb (patch) | |
| tree | 720754dd150f93303a45b5d2591af68fc7c52e57 | |
| parent | 275362421e548ad87a0654fc00c423cccf198131 (diff) | |
| parent | 3b75f344d0187abe3837986830bca204a2759b49 (diff) | |
| download | grit-172bcb270783c0a6765ba4fdb09cfebbb06162bb.tar.gz | |
Merge from Chromium at DEPS revision 275586
This commit was generated by merge_to_master.py.
Change-Id: Ia632c3f79324f440aa9eef546ac71554d7e8afd3
| -rwxr-xr-x | grit/format/html_inline.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/grit/format/html_inline.py b/grit/format/html_inline.py index 589e49b..c2b898e 100755 --- a/grit/format/html_inline.py +++ b/grit/format/html_inline.py @@ -19,6 +19,12 @@ import mimetypes from grit import lazy_re from grit import util +# There is a python bug that makes mimetypes crash if the Windows +# registry contains non-Latin keys ( http://bugs.python.org/issue9291 +# ). Initing manually and blocking external mime-type databases will +# prevent that bug and still give us the data we need. +mimetypes.init([]) + DIST_DEFAULT = 'chromium' DIST_ENV_VAR = 'CHROMIUM_BUILD' DIST_SUBSTR = '%DISTRIBUTION%' |