summaryrefslogtreecommitdiff
path: root/setuptools
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2013-06-19 11:50:14 +0100
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2013-06-19 11:50:14 +0100
commit49b893267e951f9e53d9e7611286c95319beaf20 (patch)
tree197bcb8f40e6140c5ac75c40d41d34797e16a726 /setuptools
parent8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc (diff)
downloadpython-setuptools-git-49b893267e951f9e53d9e7611286c95319beaf20.tar.gz
Post-merge fixes.
--HG-- branch : single-codebase
Diffstat (limited to 'setuptools')
-rwxr-xr-xsetuptools/command/egg_info.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6b0d2426..5a714156 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -283,7 +283,7 @@ class FileList(_FileList):
item = item[:-1]
path = convert_path(item)
- if PY3:
+ if sys.version_info >= (3,):
try:
if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
self.files.append(path)
@@ -337,7 +337,7 @@ class manifest_maker(sdist):
named by 'self.manifest'.
"""
# The manifest must be UTF-8 encodable. See #303.
- if PY3:
+ if sys.version_info >= (3,):
files = []
for file in self.filelist.files:
try: