aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/dist.py
diff options
context:
space:
mode:
authorHugo <hugovk@users.noreply.github.com>2020-01-08 19:10:11 +0200
committerHugo <hugovk@users.noreply.github.com>2020-01-08 19:10:11 +0200
commit796abd8dbec884cedf326cb5f85512a5d5648c4e (patch)
treecacbbdc28822b519f87b679a8262687421d13c01 /setuptools/dist.py
parent7e97def47723303fafabe48b22168bbc11bb4821 (diff)
downloadexternal_python_setuptools-796abd8dbec884cedf326cb5f85512a5d5648c4e.tar.gz
external_python_setuptools-796abd8dbec884cedf326cb5f85512a5d5648c4e.tar.bz2
external_python_setuptools-796abd8dbec884cedf326cb5f85512a5d5648c4e.zip
Fix for Python 4: replace unsafe six.PY3 with PY2
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 1ba262ec..fe5adf46 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -571,7 +571,7 @@ class Distribution(_Distribution):
from setuptools.extern.six.moves.configparser import ConfigParser
# Ignore install directory options if we have a venv
- if six.PY3 and sys.prefix != sys.base_prefix:
+ if not six.PY2 and sys.prefix != sys.base_prefix:
ignore_options = [
'install-base', 'install-platbase', 'install-lib',
'install-platlib', 'install-purelib', 'install-headers',
@@ -593,7 +593,7 @@ class Distribution(_Distribution):
with io.open(filename, encoding='utf-8') as reader:
if DEBUG:
self.announce(" reading {filename}".format(**locals()))
- (parser.read_file if six.PY3 else parser.readfp)(reader)
+ (parser.readfp if six.PY2 else parser.read_file)(reader)
for section in parser.sections():
options = parser.options(section)
opt_dict = self.get_option_dict(section)
@@ -636,7 +636,7 @@ class Distribution(_Distribution):
Ref #1653
"""
- if six.PY3:
+ if not six.PY2:
return val
try:
return val.encode()