Rely on re.sub to perform the decision in one expression.

jaraco · jaraco · commit 2ca4a9fe4758 · 2025-04-19T13:39:54.000-04:00
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
@@ -854,8 +854,8 @@ def _resolve_download_filename(cls, url, tmpdir):
             '__downloaded__'
         )
 
-        if name.endswith('.egg.zip'):
-            name = name[:-4]  # strip the extra .zip before download
+        # strip any extra .zip before download
+        name = re.sub(r'\.egg\.zip$', '.egg', name)
 
         return os.path.join(tmpdir, name)
 

Original file line number	Diff line number	Diff line change
`@@ -854,8 +854,8 @@ def _resolve_download_filename(cls, url, tmpdir):`
`854`	`854`	`'__downloaded__'`
`855`	`855`	`)`
`856`	`856`
`857`		`- if name.endswith('.egg.zip'):`
`858`		`- name = name[:-4] # strip the extra .zip before download`
	`857`	`+ # strip any extra .zip before download`
	`858`	`+ name = re.sub(r'\.egg\.zip$', '.egg', name)`
`859`	`859`
`860`	`860`	`return os.path.join(tmpdir, name)`
`861`	`861`