[Python-checkins] r62748 - in python/trunk/Lib/json: tests/__init__.py tests/test_recursion.py tool.py
benjamin.peterson
python-checkins at python.org
Tue May 6 04:51:11 CEST 2008
Author: benjamin.peterson
Date: Tue May 6 04:51:10 2008
New Revision: 62748
Log:
PEP 8 nits in json package
Modified:
python/trunk/Lib/json/tests/__init__.py
python/trunk/Lib/json/tests/test_recursion.py
python/trunk/Lib/json/tool.py
Modified: python/trunk/Lib/json/tests/__init__.py
==============================================================================
--- python/trunk/Lib/json/tests/__init__.py (original)
+++ python/trunk/Lib/json/tests/__init__.py Tue May 6 04:51:10 2008
@@ -31,7 +31,5 @@
runner.run(suite)
if __name__ == '__main__':
- import os
- import sys
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
main()
Modified: python/trunk/Lib/json/tests/test_recursion.py
==============================================================================
--- python/trunk/Lib/json/tests/test_recursion.py (original)
+++ python/trunk/Lib/json/tests/test_recursion.py Tue May 6 04:51:10 2008
@@ -5,6 +5,7 @@
class JSONTestObject:
pass
+
class RecursiveJSONEncoder(json.JSONEncoder):
recurse = False
def default(self, o):
@@ -15,6 +16,7 @@
return 'JSONTestObject'
return json.JSONEncoder.default(o)
+
class TestRecursion(TestCase):
def test_listrecursion(self):
x = []
Modified: python/trunk/Lib/json/tool.py
==============================================================================
--- python/trunk/Lib/json/tool.py (original)
+++ python/trunk/Lib/json/tool.py Tue May 6 04:51:10 2008
@@ -8,6 +8,7 @@
}
$ echo '{ 1.2:3.4}' | python -mjson.tool
Expecting property name: line 1 column 2 (char 2)
+
"""
import sys
import json
More information about the Python-checkins
mailing list