# HG changeset patch # User Gregory Szorc # Date 1449469541 28800 # Node ID 8e86679d8acd6e2e36d06a749a8fcc99494dfb08 # Parent a327a24acfea762116a11214fc211b997f5822e0 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. diff -r a327a24acfea -r 8e86679d8acd tests/get-with-headers.py --- 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) diff -r a327a24acfea -r 8e86679d8acd tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t Sun Dec 06 22:23:37 2015 -0800 +++ b/tests/test-check-py3-compat.t Sun Dec 06 22:25:41 2015 -0800 @@ -145,7 +145,6 @@ setup.py not using absolute_import tests/filterpyflakes.py requires print_function tests/generate-working-copy-states.py requires print_function - tests/get-with-headers.py not using absolute_import tests/get-with-headers.py requires print_function tests/heredoctest.py not using absolute_import tests/heredoctest.py requires print_function