Remove trailing space characters (#1256)
Also add two newlines
(rebased from `aaronfranke/formatting`)
resolves #1220
Co-authored-by: Aaron Franke <arnfranke@yahoo.com>
diff --git a/test/data/legacy_test_array_06.json b/test/data/legacy_test_array_06.json
index 7f6c516..1fda03b 100644
--- a/test/data/legacy_test_array_06.json
+++ b/test/data/legacy_test_array_06.json
@@ -1,4 +1,4 @@
-[ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+[ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
"ccccccccccccccccccccccc",
"dddddddddddddddddddddddddddddddddddddddddddddddddddd" ]
\ No newline at end of file
diff --git a/test/data/legacy_test_complex_01.json b/test/data/legacy_test_complex_01.json
index cc0f30f..2c4a869 100644
--- a/test/data/legacy_test_complex_01.json
+++ b/test/data/legacy_test_complex_01.json
@@ -1,17 +1,17 @@
-{
+{
"count" : 1234,
"name" : { "aka" : "T.E.S.T.", "id" : 123987 },
- "attribute" : [
- "random",
- "short",
- "bold",
- 12,
- { "height" : 7, "width" : 64 }
+ "attribute" : [
+ "random",
+ "short",
+ "bold",
+ 12,
+ { "height" : 7, "width" : 64 }
],
- "test": { "1" :
- { "2" :
- { "3" : { "coord" : [ 1,2] }
- }
+ "test": { "1" :
+ { "2" :
+ { "3" : { "coord" : [ 1,2] }
+ }
}
}
}
diff --git a/test/data/legacy_test_object_03.json b/test/data/legacy_test_object_03.json
index 4fcd4d8..90dba2a 100644
--- a/test/data/legacy_test_object_03.json
+++ b/test/data/legacy_test_object_03.json
@@ -1,4 +1,4 @@
-{
+{
"count" : 1234,
"name" : "test",
"attribute" : "random"
diff --git a/test/data/legacy_test_object_04.json b/test/data/legacy_test_object_04.json
index 450762d..9e43ff8 100644
--- a/test/data/legacy_test_object_04.json
+++ b/test/data/legacy_test_object_04.json
@@ -1,3 +1,3 @@
-{
+{
"" : 1234
}
diff --git a/test/data/legacy_test_preserve_comment_01.expected b/test/data/legacy_test_preserve_comment_01.expected
index 2797aa7..d6c11b4 100644
--- a/test/data/legacy_test_preserve_comment_01.expected
+++ b/test/data/legacy_test_preserve_comment_01.expected
@@ -6,6 +6,6 @@
/* Comment before 'second'
*/
.second=2
-/* A comment at
+/* A comment at
the end of the file.
*/
diff --git a/test/data/legacy_test_preserve_comment_01.json b/test/data/legacy_test_preserve_comment_01.json
index fabd55d..21b5ea7 100644
--- a/test/data/legacy_test_preserve_comment_01.json
+++ b/test/data/legacy_test_preserve_comment_01.json
@@ -9,6 +9,6 @@
"second" : 2
}
-/* A comment at
+/* A comment at
the end of the file.
*/
diff --git a/test/pyjsontestrunner.py b/test/pyjsontestrunner.py
index bd749b5..8acdbd2 100644
--- a/test/pyjsontestrunner.py
+++ b/test/pyjsontestrunner.py
@@ -15,7 +15,7 @@
if len(sys.argv) != 2:
print("Usage: %s input-json-file", sys.argv[0])
sys.exit(3)
-
+
input_path = sys.argv[1]
base_path = os.path.splitext(input_path)[0]
actual_path = base_path + '.actual'
@@ -23,7 +23,7 @@
rewrite_actual_path = base_path + '.actual-rewrite'
def valueTreeToString(fout, value, path = '.'):
- ty = type(value)
+ ty = type(value)
if ty is types.DictType:
fout.write('%s={}\n' % path)
suffix = path[-1] != '.' and '.' or ''
@@ -49,7 +49,7 @@
fout.write('%s=null\n' % path)
else:
assert False and "Unexpected value type"
-
+
def parseAndSaveValueTree(input, actual_path):
root = json.loads(input)
fout = file(actual_path, 'wt')
@@ -62,7 +62,7 @@
#rewrite = rewrite[1:-1] # Somehow the string is quoted ! jsonpy bug ?
file(rewrite_path, 'wt').write(rewrite + '\n')
return rewrite
-
+
input = file(input_path, 'rt').read()
root = parseAndSaveValueTree(input, actual_path)
rewrite = rewriteValueTree(json.write(root), rewrite_path)