Hello community, here is the log from the commit of package python-simplejson for openSUSE:Factory checked in at 2013-02-22 17:01:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-simplejson (Old) and /work/SRC/openSUSE:Factory/.python-simplejson.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-simplejson", Maintainer is "kkae...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-simplejson/python-simplejson.changes 2013-01-20 08:18:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-simplejson.new/python-simplejson.changes 2013-02-22 17:01:03.000000000 +0100 @@ -1,0 +2,20 @@ +Thu Feb 21 15:39:09 UTC 2013 - p.drou...@gmail.com + +- Update to version 3.0.8: + * Fix a Python 2.x compiler warning for narrow unicode builds + https://github.com/simplejson/simplejson/issues/56 + +------------------------------------------------------------------- +Thu Jan 17 14:19:25 UTC 2013 - toddrme2...@gmail.com + +- Update to 3.0.7 + * NOTE: this release only changes the license. + * simplejson is now dual-licensed software, MIT or AFL v2.1. It is + also made explicit that this code is also licensed to the PSF under + a Contributor Agreement. +- Update to 3.0.7 + * Fix for major Python 2.x ensure_ascii=False encoding regression + introduced in simplejson 3.0.0. If you use this setting, please + upgrade immediately. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-simplejson/python3-simplejson.changes 2013-01-20 08:18:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-simplejson.new/python3-simplejson.changes 2013-02-22 17:01:03.000000000 +0100 @@ -1,0 +2,25 @@ +Thu Feb 21 15:39:09 UTC 2013 - p.drou...@gmail.com + +- Update to version 3.0.8: + * Fix a Python 2.x compiler warning for narrow unicode builds + https://github.com/simplejson/simplejson/issues/56 + +------------------------------------------------------------------- +Wed Jan 30 12:00:26 UTC 2013 - sasc...@suse.de + +- Use 2to3 to fix build, disable testsuite for now + +------------------------------------------------------------------- +Thu Jan 17 14:19:25 UTC 2013 - toddrme2...@gmail.com + +- Update to 3.0.7 + * NOTE: this release only changes the license. + * simplejson is now dual-licensed software, MIT or AFL v2.1. It is + also made explicit that this code is also licensed to the PSF under + a Contributor Agreement. +- Update to 3.0.7 + * Fix for major Python 2.x ensure_ascii=False encoding regression + introduced in simplejson 3.0.0. If you use this setting, please + upgrade immediately. + +------------------------------------------------------------------- Old: ---- simplejson-3.0.5.tar.gz New: ---- simplejson-3.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-simplejson.spec ++++++ --- /var/tmp/diff_new_pack.7rYe9P/_old 2013-02-22 17:01:05.000000000 +0100 +++ /var/tmp/diff_new_pack.7rYe9P/_new 2013-02-22 17:01:05.000000000 +0100 @@ -16,15 +16,14 @@ # -%define modname simplejson -Name: python-%{modname} -Version: 3.0.5 +Name: python-simplejson +Version: 3.0.8 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python -License: MIT +License: MIT or AFL-2.1 Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/s/%{modname}/%{modname}-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/s/simplejson/simplejson-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute @@ -41,7 +40,7 @@ serious speed boost. %prep -%setup -q -n %{modname}-%{version} +%setup -q -n simplejson-%{version} %build CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build @@ -55,7 +54,7 @@ %files %defattr(-,root,root) %doc CHANGES.txt LICENSE.txt README.rst -%{python_sitearch}/%{modname}/ -%{python_sitearch}/%{modname}-%{version}-py%{py_ver}.egg-info +%{python_sitearch}/simplejson/ +%{python_sitearch}/simplejson-%{version}-py%{py_ver}.egg-info %changelog ++++++ python3-simplejson.spec ++++++ --- /var/tmp/diff_new_pack.7rYe9P/_old 2013-02-22 17:01:05.000000000 +0100 +++ /var/tmp/diff_new_pack.7rYe9P/_new 2013-02-22 17:01:05.000000000 +0100 @@ -16,17 +16,17 @@ # -%define modname simplejson -Name: python3-%{modname} -Version: 3.0.5 +Name: python3-simplejson +Version: 3.0.8 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python -License: MIT +License: MIT or AFL-2.1 Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/s/%{modname}/%{modname}-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/s/simplejson/simplejson-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 +BuildRequires: python3-2to3 BuildRequires: python3-devel BuildRequires: python3-distribute Requires: python3-coverage @@ -39,23 +39,23 @@ serious speed boost. %prep -%setup -q -n %{modname}-%{version} +%setup -q -n simplejson-%{version} %build -python3 setup.py build +2to3 -w -n ./ +CFLAGS="%{optflags} -fno-strict-aliasing" python3 setup.py build %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -%check -%if 0%{?suse_version} >= 1230 -python3 setup.py test -%endif +#NOTE(saschpe): Recursion error, check back: +#%%check +#python3 setup.py test %files %defattr(-,root,root) %doc CHANGES.txt LICENSE.txt README.rst -%{python3_sitearch}/%{modname}/ -%{python3_sitearch}/%{modname}-%{version}-py%{py3_ver}.egg-info +%{python3_sitearch}/simplejson/ +%{python3_sitearch}/simplejson-%{version}-py%{py3_ver}.egg-info %changelog ++++++ simplejson-3.0.5.tar.gz -> simplejson-3.0.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.0.5/CHANGES.txt new/simplejson-3.0.8/CHANGES.txt --- old/simplejson-3.0.5/CHANGES.txt 2013-01-03 20:30:27.000000000 +0100 +++ new/simplejson-3.0.8/CHANGES.txt 2013-02-19 19:23:19.000000000 +0100 @@ -1,3 +1,22 @@ +Version 3.0.8 released 2013-02-19 + +* Fix a Python 2.x compiler warning for narrow unicode builds + https://github.com/simplejson/simplejson/issues/56 + +Version 3.0.7 released 2013-01-11 + +* NOTE: this release only changes the license. +* simplejson is now dual-licensed software, MIT or AFL v2.1. It is + also made explicit that this code is also licensed to the PSF under + a Contributor Agreement. + +Version 3.0.6 released 2013-01-11 + +* Fix for major Python 2.x ensure_ascii=False encoding regression + introduced in simplejson 3.0.0. If you use this setting, please + upgrade immediately. + https://github.com/simplejson/simplejson/issues/50 + Version 3.0.5 released 2013-01-03 * NOTE: this release only changes the tests, it is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.0.5/LICENSE.txt new/simplejson-3.0.8/LICENSE.txt --- old/simplejson-3.0.5/LICENSE.txt 2012-05-11 00:04:51.000000000 +0200 +++ new/simplejson-3.0.8/LICENSE.txt 2013-01-11 19:16:10.000000000 +0100 @@ -1,3 +1,12 @@ +simplejson is dual-licensed software. It is available under the terms +of the MIT license, or the Academic Free License version 2.1. The full +text of each license agreement is included below. This code is also +licensed to the Python Software Foundation (PSF) under a Contributor +Agreement. + +MIT License +=========== + Copyright (c) 2006 Bob Ippolito Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -17,3 +26,54 @@ 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. + +Academic Free License v. 2.1 +============================ + +Copyright (c) 2006 Bob Ippolito. All rights reserved. + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work: + +Licensed under the Academic Free License version 2.1 + +1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following: + +a) to reproduce the Original Work in copies; + +b) to prepare derivative works ("Derivative Works") based upon the Original Work; + +c) to distribute copies of the Original Work and Derivative Works to the public; + +d) to perform the Original Work publicly; and + +e) to display the Original Work publicly. + +2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, to make, use, sell and offer for sale the Original Work and Derivative Works. + +3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor hereby agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work, and by publishing the address of that information repository in a notice immediately following the copyright notice that applies to the Original Work. + +4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior written permission of the Licensor. Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor except as expressly stated herein. No patent license is granted to make, use, sell or offer to sell embodiments of any patent claims other than the licensed claims defined in Section 2. No right is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any Original Work that Licensor otherwise would have a right to license. + +5) This section intentionally omitted. + +6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + +7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately proceeding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to Original Work is granted hereunder except under this disclaimer. + +8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to any person for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to liability for death or personal injury resulting from Licensor's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You. + +9) Acceptance and Termination. If You distribute copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. Nothing else but this License (or another written agreement between Licensor and You) grants You permission to create Derivative Works based upon the Original Work or to exercise any of the rights granted in Section 1 herein, and any attempt to do so except under the terms of this License (or another written agreement between Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent laws of other countries, and by international treaty. Therefore, by exercising any of the rights granted to You in Section 1 herein, You indicate Your acceptance of this License and all of its terms and conditions. + +10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + +11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of the U.S. Copyright Act, 17 U.S.C. ยง 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License. + +12) Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + +13) Miscellaneous. This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + +14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + +This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved. Permission is hereby granted to copy and distribute this license without modification. This license may not be modified without the express written permission of its copyright owner. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.0.5/PKG-INFO new/simplejson-3.0.8/PKG-INFO --- old/simplejson-3.0.5/PKG-INFO 2013-01-03 20:43:09.000000000 +0100 +++ new/simplejson-3.0.8/PKG-INFO 2013-02-19 19:45:33.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: simplejson -Version: 3.0.5 +Version: 3.0.8 Summary: Simple, fast, extensible JSON encoder/decoder for Python Home-page: http://github.com/simplejson/simplejson Author: Bob Ippolito @@ -30,6 +30,7 @@ Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: MIT License +Classifier: License :: OSI Approved :: Academic Free License (AFL) Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.0.5/conf.py new/simplejson-3.0.8/conf.py --- old/simplejson-3.0.5/conf.py 2013-01-03 20:29:03.000000000 +0100 +++ new/simplejson-3.0.8/conf.py 2013-02-19 19:23:19.000000000 +0100 @@ -44,7 +44,7 @@ # The short X.Y version. version = '3.0' # The full version, including alpha/beta/rc tags. -release = '3.0.5' +release = '3.0.8' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.0.5/setup.py new/simplejson-3.0.8/setup.py --- old/simplejson-3.0.5/setup.py 2013-01-03 20:28:57.000000000 +0100 +++ new/simplejson-3.0.8/setup.py 2013-02-19 19:23:19.000000000 +0100 @@ -8,7 +8,7 @@ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '3.0.5' +VERSION = '3.0.8' DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" with open('README.rst', 'r') as f: @@ -19,6 +19,7 @@ Development Status :: 5 - Production/Stable Intended Audience :: Developers License :: OSI Approved :: MIT License +License :: OSI Approved :: Academic Free License (AFL) Programming Language :: Python Programming Language :: Python :: 2 Programming Language :: Python :: 2.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.0.5/simplejson/__init__.py new/simplejson-3.0.8/simplejson/__init__.py --- old/simplejson-3.0.5/simplejson/__init__.py 2013-01-03 20:29:13.000000000 +0100 +++ new/simplejson-3.0.8/simplejson/__init__.py 2013-02-19 19:23:19.000000000 +0100 @@ -99,7 +99,7 @@ Expecting property name: line 1 column 2 (char 2) """ from __future__ import absolute_import -__version__ = '3.0.5' +__version__ = '3.0.8' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.0.5/simplejson/_speedups.c new/simplejson-3.0.8/simplejson/_speedups.c --- old/simplejson-3.0.5/simplejson/_speedups.c 2013-01-02 20:23:38.000000000 +0100 +++ new/simplejson-3.0.8/simplejson/_speedups.c 2013-02-19 19:23:19.000000000 +0100 @@ -486,11 +486,13 @@ c == '\t') { return 2; } - else if (c < 0x10000U) { - return MIN_EXPANSION; +#if defined(Py_UNICODE_WIDE) || PY_MAJOR_VERSION >= 3 + else if (c >= 0x10000U) { + return 2 * MIN_EXPANSION; } +#endif else { - return 2 * MIN_EXPANSION; + return MIN_EXPANSION; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.0.5/simplejson/encoder.py new/simplejson-3.0.8/simplejson/encoder.py --- old/simplejson-3.0.5/simplejson/encoder.py 2012-12-31 04:55:51.000000000 +0100 +++ new/simplejson-3.0.8/simplejson/encoder.py 2013-01-11 18:03:28.000000000 +0100 @@ -15,7 +15,10 @@ from simplejson.decoder import PosInf -ESCAPE = re.compile(u(r'[\x00-\x1f\\"\b\f\n\r\t\u2028\u2029]')) +#ESCAPE = re.compile(ur'[\x00-\x1f\\"\b\f\n\r\t\u2028\u2029]') +# This is required because u() will mangle the string and ur'' isn't valid +# python3 syntax +ESCAPE = re.compile(u'[\\x00-\\x1f\\\\"\\b\\f\\n\\r\\t\u2028\u2029]') ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])') HAS_UTF8 = re.compile(r'[\x80-\xff]') ESCAPE_DCT = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.0.5/simplejson/tests/test_unicode.py new/simplejson-3.0.8/simplejson/tests/test_unicode.py --- old/simplejson-3.0.5/simplejson/tests/test_unicode.py 2013-01-03 20:20:21.000000000 +0100 +++ new/simplejson-3.0.8/simplejson/tests/test_unicode.py 2013-01-11 18:04:02.000000000 +0100 @@ -142,4 +142,15 @@ self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\ux000"') # invalid value for low surrogate self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\u0000"') - self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\ufc00"') \ No newline at end of file + self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\ufc00"') + + def test_ensure_ascii_still_works(self): + # in the ascii range, ensure that everything is the same + for c in map(unichr, range(0, 127)): + self.assertEqual( + json.dumps(c, ensure_ascii=False), + json.dumps(c)) + snowman = u'\N{SNOWMAN}' + self.assertEqual( + json.dumps(c, ensure_ascii=False), + '"' + c + '"') -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
