47e5f79122
[2.7] bpo-30824: Add mimetype for .json (GH-3048) ( #3394 )
...
(cherry picked from commit 8204b90368
2017-09-06 18:31:36 -04:00
7784888cce
Issue #19377 : Add .svg to mimetypes.types_map
...
This is a backport of caf89a6a17a7.
2016-04-09 08:17:53 +03:00
81f8d5771b
Issue #13952 : Add .csv to mimetypes.types_map
...
Patch by Geoff Wilson.
2016-04-09 08:06:15 +03:00
265bc81fa3
Issue #16329 : Add .webm to mimetypes.types_map
...
Patch by Giampaolo Rodola'.
2016-04-09 08:05:18 +03:00
32608c1b10
Issue #22028 : Ensure mimetypes will not open registry keys with embedded nulls
2015-03-10 13:19:17 -07:00
4becf85d54
don't allow unicode into type_map on Windows ( closes #21652 )
...
Patch from Vladimir Iofik.
2014-06-29 12:58:16 -07:00
3c5816f5e6
Issue #9291 Do not attempt to re-encode mimetype data read from registry in ANSI mode. Initial patches by Dmitry Jemerov & Vladimir Iofik
2014-04-27 16:36:47 +01:00
1adbacfd1c
Issue #20331 : Fixed possible FD leaks in various modules:
...
SimpleHTTPServer, imghdr, mailcap, mimetypes, xml.etree.
2014-01-25 19:42:27 +02:00
17934856dc
Issue #15207 : Fix mimetypes to read from correct area in Windows registry (Original patch by Dave Chambers)
2013-10-22 20:45:13 +01:00
6aca765220
Issue #16316 : mimetypes now recognizes the .xz and .txz (.tar.xz) extensions.
2013-05-04 15:11:46 +03:00
4efdc09a8d
#15199 : Fix JavaScript's default MIME type to application/javascript
2012-08-20 21:28:46 +03:00
4922a46e1a
#5301 : re-add image/vnd.microsoft.icon per discussion
...
We concluded that adding registered mimetypes present in most systems' mime
databases can be considered a bug fix.
2012-03-26 21:06:04 -04:00
ce7554f0a1
Revert commit that was not a bugfix ( #5301 ).
...
I won’t revert in 3.2, since Georg pulled this change in 3.2.2 and
released it.
2011-11-04 18:15:45 +01:00
a75039ad88
#5301 : add image/vnd.microsoft.icon (.ico) MIME type
2011-08-21 00:15:56 +02:00
4cc5403527
Merged revisions 85774 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85774 | brian.curtin | 2010-10-21 09:11:48 -0500 (Thu, 21 Oct 2010) | 7 lines
Fix #10162 : Add try/except around _winreg.OpenKey for keys that are
unreadable by all users, e.g., Flash, Silverlight, and Java keys were
causing errors.
We don't currently have a way to grant/deny permissions for a key
via winreg so there are no tests for this.
........
2010-10-21 14:48:22 +00:00
f7c24450be
Merged revisions 85497 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85497 | antoine.pitrou | 2010-10-14 23:15:17 +0200 (jeu., 14 oct. 2010) | 3 lines
Explicitly close some files (from issue #10093 )
........
2010-10-14 21:22:52 +00:00
84fedf7f06
No need to assign the results of expressions used only for side effects.
2010-02-06 22:59:15 +00:00
d5b34d4597
Issue #4969 : The mimetypes module now reads the MIME database from
...
the registry under Windows. Patch by Gabriel Genellina.
2009-11-15 14:10:48 +00:00
f2651e193c
Issue #5853 : calling a function of the mimetypes module from several threads
...
at once could hit the recursion limit if the mimetypes database hadn't been
initialized before.
2009-04-27 20:50:20 +00:00
ad58b7c9da
fix a silly problem of caching gone wrong #5401
2009-03-02 03:35:12 +00:00
dff51b2898
Patch 1353 by Jacob Winther.
...
Add mp4 mapping to mimetypes.py.
2007-10-29 20:52:45 +00:00
0c1f6fcaac
Add bz2 to content encodings.
2007-05-13 08:04:07 +00:00
0540be96f3
Bug #1202018 : add some common mime.types locations.
2006-06-14 08:42:11 +00:00
7d6b8954bf
Whitespace normalization.
2006-04-06 19:35:27 +00:00
04b9403e5b
Fix for failure of test_urllib2 breaking test_mimetypes (SF bug 1464978)
...
will backport.
2006-04-06 07:31:31 +00:00
7ce75151a4
add two more extensions:
...
- .wsdl --> Web Service Definition Language
- .xpdl --> XML Process Definition Language
2005-03-15 15:52:08 +00:00
893020b59b
Remove self from the arguments for the function add_type().
...
Backport candidate.
2003-12-19 18:15:10 +00:00
f0dfc7ac5c
Fix a bunch of typos in documentation, docstrings and comments.
...
(From SF patch #810751 )
2003-10-20 14:01:56 +00:00
9caa0d1642
guess_all_extensions(): Return the empty list instead of None when
...
there are no matching types. Updated the docs and docstrings. Added
some unit tests.
2003-06-09 22:27:41 +00:00
5e1222be57
Add Shockwave Flash.
...
(backport candidate?)
2003-01-04 14:11:38 +00:00
8fa8972d80
Remove a list comprehension, because a loop over the list
...
is done afterwards anyway, so what the list comp does
can be done in the loop.
2003-01-03 21:06:46 +00:00
51cc72c6c0
Pass the strict argument from read() on to readfp(), so the
...
file content ends up in the correct dict.
2003-01-03 21:02:36 +00:00
bb51ed333b
Fix read_mime_types() so that it returns a dict as documented.
...
This fixes a bug reported as http://www.python.org/sf/661630 ,
which was introduced in the patch http://www.python.org/sf/554192 .
2003-01-03 19:33:17 +00:00
5ccaf8f129
Apply diff3.txt (plus additional documentation)
...
from SF patch http://www.python.org/sf/554192
This adds two new functions to mimetypes:
guess_all_extensions() which returns a list of all known
extensions for a mime type, and add_type() which adds one
mapping between a mime type and an extension.
2002-09-06 16:15:58 +00:00
54f0222547
SF 563203. Replaced 'has_key()' with 'in'.
2002-06-01 14:18:47 +00:00
698da02d3b
Separate the script portion from the library portion; everything that
...
pertains to the script is now in the if __name__ == "__main__" block.
This is in response to a commenton python-dev from Neal Norwitz.
2001-12-05 15:58:29 +00:00
107771a228
Applying proposed patch for bug #474583 , optional support for
...
non-standard but common types. Including Martin's suggestion to add
rejected non-standard types from patch #438790 . Specifically,
guess_type(), guess_extension(): Both the functions and the methods
grow an optional "strict" flag, defaulting to true, which determines
whether to recognize non-standard, but commonly found types or not.
Also, I sorted, reformatted, and culled duplicates from the big
types_map dictionary. Note that there are a few non-equivalent
duplicates (e.g. .cdf and .xls) for which the first will just get
thrown away. I didn't remove those though.
Finally, use of the module as a script as grown the -l and -e options
to toggle strictness and to do guess_extension(), respectively.
Doc and unittest updates too.
2001-10-25 21:49:18 +00:00
a3689fe786
Patch #438790 : Add additional mappings.
...
Also remove mappings that are not registered with IANA, and not extensions.
2001-09-07 16:49:12 +00:00
6cb0d4c632
Add some fairly important file extensions: bmp css doc mid midi mp2 mp3 xls.
...
Entries taken from the standard Debian mime.types file.
2001-08-18 04:06:54 +00:00
c81a06998f
Another egregious error that copied the encodings info over the suffix
...
info. Caught by the tests that I'm writing now.
2001-08-16 18:14:38 +00:00
c019ecb7fe
Bad bug: the MimeTypes.readfp() was supposed to take a file object as a
...
parameter, but did not. This was found because it can create failures
elsewhere based on the presence of mime.types files in some common locations
the module searches by default.
(I will be writing a test for this module shortly!)
2001-08-16 15:54:28 +00:00
eeee4ec4f1
Refactor so that it is easier to work with alternate MIME types databases,
...
and programmatically extend the database in different ways.
This closes the SF bug (feature request) #439710 .
2001-08-03 21:01:44 +00:00
2750bcc2d1
Add .pyo as an extension, fixes bug #416462 . Also restore alphabetic order.
2001-06-05 05:17:00 +00:00
51cc3bcd1c
String method conversion. Added a trivial main to test it with.
2001-02-09 09:44:47 +00:00
03d9014992
added a few more __all__ lists
...
test___all__.py: fail silently in check_all if the module can't be imported
2001-01-25 15:29:22 +00:00
13a2c279c5
Untabify to pass the -tt test.
2000-02-10 17:17:14 +00:00
c40c54782c
Map .js to application/x-javascript.
1999-05-20 12:52:04 +00:00
cbd987040e
Added .rdf and .xsl as application/xml types. (.rdf is for the
...
Resource Description Framework, a metadata encoding, and .xsl is for
the Extensible Stylesheet Language.)
1999-03-11 16:04:04 +00:00
1c5fb1cd1b
Make mimetypes.guess_type understand data URLs. (Sjoerd Mullender)
1998-10-12 15:12:28 +00:00
c9132066e7
knownfiles: Add the default installation dirs for Apache
...
versions <= 1.2, >= 1.3.
1998-05-21 13:15:45 +00:00
Miss Islington (bot)
Berker Peksag
Steve Dower
Benjamin Peterson
Tim Golden
Serhiy Storchaka
Petri Lehtinen
R David Murray
Éric Araujo
Sandro Tosi
Brian Curtin
Antoine Pitrou
Georg Brandl
Guido van Rossum
Tim Peters
Anthony Baxter
Fred Drake
Walter Dörwald
Barry Warsaw
Raymond Hettinger
Martin v. Löwis
Ka-Ping Yee
Eric S. Raymond
Skip Montanaro