diff -Nru python-demjson-2.2.3/debian/changelog python-demjson-2.2.4/debian/changelog --- python-demjson-2.2.3/debian/changelog 2015-11-29 07:24:48.000000000 +0000 +++ python-demjson-2.2.4/debian/changelog 2016-02-02 07:12:49.000000000 +0000 @@ -1,3 +1,9 @@ +python-demjson (2.2.4-1) unstable; urgency=medium + + * Imported Upstream version 2.2.4 + + -- TANIGUCHI Takaki Tue, 02 Feb 2016 16:12:27 +0900 + python-demjson (2.2.3-2) unstable; urgency=medium * debian/*.install: Copy jsonlint from source tree. (Closes: #806482) diff -Nru python-demjson-2.2.3/demjson.py python-demjson-2.2.4/demjson.py --- python-demjson-2.2.3/demjson.py 2014-11-12 19:39:53.000000000 +0000 +++ python-demjson-2.2.4/demjson.py 2015-12-22 19:53:40.000000000 +0000 @@ -120,11 +120,11 @@ __author__ = "Deron Meranda " __homepage__ = "http://deron.meranda.us/python/demjson/" -__date__ = "2014-11-12" -__version__ = "2.2.3" -__version_info__ = ( 2, 2, 3 ) # Will be converted into a namedtuple below +__date__ = "2015-12-22" +__version__ = "2.2.4" +__version_info__ = ( 2, 2, 4 ) # Will be converted into a namedtuple below -__credits__ = """Copyright (c) 2006-2014 Deron E. Meranda +__credits__ = """Copyright (c) 2006-2015 Deron E. Meranda Licensed under GNU LGPL (GNU Lesser General Public License) version 3.0 or later. See LICENSE.txt included with this software. @@ -6022,7 +6022,10 @@ self.stderr.write('%s: %s\n' % (pfx, str(err)) ) success = False else: - self.stdout.write( reformatted ) + if hasattr(sys.stdout,'buffer'): # To write binary data rather than strings + self.stdout.buffer.write( reformatted ) + else: + self.stdout.write( reformatted ) elif success == self.SUCCESS_OK and verbose_fp: verbose_fp.write('%sok\n' % pfx) elif success == self.SUCCESS_WARNING and verbose_fp: diff -Nru python-demjson-2.2.3/docs/CHANGES.txt python-demjson-2.2.4/docs/CHANGES.txt --- python-demjson-2.2.3/docs/CHANGES.txt 2014-11-12 19:41:22.000000000 +0000 +++ python-demjson-2.2.4/docs/CHANGES.txt 2015-12-22 20:05:40.000000000 +0000 @@ -1,5 +1,12 @@ Change history for demjson python module. +Version 2.2.4 released 2015-12-22 +================================= + +* Fix problem with jsonlint under Python 3 when trying to reformat + JSON (-f or -F options) and writing the output to standard output. + + Version 2.2.3 released 2014-11-12 ================================= diff -Nru python-demjson-2.2.3/docs/demjson.txt python-demjson-2.2.4/docs/demjson.txt --- python-demjson-2.2.3/docs/demjson.txt 2014-11-12 19:43:40.000000000 +0000 +++ python-demjson-2.2.4/docs/demjson.txt 2015-12-22 19:58:25.000000000 +0000 @@ -3133,11 +3133,11 @@ STRICTNESS_WARN = 'warn' WARN = 'warn' __author__ = 'Deron Meranda ' - __credits__ = 'Copyright (c) 2006-2014 Deron E. Meranda CREDITS - Copyright (c) 2006-2014 Deron E. Meranda + Copyright (c) 2006-2015 Deron E. Meranda Licensed under GNU LGPL (GNU Lesser General Public License) version 3.0 or later. See LICENSE.txt included with this software. diff -Nru python-demjson-2.2.3/docs/NEWS.txt python-demjson-2.2.4/docs/NEWS.txt --- python-demjson-2.2.3/docs/NEWS.txt 2014-11-12 19:47:54.000000000 +0000 +++ python-demjson-2.2.4/docs/NEWS.txt 2015-12-22 19:57:22.000000000 +0000 @@ -1,6 +1,7 @@ News announcements regarding the demjson python module. See the file CHANGES.txt for more details. +2015-12-22 Release 2.2.4, jsonlint -f stdout bugfix under Python 3. 2014-11-12 Release 2.2.3, jsonlint return value bugfix, unit test fixes. 2014-06-25 Release 2.2.2, Python 3 installation fixes. 2014-06-24 Release 2.2.1, Minor bugfix and html-safe option. diff -Nru python-demjson-2.2.3/jsonlint python-demjson-2.2.4/jsonlint --- python-demjson-2.2.3/jsonlint 2014-11-12 19:15:13.000000000 +0000 +++ python-demjson-2.2.4/jsonlint 2015-12-22 19:53:34.000000000 +0000 @@ -7,9 +7,9 @@ """ __author__ = "Deron Meranda " __homepage__ = "http://deron.meranda.us/python/demjson/" -__date__ = "2014-11-12" -__version__ = "2.2.3" -__credits__ = """Copyright (c) 2006-2014 Deron E. Meranda +__date__ = "2014-12-22" +__version__ = "2.2.4" +__credits__ = """Copyright (c) 2006-2015 Deron E. Meranda Licensed under GNU LGPL (GNU Lesser General Public License) version 3.0 or later. See LICENSE.txt included with this software. diff -Nru python-demjson-2.2.3/PKG-INFO python-demjson-2.2.4/PKG-INFO --- python-demjson-2.2.3/PKG-INFO 2014-11-12 19:49:07.000000000 +0000 +++ python-demjson-2.2.4/PKG-INFO 2015-12-22 20:06:28.000000000 +0000 @@ -1,12 +1,12 @@ Metadata-Version: 1.1 Name: demjson -Version: 2.2.3 +Version: 2.2.4 Summary: encoder, decoder, and lint/validator for JSON (JavaScript Object Notation) compliant with RFC 7159 Home-page: http://deron.meranda.us/python/demjson/ Author: Deron Meranda Author-email: deron.meranda@gmail.com License: GNU LGPL 3.0 -Download-URL: http://deron.meranda.us/python/demjson/dist/demjson-2.2.3.tar.gz +Download-URL: http://deron.meranda.us/python/demjson/dist/demjson-2.2.4.tar.gz Description: The "demjson" module, and the included "jsonlint" script, provide methods for encoding and decoding JSON formatted data, as well as checking JSON data for errors and/or portability issues. The jsonlint command/script diff -Nru python-demjson-2.2.3/README.md python-demjson-2.2.4/README.md --- python-demjson-2.2.3/README.md 2014-11-12 19:41:00.000000000 +0000 +++ python-demjson-2.2.4/README.md 2015-12-22 20:05:36.000000000 +0000 @@ -14,6 +14,11 @@ What's new ========== + +Version 2.2.4 fixes problem with jsonlint under Python 3 when +trying to reformat JSON (-f or -F options) and writing the output to +standard output. + Version 2.2.3 fixes incorrect return values from the "jsonlint" command. Also fixes a minor problem with the included unit tests in certain Python versions. diff -Nru python-demjson-2.2.3/setup.py python-demjson-2.2.4/setup.py --- python-demjson-2.2.3/setup.py 2014-11-12 19:16:29.000000000 +0000 +++ python-demjson-2.2.4/setup.py 2015-12-22 20:02:25.000000000 +0000 @@ -1,7 +1,7 @@ # Python package setup script -*- coding: utf-8 -*- name = 'demjson' -version = '2.2.3' +version = '2.2.4' import sys try: