[Python-modules-commits] [python-demjson] 01/04: Imported Upstream version 2.2.4
Takaki Taniguchi
takaki at moszumanska.debian.org
Tue Feb 2 07:16:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
takaki pushed a commit to branch master
in repository python-demjson.
commit 44257bf02f96ea8d067c5c9ee13388751069b53d
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date: Tue Feb 2 16:10:42 2016 +0900
Imported Upstream version 2.2.4
---
PKG-INFO | 4 ++--
README.md | 5 +++++
demjson.py | 13 ++++++++-----
docs/CHANGES.txt | 7 +++++++
docs/NEWS.txt | 1 +
docs/demjson.txt | 18 +++++++++---------
jsonlint | 6 +++---
setup.py | 2 +-
8 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index 29e93c2..0d29185 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -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 at 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 --git a/README.md b/README.md
index 74c5ec4..3d011ac 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,11 @@ unnecessary whitespace.
What's new
==========
+
+<b>Version 2.2.4</b> fixes problem with jsonlint under Python 3 when
+trying to reformat JSON (-f or -F options) and writing the output to
+standard output.
+
<b>Version 2.2.3</b> fixes incorrect return values from the "jsonlint"
command. Also fixes a minor problem with the included unit tests in
certain Python versions.
diff --git a/demjson.py b/demjson.py
index 3046f9d..226e268 100644
--- a/demjson.py
+++ b/demjson.py
@@ -120,11 +120,11 @@ r""" A JSON data encoder and decoder.
__author__ = "Deron Meranda <http://deron.meranda.us/>"
__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 <http://deron.meranda.us/>
+__credits__ = """Copyright (c) 2006-2015 Deron E. Meranda <http://deron.meranda.us/>
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 @@ MORE INFORMATION:
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 --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index c9dda5f..fda5509 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -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 --git a/docs/NEWS.txt b/docs/NEWS.txt
index c195607..0b64a58 100644
--- a/docs/NEWS.txt
+++ b/docs/NEWS.txt
@@ -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 --git a/docs/demjson.txt b/docs/demjson.txt
index 07caba5..ce2dc07 100644
--- a/docs/demjson.txt
+++ b/docs/demjson.txt
@@ -3133,11 +3133,11 @@ DATA
STRICTNESS_WARN = 'warn'
WARN = 'warn'
__author__ = 'Deron Meranda <http://deron.meranda.us/>'
- __credits__ = 'Copyright (c) 2006-2014 Deron E. Meranda <http:/.../lic...
- __date__ = '2014-11-12'
+ __credits__ = 'Copyright (c) 2006-2015 Deron E. Meranda <http:/.../lic...
+ __date__ = '2015-12-22'
__homepage__ = 'http://deron.meranda.us/python/demjson/'
- __version__ = '2.2.3'
- __version_info__ = version_info(major=2, minor=2, micro=3)
+ __version__ = '2.2.4'
+ __version_info__ = version_info(major=2, minor=2, micro=4)
content_type = 'application/json'
file_ext = 'json'
float_maxexp = 308
@@ -3150,20 +3150,20 @@ DATA
sorting_methods = {'alpha': 'Sort strictly alphabetically', 'alpha_ci'...
syntax_error = demjson.undefined
undefined = demjson.undefined
- version = '2.2.3'
- version_info = version_info(major=2, minor=2, micro=3)
+ version = '2.2.4'
+ version_info = version_info(major=2, minor=2, micro=4)
VERSION
- 2.2.3
+ 2.2.4
DATE
- 2014-11-12
+ 2015-12-22
AUTHOR
Deron Meranda <http://deron.meranda.us/>
CREDITS
- Copyright (c) 2006-2014 Deron E. Meranda <http://deron.meranda.us/>
+ Copyright (c) 2006-2015 Deron E. Meranda <http://deron.meranda.us/>
Licensed under GNU LGPL (GNU Lesser General Public License) version 3.0
or later. See LICENSE.txt included with this software.
diff --git a/jsonlint b/jsonlint
index 99c22e1..0996a4f 100755
--- a/jsonlint
+++ b/jsonlint
@@ -7,9 +7,9 @@ Requires demjson module.
"""
__author__ = "Deron Meranda <http://deron.meranda.us/>"
__homepage__ = "http://deron.meranda.us/python/demjson/"
-__date__ = "2014-11-12"
-__version__ = "2.2.3"
-__credits__ = """Copyright (c) 2006-2014 Deron E. Meranda <http://deron.meranda.us/>
+__date__ = "2014-12-22"
+__version__ = "2.2.4"
+__credits__ = """Copyright (c) 2006-2015 Deron E. Meranda <http://deron.meranda.us/>
Licensed under GNU LGPL (GNU Lesser General Public License) version 3.0
or later. See LICENSE.txt included with this software.
diff --git a/setup.py b/setup.py
index bf10389..0cb8763 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
# Python package setup script -*- coding: utf-8 -*-
name = 'demjson'
-version = '2.2.3'
+version = '2.2.4'
import sys
try:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-demjson.git
More information about the Python-modules-commits
mailing list