aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-11-25 10:10:10 -0500
committerJason R. Coombs <jaraco@jaraco.com>2017-11-25 10:10:10 -0500
commitb2e99f6731c6ba6fe6bd60f79f2166640f3db21d (patch)
treead1cf84363467a9dc139319d0455e07e91158692
parent98f383aeaacec60d773abdc008327ba29f8febe3 (diff)
downloadexternal_python_setuptools-b2e99f6731c6ba6fe6bd60f79f2166640f3db21d.tar.gz
external_python_setuptools-b2e99f6731c6ba6fe6bd60f79f2166640f3db21d.tar.bz2
external_python_setuptools-b2e99f6731c6ba6fe6bd60f79f2166640f3db21d.zip
Shorten message and update changelog. Ref #1209.
-rw-r--r--CHANGES.rst6
-rw-r--r--pkg_resources/__init__.py5
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index c8a3ecc3..df91d999 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.1.0
+-------
+
+* #1208: Improve error message when failing to locate scripts
+ in egg-info metadata.
+
v38.0.0
-------
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 62b82081..73334641 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1514,8 +1514,9 @@ class NullProvider:
script = 'scripts/' + script_name
if not self.has_metadata(script):
raise ResolutionError(
- "No script named %r in 'scripts' directory of metadata "
- "directory %r" % (script_name, self.egg_info))
+ "Script {script!r} not found in metadata at {self.egg_info!r}"
+ .format(**locals()),
+ )
script_text = self.get_metadata(script).replace('\r\n', '\n')
script_text = script_text.replace('\r', '\n')
script_filename = self._fn(self.egg_info, script)