Merge branch '1.10.x' of https://github.com/pantsbuild/pants into 1.10.x

src/python/pants/backend/python/tasks/pytest_run.py

@@ -4,7 +4,6 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-import configparser
 import itertools
 import json
 import os
@@ -18,6 +17,8 @@
 from io import StringIO
 from textwrap import dedent
 
+from backports import configparser
+
 from pants.backend.python.targets.python_tests import PythonTests
 from pants.backend.python.tasks.gather_sources import GatherSources
 from pants.backend.python.tasks.pytest_prep import PytestPrep

src/python/pants/option/config.py

@@ -4,7 +4,6 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-import configparser
 import getpass
 import io
 import itertools
@@ -13,6 +12,7 @@
 from contextlib import contextmanager
 
 import six
+from backports import configparser
 from twitter.common.collections import OrderedSet
 
 from pants.base.build_environment import get_buildroot, get_pants_cachedir, get_pants_configdir

tests/python/pants_test/backend/python/tasks/test_pytest_run.py

@@ -11,7 +11,7 @@
 from textwrap import dedent
 
 import coverage
-from six.moves import configparser
+from backports import configparser
 
 from pants.backend.python.tasks.gather_sources import GatherSources
 from pants.backend.python.tasks.pytest_prep import PytestPrep

tests/python/pants_test/pants_run_integration_test.py

@@ -4,7 +4,6 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-import configparser
 import glob
 import os
 import shutil
@@ -14,6 +13,7 @@
 from operator import eq, ne
 from threading import Lock
 
+from backports import configparser
 from colors import strip_color
 
 from pants.base.build_environment import get_buildroot