Package: python-mimeparse Version: 0.1.3-6 Severity: normal Tags: patch Hi,
It looks like upstream isn't using code.google.com anymore, and has moved to pypi. Also, they renamed the upstream name from "mimeparse" to "python-mimeparse", and release version 0.1.4. It's a bit weird because on pypi, both https://pypi.python.org/pypi/python-mimeparse and https://pypi.python.org/pypi/mimeparse exist, though the former seems to be the most up-to-date repository. I need (in a timely maner) the version 0.1.4. Therefore, I have prepared a debdiff for your package. This debdiff also adds support for python3, since upstream package also supports that, and that other packages also need python3-mimeparse. Could you please upload this new version, or alternatively, allow me to NMU it, as per attached debdiff? Also, it would be nice if you decided to team-maintain the package. The python team is mostly welcoming everyone. Cheers, Thomas Goirand (zigo)
diff -Nru python-mimeparse-0.1.3/debian/changelog python-mimeparse-0.1.4/debian/changelog --- python-mimeparse-0.1.3/debian/changelog 2011-11-04 13:58:59.000000000 +0000 +++ python-mimeparse-0.1.4/debian/changelog 2013-07-23 08:12:26.000000000 +0000 @@ -1,3 +1,14 @@ +python-mimeparse (0.1.4-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + * Added support for python3. + * Removed wrong VCS fields (Closes: #717546). + * Updated Homepage: in debian/control and Source: field in debian/copyright. + * Standards-Version: is now 3.9.4 (no change). + + -- Thomas Goirand <z...@debian.org> Tue, 23 Jul 2013 08:00:13 +0000 + python-mimeparse (0.1.3-6) unstable; urgency=low * Use Debhelpper 8 diff -Nru python-mimeparse-0.1.3/debian/control python-mimeparse-0.1.4/debian/control --- python-mimeparse-0.1.3/debian/control 2011-11-03 22:56:10.000000000 +0000 +++ python-mimeparse-0.1.4/debian/control 2013-07-23 08:12:09.000000000 +0000 @@ -2,19 +2,30 @@ Section: python Priority: optional Maintainer: Mathias Ertl <apt-reposit...@fsinf.at> -Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~) -Homepage: https://code.google.com/p/mimeparse/ -Vcs-Browser: http://git.fsinf.at/apt/restauth/trees/master/python-mimeparse-0.1.3 -Vcs-Git: http://git.fsinf.at/apt/restauth.git +Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python3-all +Homepage: https://pypi.python.org/pypi/python-mimeparse Package: python-mimeparse Architecture: all Depends: ${misc:Depends}, ${python:Depends} -Description: Parse mime-types and quality parameters +Description: Parse mime-types and quality parameters - python 2.x This module provides basic functions for parsing mime-type names and matching them against a list of media-ranges. . See section 14.1 of RFC 2616 (the HTTP specification) for a complete explanation. + . + This package contains the Python 2.x module. +Package: python3-mimeparse +Architecture: all +Depends: ${misc:Depends}, ${python:Depends} +Description: Parse mime-types and quality parameters - python 3.x + This module provides basic functions for parsing mime-type names and + matching them against a list of media-ranges. + . + See section 14.1 of RFC 2616 (the HTTP specification) + for a complete explanation. + . + This package contains the Python 3.x module. diff -Nru python-mimeparse-0.1.3/debian/copyright python-mimeparse-0.1.4/debian/copyright --- python-mimeparse-0.1.3/debian/copyright 2011-11-03 22:56:10.000000000 +0000 +++ python-mimeparse-0.1.4/debian/copyright 2013-07-23 08:06:59.000000000 +0000 @@ -1,7 +1,7 @@ Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173&view=markup Upstream-Name: mimeparse Upstream-Contact: Joe Gregorio <j...@bitworking.org> -Source: http://code.google.com/p/mimeparse/ +Source: https://pypi.python.org/pypi/python-mimeparse Files: * Copyright: 2010, Joe Gregorio <j...@bitworking.org> diff -Nru python-mimeparse-0.1.3/debian/rules python-mimeparse-0.1.4/debian/rules --- python-mimeparse-0.1.3/debian/rules 2011-11-04 13:59:58.000000000 +0000 +++ python-mimeparse-0.1.4/debian/rules 2013-07-23 08:09:24.000000000 +0000 @@ -1,9 +1,25 @@ #!/usr/bin/make -f PYVERS=$(shell pyversions -sv) +PY3VERS=$(shell py3versions -sv) %: - dh $@ --with python2 + dh $@ --buildsystem=python_distutils --with python2,python3 + +override_dh_clean: + dh_clean + rm -rf build + +override_dh_auto_install: + set -e && for pyvers in $(PYVERS); do \ + python$$pyvers setup.py install --install-layout=deb \ + --root $(CURDIR)/debian/python-mimeparse; \ + done + + set -e && for pyvers in $(PY3VERS); do \ + python$$pyvers setup.py install --install-layout=deb \ + --root $(CURDIR)/debian/python3-mimeparse; \ + done get-orig-source: uscan --noconf --force-download --download-current-version --destdir=${CURDIR} diff -Nru python-mimeparse-0.1.3/LICENSE python-mimeparse-0.1.4/LICENSE --- python-mimeparse-0.1.3/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ python-mimeparse-0.1.4/LICENSE 2012-08-23 20:17:30.000000000 +0000 @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff -Nru python-mimeparse-0.1.3/mimeparse.py python-mimeparse-0.1.4/mimeparse.py --- python-mimeparse-0.1.3/mimeparse.py 2010-09-15 12:52:22.000000000 +0000 +++ python-mimeparse-0.1.4/mimeparse.py 2012-08-23 20:19:36.000000000 +0000 @@ -1,133 +1,167 @@ """MIME-Type Parser This module provides basic functions for handling mime-types. It can handle -matching mime-types against a list of media-ranges. See section 14.1 of -the HTTP specification [RFC 2616] for a complete explanation. +matching mime-types against a list of media-ranges. See section 14.1 of the +HTTP specification [RFC 2616] for a complete explanation. http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1 Contents: - - parse_mime_type(): Parses a mime-type into its component parts. - - parse_media_range(): Media-ranges are mime-types with wild-cards and a 'q' quality parameter. - - quality(): Determines the quality ('q') of a mime-type when compared against a list of media-ranges. - - quality_parsed(): Just like quality() except the second parameter must be pre-parsed. - - best_match(): Choose the mime-type with the highest quality ('q') from a list of candidates. + - parse_mime_type(): Parses a mime-type into its component parts. + - parse_media_range(): Media-ranges are mime-types with wild-cards and a 'q' + quality parameter. + - quality(): Determines the quality ('q') of a mime-type when + compared against a list of media-ranges. + - quality_parsed(): Just like quality() except the second parameter must be + pre-parsed. + - best_match(): Choose the mime-type with the highest quality ('q') + from a list of candidates. """ +from functools import reduce -__version__ = "0.1.3" +__version__ = '0.1.4' __author__ = 'Joe Gregorio' -__email__ = "j...@bitworking.org" -__credits__ = "" +__email__ = 'j...@bitworking.org' +__license__ = 'MIT License' +__credits__ = '' + def parse_mime_type(mime_type): - """Carves up a mime-type and returns a tuple of the - (type, subtype, params) where 'params' is a dictionary - of all the parameters for the media range. - For example, the media range 'application/xhtml;q=0.5' would - get parsed into: + """Parses a mime-type into its component parts. + + Carves up a mime-type and returns a tuple of the (type, subtype, params) + where 'params' is a dictionary of all the parameters for the media range. + For example, the media range 'application/xhtml;q=0.5' would get parsed + into: ('application', 'xhtml', {'q', '0.5'}) - """ - parts = mime_type.split(";") - params = dict([tuple([s.strip() for s in param.split("=")])\ - for param in parts[1:] ]) + """ + parts = mime_type.split(';') + params = dict([tuple([s.strip() for s in param.split('=', 1)]) + for param in parts[1:] + ]) full_type = parts[0].strip() - # Java URLConnection class sends an Accept header that includes a single "*" - # Turn it into a legal wildcard. - if full_type == '*': full_type = '*/*' - (type, subtype) = full_type.split("/") + # Java URLConnection class sends an Accept header that includes a + # single '*'. Turn it into a legal wildcard. + if full_type == '*': + full_type = '*/*' + (type, subtype) = full_type.split('/') + return (type.strip(), subtype.strip(), params) + def parse_media_range(range): - """Carves up a media range and returns a tuple of the - (type, subtype, params) where 'params' is a dictionary - of all the parameters for the media range. - For example, the media range 'application/*;q=0.5' would - get parsed into: + """Parse a media-range into its component parts. + + Carves up a media range and returns a tuple of the (type, subtype, + params) where 'params' is a dictionary of all the parameters for the media + range. For example, the media range 'application/*;q=0.5' would get parsed + into: ('application', '*', {'q', '0.5'}) - In addition this function also guarantees that there - is a value for 'q' in the params dictionary, filling it - in with a proper default if necessary. - """ + In addition this function also guarantees that there is a value for 'q' + in the params dictionary, filling it in with a proper default if + necessary. + """ (type, subtype, params) = parse_mime_type(range) - if not params.has_key('q') or not params['q'] or \ + if not 'q' in params or not params['q'] or \ not float(params['q']) or float(params['q']) > 1\ or float(params['q']) < 0: params['q'] = '1' + return (type, subtype, params) + def fitness_and_quality_parsed(mime_type, parsed_ranges): - """Find the best match for a given mime-type against - a list of media_ranges that have already been - parsed by parse_media_range(). Returns a tuple of - the fitness value and the value of the 'q' quality - parameter of the best match, or (-1, 0) if no match - was found. Just as for quality_parsed(), 'parsed_ranges' - must be a list of parsed media ranges. """ - best_fitness = -1 + """Find the best match for a mime-type amongst parsed media-ranges. + + Find the best match for a given mime-type against a list of media_ranges + that have already been parsed by parse_media_range(). Returns a tuple of + the fitness value and the value of the 'q' quality parameter of the best + match, or (-1, 0) if no match was found. Just as for quality_parsed(), + 'parsed_ranges' must be a list of parsed media ranges. + """ + best_fitness = -1 best_fit_q = 0 (target_type, target_subtype, target_params) =\ - parse_media_range(mime_type) + parse_media_range(mime_type) for (type, subtype, params) in parsed_ranges: - if (type == target_type or type == '*' or target_type == '*') and \ - (subtype == target_subtype or subtype == '*' or target_subtype == '*'): - param_matches = reduce(lambda x, y: x+y, [1 for (key, value) in \ - target_params.iteritems() if key != 'q' and \ - params.has_key(key) and value == params[key]], 0) + type_match = (type == target_type or + type == '*' or + target_type == '*') + subtype_match = (subtype == target_subtype or + subtype == '*' or + target_subtype == '*') + if type_match and subtype_match: + param_matches = reduce(lambda x, y: x + y, [1 for (key, value) in + list(target_params.items()) if key != 'q' and + key in params and value == params[key]], 0) fitness = (type == target_type) and 100 or 0 fitness += (subtype == target_subtype) and 10 or 0 fitness += param_matches if fitness > best_fitness: best_fitness = fitness best_fit_q = params['q'] - + return best_fitness, float(best_fit_q) + def quality_parsed(mime_type, parsed_ranges): - """Find the best match for a given mime-type against - a list of media_ranges that have already been - parsed by parse_media_range(). Returns the - 'q' quality parameter of the best match, 0 if no - match was found. This function bahaves the same as quality() - except that 'parsed_ranges' must be a list of + """Find the best match for a mime-type amongst parsed media-ranges. + + Find the best match for a given mime-type against a list of media_ranges + that have already been parsed by parse_media_range(). Returns the 'q' + quality parameter of the best match, 0 if no match was found. This function + bahaves the same as quality() except that 'parsed_ranges' must be a list of parsed media ranges. """ + return fitness_and_quality_parsed(mime_type, parsed_ranges)[1] + def quality(mime_type, ranges): - """Returns the quality 'q' of a mime-type when compared - against the media-ranges in ranges. For example: + """Return the quality ('q') of a mime-type against a list of media-ranges. - >>> quality('text/html','text/*;q=0.3, text/html;q=0.7, text/html;level=1, text/html;level=2;q=0.4, */*;q=0.5') + Returns the quality 'q' of a mime-type when compared against the + media-ranges in ranges. For example: + + >>> quality('text/html','text/*;q=0.3, text/html;q=0.7, + text/html;level=1, text/html;level=2;q=0.4, */*;q=0.5') 0.7 - - """ - parsed_ranges = [parse_media_range(r) for r in ranges.split(",")] + + """ + parsed_ranges = [parse_media_range(r) for r in ranges.split(',')] + return quality_parsed(mime_type, parsed_ranges) + def best_match(supported, header): - """Takes a list of supported mime-types and finds the best - match for all the media-ranges listed in header. The value of - header must be a string that conforms to the format of the - HTTP Accept: header. The value of 'supported' is a list of - mime-types. The list of supported mime-types should be sorted - in order of increasing desirability, in case of a situation - where there is a tie - - >>> best_match(['application/xbel+xml', 'text/xml'], 'text/*;q=0.5,*/*; q=0.1') + """Return mime-type with the highest quality ('q') from list of candidates. + + Takes a list of supported mime-types and finds the best match for all the + media-ranges listed in header. The value of header must be a string that + conforms to the format of the HTTP Accept: header. The value of 'supported' + is a list of mime-types. The list of supported mime-types should be sorted + in order of increasing desirability, in case of a situation where there is + a tie. + + >>> best_match(['application/xbel+xml', 'text/xml'], + 'text/*;q=0.5,*/*; q=0.1') 'text/xml' """ - parsed_header = [parse_media_range(r) for r in _filter_blank(header.split(","))] + split_header = _filter_blank(header.split(',')) + parsed_header = [parse_media_range(r) for r in split_header] weighted_matches = [] pos = 0 for mime_type in supported: weighted_matches.append((fitness_and_quality_parsed(mime_type, - parsed_header), pos, mime_type)) + parsed_header), pos, mime_type)) pos += 1 weighted_matches.sort() + return weighted_matches[-1][0][1] and weighted_matches[-1][2] or '' + def _filter_blank(i): for s in i: if s.strip(): diff -Nru python-mimeparse-0.1.3/mimeparse_test.py python-mimeparse-0.1.4/mimeparse_test.py --- python-mimeparse-0.1.3/mimeparse_test.py 2010-04-06 01:06:12.000000000 +0000 +++ python-mimeparse-0.1.4/mimeparse_test.py 2012-08-23 03:38:20.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env python """ Python tests for Mime-Type Parser. @@ -9,14 +10,11 @@ __email__ = "a...@oshineye.com" __credits__ = "" +import json import mimeparse import unittest from functools import partial -# Conditional import to support Python 2.5 -try: - import json -except ImportError: - import simplejson as json + def test_parse_media_range(args, expected): expected = tuple(expected) @@ -24,33 +22,39 @@ message = "Expected: '%s' but got %s" % (expected, result) assert expected == result, message + def test_quality(args, expected): result = mimeparse.quality(args[0], args[1]) message = "Expected: '%s' but got %s" % (expected, result) assert expected == result, message + def test_best_match(args, expected): result = mimeparse.best_match(args[0], args[1]) message = "Expected: '%s' but got %s" % (expected, result) assert expected == result, message + def test_parse_mime_type(args, expected): expected = tuple(expected) result = mimeparse.parse_mime_type(args) message = "Expected: '%s' but got %s" % (expected, result) assert expected == result, message + def add_tests(suite, json_object, func_name, test_func): test_data = json_object[func_name] for test_datum in test_data: args, expected = test_datum[0], test_datum[1] - desc = "%s(%s) with expected result: %s" % (func_name, str(args), str(expected)) + desc = "%s(%s) with expected result: %s" % (func_name, str(args), + str(expected)) if len(test_datum) == 3: desc = test_datum[2] + " : " + desc - func = partial(test_func, *(args, expected)) + func = partial(test_func, *(args, expected)) testcase = unittest.FunctionTestCase(func, description=desc) suite.addTest(testcase) + def run_tests(): json_object = json.load(open("testdata.json")) @@ -63,5 +67,6 @@ test_runner = unittest.TextTestRunner(verbosity=1) test_runner.run(suite) + if __name__ == "__main__": run_tests() diff -Nru python-mimeparse-0.1.3/PKG-INFO python-mimeparse-0.1.4/PKG-INFO --- python-mimeparse-0.1.3/PKG-INFO 2010-09-15 20:16:54.000000000 +0000 +++ python-mimeparse-0.1.4/PKG-INFO 2012-08-23 20:29:29.000000000 +0000 @@ -1,29 +1,33 @@ -Metadata-Version: 1.0 -Name: mimeparse -Version: 0.1.3 +Metadata-Version: 1.1 +Name: python-mimeparse +Version: 0.1.4 Summary: A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges. -Home-page: http://code.google.com/p/mimeparse/ -Author: Joe Gregorio -Author-email: j...@bitworking.org -License: MIT +Home-page: https://github.com/dbtsai/python-mimeparse +Author: David Tsai +Author-email: dbt...@dbtsai.com +License: UNKNOWN +Download-URL: http://pypi.python.org/packages/source/p/python-mimeparse/python-mimeparse-0.1.4.tar.gz Description: This module provides basic functions for handling mime-types. It can handle - matching mime-types against a list of media-ranges. See section 14.1 of + matching mime-types against a list of media-ranges. See section 14.1 of the HTTP specification [RFC 2616] for a complete explanation. http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1 Contents: - parse_mime_type(): Parses a mime-type into its component parts. - - parse_media_range(): Media-ranges are mime-types with wild-cards and a 'q' quality parameter. - - quality(): Determines the quality ('q') of a mime-type when compared against a list of media-ranges. + - parse_media_range(): Media-ranges are mime-types with wild-cards and a "q" quality parameter. + - quality(): Determines the quality ("q") of a mime-type when compared against a list of media-ranges. - quality_parsed(): Just like quality() except the second parameter must be pre-parsed. - - best_match(): Choose the mime-type with the highest quality ('q') from a list of candidates. - + - best_match(): Choose the mime-type with the highest quality ("q") from a list of candidates. + Keywords: mime-type Platform: UNKNOWN -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 3 +Classifier: License :: OSI Approved :: MIT License +Classifier: Operating System :: OS Independent +Classifier: Development Status :: 5 - Production/Stable +Classifier: Intended Audience :: Developers Classifier: Topic :: Internet :: WWW/HTTP Classifier: Topic :: Software Development :: Libraries :: Python Modules diff -Nru python-mimeparse-0.1.3/setup.cfg python-mimeparse-0.1.4/setup.cfg --- python-mimeparse-0.1.3/setup.cfg 1970-01-01 00:00:00.000000000 +0000 +++ python-mimeparse-0.1.4/setup.cfg 2012-08-23 05:15:20.000000000 +0000 @@ -0,0 +1,2 @@ +[easy_install] + diff -Nru python-mimeparse-0.1.3/setup.py python-mimeparse-0.1.4/setup.py --- python-mimeparse-0.1.3/setup.py 2010-09-15 20:15:36.000000000 +0000 +++ python-mimeparse-0.1.4/setup.py 2012-08-23 20:28:43.000000000 +0000 @@ -1,44 +1,40 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python -#old way from distutils.core import setup +import mimeparse -#new way -#from setuptools import setup, find_packages - -setup(name='mimeparse', - version='0.1.3', - description='A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges.', - long_description=""" +setup( + name="python-mimeparse", + py_modules=["mimeparse"], + version=mimeparse.__version__, + description="A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges.", + author="David Tsai", + author_email="dbt...@dbtsai.com", + url="https://github.com/dbtsai/python-mimeparse";, + download_url="http://pypi.python.org/packages/source/p/python-mimeparse/python-mimeparse-0.1.4.tar.gz";, + keywords=["mime-type"], + classifiers=[ + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Topic :: Internet :: WWW/HTTP", + "Topic :: Software Development :: Libraries :: Python Modules", + ], + long_description=""" This module provides basic functions for handling mime-types. It can handle -matching mime-types against a list of media-ranges. See section 14.1 of +matching mime-types against a list of media-ranges. See section 14.1 of the HTTP specification [RFC 2616] for a complete explanation. http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1 Contents: - parse_mime_type(): Parses a mime-type into its component parts. - - parse_media_range(): Media-ranges are mime-types with wild-cards and a 'q' quality parameter. - - quality(): Determines the quality ('q') of a mime-type when compared against a list of media-ranges. + - parse_media_range(): Media-ranges are mime-types with wild-cards and a "q" quality parameter. + - quality(): Determines the quality ("q") of a mime-type when compared against a list of media-ranges. - quality_parsed(): Just like quality() except the second parameter must be pre-parsed. - - best_match(): Choose the mime-type with the highest quality ('q') from a list of candidates. - """, - classifiers=[ - # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers - 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Software Development :: Libraries :: Python Modules', - ], - keywords='mime-type', - author='Joe Gregorio', - author_email='j...@bitworking.org', - maintainer='Joe Gregorio', - maintainer_email='j...@bitworking.org', - url='http://code.google.com/p/mimeparse/', - license='MIT', - py_modules=['mimeparse'], - zip_safe=True, - ) - + - best_match(): Choose the mime-type with the highest quality ("q") from a list of candidates. +""" +)
