Hello community, here is the log from the commit of package python for openSUSE:11.4 checked in at Fri Mar 16 18:23:01 CET 2012.
-------- --- old-versions/11.4/UPDATES/all/python/python-base.changes 2012-01-12 16:28:12.000000000 +0100 +++ 11.4/python/python-base.changes 2012-02-23 08:26:59.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 23 07:23:40 UTC 2012 - jcnen...@googlemail.com + +- Fix regression in acceptance of unicode strings in add_option calls + (http://bugs.python.org/issue9161) + +------------------------------------------------------------------- python.changes: same change calling whatdependson for 11.4-i586 New: ---- python-2.7-fix-UTF-arguments.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.fdhMTN/_old 2012-03-16 18:21:00.000000000 +0100 +++ /var/tmp/diff_new_pack.fdhMTN/_new 2012-03-16 18:21:00.000000000 +0100 @@ -30,7 +30,7 @@ # Summary: Python Interpreter base package Version: 2.7 -Release: 8.<RELEASE12> +Release: 8.<RELEASE14> %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -55,6 +55,7 @@ Patch13: python-fix_date_time_compiler.patch Patch14: python-2.7-CVE-2011-1521-fileurl.patch Patch15: python-2.7-fix-parallel-make.patch +Patch16: python-2.7-fix-UTF-arguments.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) Provides: %{name} = %{python_version} @@ -151,6 +152,7 @@ %patch13 %patch14 -p1 %patch15 -p1 +%patch16 -p1 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.fdhMTN/_old 2012-03-16 18:21:00.000000000 +0100 +++ /var/tmp/diff_new_pack.fdhMTN/_new 2012-03-16 18:21:00.000000000 +0100 @@ -24,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.7 -Release: 8.<RELEASE2> +Release: 8.<RELEASE3> %define pyver 2.7 BuildArch: noarch %define tarname Python-%{pyver} ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.fdhMTN/_old 2012-03-16 18:21:00.000000000 +0100 +++ /var/tmp/diff_new_pack.fdhMTN/_new 2012-03-16 18:21:00.000000000 +0100 @@ -32,7 +32,7 @@ Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.7 -Release: 9.<RELEASE12> +Release: 9.<RELEASE14> Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} ++++++ python-2.7-fix-UTF-arguments.patch ++++++ # HG changeset patch # User R. David Murray <rdmur...@bitdance.com> # Date 1278345965 0 # Node ID 705869d1bdf0fda211f099c1d4259652f4ad3f50 # Parent e84d5164414460a36fff780c27f7324859612b67 #9161: Fix regression in acceptance of unicode strings in add_option calls. The original change in 2.6 was made during rc1 changeover, and did not get ported to 2.7. The original change may not even have been intentional, but if so it doesn't seem to have caused any problems. diff --git a/Lib/optparse.py b/Lib/optparse.py --- a/Lib/optparse.py +++ b/Lib/optparse.py @@ -1008,7 +1008,7 @@ class OptionContainer: """add_option(Option) add_option(opt_str, ..., kwarg=val, ...) """ - if type(args[0]) is types.StringType: + if type(args[0]) in types.StringTypes: option = self.option_class(*args, **kwargs) elif len(args) == 1 and not kwargs: option = args[0] diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,9 @@ Core and Builtins Library ------- +- Issue #9161: Fix regression in optparse's acceptance of unicode + strings in add_option calls. + - Issue #9130: Fix validation of relative imports in parser module. - Issue #9128: Fix validation of class decorators in parser module. continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
