Commit d6501f3c authored by Ofek Lev's avatar Ofek Lev

address

parent 01121d05
...@@ -2070,9 +2070,7 @@ class ScriptWriter: ...@@ -2070,9 +2070,7 @@ class ScriptWriter:
gui apps. gui apps.
""" """
try: if sys.version_info >= (3, 8):
from importlib.metadata import distribution # noqa: F401
template = textwrap.dedent(r""" template = textwrap.dedent(r"""
# EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
__requires__ = %(spec)r __requires__ = %(spec)r
...@@ -2086,7 +2084,7 @@ class ScriptWriter: ...@@ -2086,7 +2084,7 @@ class ScriptWriter:
if entry_point.group == %(group)r and entry_point.name == %(name)r: if entry_point.group == %(group)r and entry_point.name == %(name)r:
sys.exit(entry_point.load()()) sys.exit(entry_point.load()())
""").lstrip() # noqa: E501 """).lstrip() # noqa: E501
except ImportError: else:
template = textwrap.dedent(r""" template = textwrap.dedent(r"""
# EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
__requires__ = %(spec)r __requires__ = %(spec)r
......
...@@ -71,9 +71,7 @@ class TestEasyInstallTest: ...@@ -71,9 +71,7 @@ class TestEasyInstallTest:
def test_get_script_args(self): def test_get_script_args(self):
header = ei.CommandSpec.best().from_environment().as_header() header = ei.CommandSpec.best().from_environment().as_header()
try: if sys.version_info >= (3, 8):
from importlib.metadata import distribution # noqa: F401
expected = header + DALS(r""" expected = header + DALS(r"""
# EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name' # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
__requires__ = 'spec' __requires__ = 'spec'
...@@ -87,7 +85,7 @@ class TestEasyInstallTest: ...@@ -87,7 +85,7 @@ class TestEasyInstallTest:
if entry_point.group == 'console_scripts' and entry_point.name == 'name': if entry_point.group == 'console_scripts' and entry_point.name == 'name':
sys.exit(entry_point.load()()) sys.exit(entry_point.load()())
""") # noqa: E501 """) # noqa: E501
except ImportError: else:
expected = header + DALS(r""" expected = header + DALS(r"""
# EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name' # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
__requires__ = 'spec' __requires__ = 'spec'
......
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