diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-08 12:18:26 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-08 12:18:26 (GMT) |
| commit | 5cc06fde432e4a66aacac33d62947ad20f505c99 (patch) | |
| tree | 20e48ad9bf50b8c5fbb0c1447b11e86bd5e3c711 /Lib/test/test_json.py | |
| parent | a27b83ad2d3480ba7c20286d719025ef32100f75 (diff) | |
| parent | 66f2ea042acf792bf6ff432f409628e1cec99e43 (diff) | |
| download | cpython-5cc06fde432e4a66aacac33d62947ad20f505c99.zip cpython-5cc06fde432e4a66aacac33d62947ad20f505c99.tar.gz cpython-5cc06fde432e4a66aacac33d62947ad20f505c99.tar.bz2 | |
#18273: merge with 3.3.
Diffstat (limited to 'Lib/test/test_json.py')
| -rw-r--r-- | Lib/test/test_json.py | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Lib/test/test_json.py b/Lib/test/test_json.py deleted file mode 100644 index 41ff897..0000000 --- a/Lib/test/test_json.py +++ /dev/null @@ -1,17 +0,0 @@ -"""Tests for json. - -The tests for json are defined in the json.tests package; -the test_suite() function there returns a test suite that's ready to -be run. -""" - -from test import json_tests -import test.support - - -def test_main(): - test.support.run_unittest(json_tests.test_suite()) - - -if __name__ == "__main__": - test_main() |