aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2019-11-15 11:02:51 +0000
committerGitHub <noreply@github.com>2019-11-15 11:02:51 +0000
commit579380246fba55754cb43b660251d457050cfca0 (patch)
tree153f75964dd8793c23451a3ae06a80189e9f795e
parent55994609aaebecdfb7b8da4945ce0ed799d344c9 (diff)
parentfed59d837495208c13cec64b5394cdd2cc3cb6de (diff)
downloadexternal_python_setuptools-579380246fba55754cb43b660251d457050cfca0.tar.gz
external_python_setuptools-579380246fba55754cb43b660251d457050cfca0.tar.bz2
external_python_setuptools-579380246fba55754cb43b660251d457050cfca0.zip
Merge pull request #1906 from benoit-pierre/fix_pytest_py2_warnings
tests: fix some pytest warnings under Python 2
-rw-r--r--setuptools/tests/test_integration.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 1c0b2b18..f1a27f8b 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -64,7 +64,7 @@ def install_context(request, tmpdir, monkeypatch):
monkeypatch.setattr('site.USER_BASE', user_base.strpath)
monkeypatch.setattr('site.USER_SITE', user_site.strpath)
monkeypatch.setattr('sys.path', sys.path + [install_dir.strpath])
- monkeypatch.setenv('PYTHONPATH', os.path.pathsep.join(sys.path))
+ monkeypatch.setenv(str('PYTHONPATH'), str(os.path.pathsep.join(sys.path)))
# Set up the command for performing the installation.
dist = Distribution()