diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 14:07:33 +1100 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 14:07:33 +1100 |
| commit | 337ea160558acc352c8a61b9d27c93d1f9e09618 (patch) | |
| tree | 52272a24ccb0b3be0d2349956c5fd44e5e65e565 /setuptools/command/sdist.py | |
| parent | 3bd5118eaa87b4f6598e0a473fec3623b6579d3b (diff) | |
| parent | d49c41c6ebc16371efabe0b92b417457cf9c47d7 (diff) | |
| download | python-setuptools-git-337ea160558acc352c8a61b9d27c93d1f9e09618.tar.gz | |
Merge from default.
Diffstat (limited to 'setuptools/command/sdist.py')
| -rwxr-xr-x | setuptools/command/sdist.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index 71196512..6640d4e3 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -5,7 +5,8 @@ import os import sys import io -from setuptools.compat import PY3 +from setuptools.extern import six + from setuptools.utils import cs_path_exists import pkg_resources @@ -181,7 +182,7 @@ class sdist(orig.sdist): manifest = open(self.manifest, 'rbU') for line in manifest: # The manifest must contain UTF-8. See #303. - if PY3: + if six.PY3: try: line = line.decode('UTF-8') except UnicodeDecodeError: |