Commit 63ad9ff7 authored by Martin v. Löwis's avatar Martin v. Löwis

Implement isascii.

--HG--
branch : distribute
extra : rebase_source : 6805617a1673859320ae278cfbb6f7136d20a0a8
parent a3efc4ca
...@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete ...@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
[console_scripts] [console_scripts]
easy_install = setuptools.command.easy_install:main easy_install = setuptools.command.easy_install:main
easy_install-2.6 = setuptools.command.easy_install:main easy_install-3.1 = setuptools.command.easy_install:main
[setuptools.file_finders] [setuptools.file_finders]
svn_cvs = setuptools.command.sdist:_default_revctrl svn_cvs = setuptools.command.sdist:_default_revctrl
......
...@@ -42,9 +42,21 @@ def samefile(p1,p2): ...@@ -42,9 +42,21 @@ def samefile(p1,p2):
if sys.version_info <= (3,): if sys.version_info <= (3,):
def _to_ascii(s): def _to_ascii(s):
return s return s
def isascii(s):
try:
unicode(s, 'ascii')
return True
except UnicodeError:
return False
else: else:
def _to_ascii(s): def _to_ascii(s):
return s.encode('ascii') return s.encode('ascii')
def isascii(s):
try:
s.encode('ascii')
return True
except UnicodeError:
return False
class easy_install(Command): class easy_install(Command):
"""Manage a download/build/install process""" """Manage a download/build/install process"""
...@@ -1439,7 +1451,7 @@ def get_script_header(script_text, executable=sys_executable, wininst=False): ...@@ -1439,7 +1451,7 @@ def get_script_header(script_text, executable=sys_executable, wininst=False):
else: else:
executable = nt_quote_arg(executable) executable = nt_quote_arg(executable)
hdr = "#!%(executable)s%(options)s\n" % locals() hdr = "#!%(executable)s%(options)s\n" % locals()
if unicode(hdr,'ascii','ignore').encode('ascii') != hdr: if not isascii(hdr):
# Non-ascii path to sys.executable, use -x to prevent warnings # Non-ascii path to sys.executable, use -x to prevent warnings
if options: if options:
if options.strip().startswith('-'): if options.strip().startswith('-'):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment