Mercurial > public > mercurial-scm > hg-stable
diff tests/get-with-headers.py @ 27296:8e86679d8acd
tests: use absolute_import in /get-with-headers.py
While I was here, I removed condition code for failure to import json.
This code was necessary to support Python < 2.6, which didn't include
the json module.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sun, 06 Dec 2015 22:25:41 -0800 |
| parents | 5a6820f8da4d |
| children | f4b31fcd5e72 |
line wrap: on
line diff
--- a/tests/get-with-headers.py Sun Dec 06 22:23:37 2015 -0800 +++ b/tests/get-with-headers.py Sun Dec 06 22:25:41 2015 -0800 @@ -3,18 +3,15 @@ """This does HTTP GET requests given a host:port and path and returns a subset of the headers plus the body of the result.""" -import httplib, sys +from __future__ import absolute_import + +import httplib +import json +import os +import sys try: - import json -except ImportError: - try: - import simplejson as json - except ImportError: - json = None - -try: - import msvcrt, os + import msvcrt msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) except ImportError: @@ -58,11 +55,6 @@ # Pretty print JSON. This also has the beneficial side-effect # of verifying emitted JSON is well-formed. if formatjson: - if not json: - print 'no json module not available' - print 'did you forget a #require json?' - sys.exit(1) - # json.dumps() will print trailing newlines. Eliminate them # to make tests easier to write. data = json.loads(data)