fix err on bad ML string

hjson · Aug 18, 2016 · 58f1405 · 58f1405
1 parent c3abbe3
commit 58f1405
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 3 deletions.
diff --git a/history.md b/history.md
@@ -1,5  1,7 @@
 # History
 
 - v2.0.2
   - fix err on bad ML string
 - v2.0.1
   - move to hjson org
 - v2.0.0

diff --git a/hjson/__init__.py b/hjson/__init__.py
@@ -36,7  36,7 @@
 
 """
 from __future__ import absolute_import
-__version__ = '2.0.1'
 __version__ = '2.0.2'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'dumpJSON', 'dumpsJSON',

diff --git a/hjson/decoder.py b/hjson/decoder.py
@@ -188,7  188,7 @@ def mlscanstring(s, end):
 
     # When parsing multiline string values, we must look for ' characters
     while 1:
-        ch = s[end]
         ch = s[end:end   1]
         if ch == '':
             raise HjsonDecodeError("Bad multiline string", s, end);
         elif ch == '\'':

diff --git a/hjson/tests/assets/failKey4_test.hjson b/hjson/tests/assets/failKey4_test.hjson
@@ -0,0  1,4 @@
 {
   # invalid name
   : 0
 }
diff --git a/hjson/tests/assets/failMLStr1_test.hjson b/hjson/tests/assets/failMLStr1_test.hjson
@@ -0,0  1,3 @@
 {
   # invalid multiline string
   ml: '''
diff --git a/hjson/tests/assets/failStr7_test.hjson b/hjson/tests/assets/failStr7_test.hjson
@@ -0,0  1,4 @@
 {
   # invalid \u char
   char: "\uxxxx"
 }
diff --git a/hjson/tests/assets/testlist.txt b/hjson/tests/assets/testlist.txt
@@ -31,6  31,8 @@ fail8_test.json
 failKey1_test.hjson
 failKey2_test.hjson
 failKey3_test.hjson
 failKey4_test.hjson
 failMLStr1_test.hjson
 failObj1_test.hjson
 failObj2_test.hjson
 failObj3_test.hjson
@@ -40,6  42,7 @@ failStr3_test.hjson
 failStr4_test.hjson
 failStr5_test.hjson
 failStr6_test.hjson
 failStr7_test.hjson
 kan_test.hjson
 keys_test.hjson
 oa_test.hjson

diff --git a/setup.py b/setup.py
@@ -10,7  10,7 @@
     DistutilsPlatformError
 
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '2.0.1'
 VERSION = '2.0.2'
 DESCRIPTION = "JSON for Humans. A configuration file format with relaxed syntax, fewer mistakes and more comments."
 
 with open('README.rst', 'r') as f: