From b49435397a5094f94678adf3549cc8941aa469b7 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 5 Jul 2014 15:06:51 -0400 Subject: Use six for Python 2 compatibility --HG-- branch : feature/issue-229 extra : source : 7b1997ececc5772798ce33a0f8e77387cb55a977 --- tests/manual_test.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/manual_test.py') diff --git a/tests/manual_test.py b/tests/manual_test.py index e6489b1c..af4ec09b 100644 --- a/tests/manual_test.py +++ b/tests/manual_test.py @@ -7,7 +7,8 @@ import tempfile import subprocess from distutils.command.install import INSTALL_SCHEMES from string import Template -from setuptools.compat import urlopen + +from six.moves import urllib def _system_call(*args): assert subprocess.call(args) == 0 @@ -76,7 +77,7 @@ def test_full(): f.write(SIMPLE_BUILDOUT) with open('bootstrap.py', 'w') as f: - f.write(urlopen(BOOTSTRAP).read()) + f.write(urllib.request.urlopen(BOOTSTRAP).read()) _system_call('bin/python', 'bootstrap.py') _system_call('bin/buildout', '-q') -- cgit v1.2.1 From 0f147d3f3cffda76b6be0fa3e5b396ede7f3bbf2 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 28 Mar 2016 09:42:35 -0400 Subject: Extract decision point into a variable --- tests/manual_test.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/manual_test.py') diff --git a/tests/manual_test.py b/tests/manual_test.py index af4ec09b..808fa55a 100644 --- a/tests/manual_test.py +++ b/tests/manual_test.py @@ -43,10 +43,8 @@ PYVER = sys.version.split()[0][:3] _VARS = {'base': '.', 'py_version_short': PYVER} -if sys.platform == 'win32': - PURELIB = INSTALL_SCHEMES['nt']['purelib'] -else: - PURELIB = INSTALL_SCHEMES['unix_prefix']['purelib'] +scheme = 'nt' if sys.platform == 'win32' else 'unix_prefix' +PURELIB = INSTALL_SCHEMES[scheme]['purelib'] @tempdir -- cgit v1.2.1