adding in to the whitelist (bug 651800)

mozilla · Apr 21, 2011 · 36996d7 · 36996d7
1 parent 0cdc333
commit 36996d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/apps/files/helpers.py b/apps/files/helpers.py
@@ -73,10 +73,13 @@ def is_binary(self, mimetype, filename):
             major, minor = mimetype.split('/')
             if major == 'text' and minor in ['plain', 'html', 'css']:
                 return False
+            elif major == 'application' and minor in ['json']:
+                return False
             elif minor in ['xml', 'rdf+xml', 'javascript', 'x-javascript',
-                         'xml-dtd', 'vnd.mozilla.xul+xml']:
+                           'xml-dtd', 'vnd.mozilla.xul+xml']:
                 return False
-        elif os.path.splitext(filename)[1] in ['.dtd', '.xul', '.properties']:
+        elif os.path.splitext(filename)[1] in ['.dtd', '.xul', '.properties',
+                                               '.src', '.mf', '.sf', '.json']:
             return False
         return True
 

diff --git a/apps/files/tests/test_helpers.py b/apps/files/tests/test_helpers.py
@@ -64,7 +64,7 @@ def test_isbinary(self):
         binary = self.viewer.is_binary
         for f in ['foo.rdf', 'foo.xml', 'foo.js', 'foo.py'
                   'foo.html', 'foo.txt', 'foo.dtd', 'foo.xul',
-                  'foo.properties']:
+                  'foo.properties', 'foo.json']:
             m, encoding = mimetypes.guess_type(f)
             assert not binary(m, f), '%s should not be binary' % f