Commit 2baf7ee4 authored by TANIGUCHI Takaki's avatar TANIGUCHI Takaki

Merge tag 'upstream/2.2.3'

Upstream version 2.2.3

# gpg: 2015年11月25日 20時15分29秒 JSTにRSA鍵ID 28A5E257で施された署名
# gpg: “TANIGUCHI Takaki <takaki@media-as.org>”からの正しい署名
# gpg:                 別名“TANIGUCHI Takaki <takaki@asis.media-as.org>”
# gpg:                 別名“TANIGUCHI Takaki <taniguchi.takaki@gmail.com>”
# gpg:                 別名“TANIGUCHI Takaki <takaki@debian.org>”
# gpg:                 別名“TANIGUCHI Takaki <takaki@debian.or.jp>”
# gpg:                 別名“TANIGUCHI Takaki <takaki@takaki.media-as.org>”
# gpg:                 別名“TANIGUCHI Takaki <takaki@nagoya-u.jp>”
parents 95328406 e4e2b519
Metadata-Version: 1.1
Name: demjson
Version: 2.2.2
Version: 2.2.3
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.2.tar.gz
Download-URL: http://deron.meranda.us/python/demjson/dist/demjson-2.2.3.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
......
......@@ -14,6 +14,10 @@ unnecessary whitespace.
What's new
==========
<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.
<b>Version 2.2.2</b> fixes installation problems with certain Python 3
versions prior to Python 3.4. No other changes.
......
......@@ -120,9 +120,9 @@ r""" A JSON data encoder and decoder.
__author__ = "Deron Meranda <http://deron.meranda.us/>"
__homepage__ = "http://deron.meranda.us/python/demjson/"
__date__ = "2014-06-25"
__version__ = "2.2.2"
__version_info__ = ( 2, 2, 2 ) # Will be converted into a namedtuple below
__date__ = "2014-11-12"
__version__ = "2.2.3"
__version_info__ = ( 2, 2, 3 ) # Will be converted into a namedtuple below
__credits__ = """Copyright (c) 2006-2014 Deron E. Meranda <http://deron.meranda.us/>
......@@ -6000,7 +6000,7 @@ MORE INFORMATION:
fp.close()
except IOError, err:
self.stderr.write('%s: %s\n' % (pfx, str(err)) )
return False
return self.SUCCESS_FAIL
if verbose:
verbose_fp = self.stdout
......@@ -6255,13 +6255,17 @@ the options --allow, --warn, or --forbid ; for example:
for fn in args:
try:
if not self._lintcheck( fn, output_filename=output_filename,
verbose=verbose,
reformat=reformat,
show_stats=show_stats,
input_encoding=input_encoding,
output_encoding=output_encoding,
jsonopts=jsonopts ):
rc = self._lintcheck( fn, output_filename=output_filename,
verbose=verbose,
reformat=reformat,
show_stats=show_stats,
input_encoding=input_encoding,
output_encoding=output_encoding,
jsonopts=jsonopts )
if rc != self.SUCCESS_OK:
# Warnings or errors should result in failure. If
# checking multiple files, do not change a
# previous error back to ok.
success = False
except KeyboardInterrupt, err:
sys.stderr.write("\njsonlint interrupted!\n")
......
Change history for demjson python module.
Version 2.2.3 released 2014-11-12
=================================
* Fix return value of "jsonlint" command. It should return a
non-zero value when an error is reported.
GitHub Issue 12: https://github.com/dmeranda/demjson/issues/12
* Fix unit test failure in 32-bit Python 2.x environment. This bug
only affected the unit tests, and was not a problem in the code
demjson module.
GitHub Issue 13: https://github.com/dmeranda/demjson/issues/13
Version 2.2.2 released 2014-06-25
=================================
......@@ -100,7 +112,7 @@ values.
which wraps the 'decode()' function and which reads the JSON
document from a file. It will correctly open the file in binary
mode and insure the file is closed. All other options supported
by deocde() can be passed.
by decode() can be passed.
data = decode_file( "sample.json", allow_comments=True )
......
News announcements regarding the demjson python module.
See the file CHANGES.txt for more details.
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.
2014-06-20 Release 2.2, Python 2.6, narrow-Unicode support, number enhancements.
......
......@@ -3134,10 +3134,10 @@ DATA
WARN = 'warn'
__author__ = 'Deron Meranda <http://deron.meranda.us/>'
__credits__ = 'Copyright (c) 2006-2014 Deron E. Meranda <http:/.../lic...
__date__ = '2014-06-25'
__date__ = '2014-11-12'
__homepage__ = 'http://deron.meranda.us/python/demjson/'
__version__ = '2.2.2'
__version_info__ = version_info(major=2, minor=2, micro=2)
__version__ = '2.2.3'
__version_info__ = version_info(major=2, minor=2, micro=3)
content_type = 'application/json'
file_ext = 'json'
float_maxexp = 308
......@@ -3150,14 +3150,14 @@ DATA
sorting_methods = {'alpha': 'Sort strictly alphabetically', 'alpha_ci'...
syntax_error = demjson.undefined
undefined = demjson.undefined
version = '2.2.2'
version_info = version_info(major=2, minor=2, micro=2)
version = '2.2.3'
version_info = version_info(major=2, minor=2, micro=3)
VERSION
2.2.2
2.2.3
DATE
2014-06-25
2014-11-12
AUTHOR
Deron Meranda <http://deron.meranda.us/>
......
......@@ -7,8 +7,8 @@ Requires demjson module.
"""
__author__ = "Deron Meranda <http://deron.meranda.us/>"
__homepage__ = "http://deron.meranda.us/python/demjson/"
__date__ = "2014-06-25"
__version__ = "2.2.2"
__date__ = "2014-11-12"
__version__ = "2.2.3"
__credits__ = """Copyright (c) 2006-2014 Deron E. Meranda <http://deron.meranda.us/>
Licensed under GNU LGPL (GNU Lesser General Public License) version 3.0
......
# Python package setup script -*- coding: utf-8 -*-
name = 'demjson'
version = '2.2.2'
version = '2.2.3'
import sys
try:
......
......@@ -1385,7 +1385,7 @@ class DemjsonTest(unittest.TestCase):
self.assertEqual( self.decode_stats( alljson ).num_ints_long, len(nxls) )
n53s = [-9007199254740992,-9007199254740991, 9007199254740991,9007199254740992]# -9007199254740991..9007199254740991
self.assertEqual( self.decode_stats( repr(n53s) ).num_ints_53bit, 2 )
self.assertEqual( self.decode_stats( repr(n53s).replace('L','') ).num_ints_53bit, 2 )
def testStatsFloats(self):
self.assertEqual( self.decode_stats( 'true' ).num_floats, 0 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment