correct key for pep 658 metadata in JSON Simple API

ewdurbin · ewdurbin · commit 59bdd7a41781 · 2023-05-21T08:23:20.000-04:00
diff --git a/tests/unit/api/test_simple.py b/tests/unit/api/test_simple.py
@@ -277,7 +277,7 @@ def test_with_files_no_serial(self, db_request, content_type, renderer_override)
                     "yanked": False,
                     "size": f.size,
                     "upload-time": f.upload_time.isoformat() + "Z",
-                    "data-dist-info-metadata": False,
+                    "dist-info-metadata": False,
                 }
                 for f in files
             ],
@@ -324,7 +324,7 @@ def test_with_files_with_serial(self, db_request, content_type, renderer_overrid
                     "yanked": False,
                     "size": f.size,
                     "upload-time": f.upload_time.isoformat() + "Z",
-                    "data-dist-info-metadata": False,
+                    "dist-info-metadata": False,
                 }
                 for f in files
             ],
@@ -408,9 +408,7 @@ def test_with_files_with_version_multi_digit(
                     "yanked": False,
                     "size": f.size,
                     "upload-time": f.upload_time.isoformat() + "Z",
-                    "data-dist-info-metadata": {
-                        "sha256": "deadbeefdeadbeefdeadbeefdeadbeef"
-                    }
+                    "dist-info-metadata": {"sha256": "deadbeefdeadbeefdeadbeefdeadbeef"}
                     if f.metadata_file_sha256_digest is not None
                     else False,
                 }
diff --git a/warehouse/packaging/utils.py b/warehouse/packaging/utils.py
@@ -70,7 +70,7 @@ def _simple_detail(project, request):
                 "yanked": file.release.yanked_reason
                 if file.release.yanked and file.release.yanked_reason
                 else file.release.yanked,
-                "data-dist-info-metadata": {"sha256": file.metadata_file_sha256_digest}
+                "dist-info-metadata": {"sha256": file.metadata_file_sha256_digest}
                 if file.metadata_file_sha256_digest
                 else False,
             }
diff --git a/warehouse/templates/api/simple/detail.html b/warehouse/templates/api/simple/detail.html
@@ -20,7 +20,7 @@
   <body>
     <h1>Links for {{ name }}</h1>
     {% for file in files -%}
-    <a href="{{ file.url }}#sha256={{ file.hashes.sha256 }}" {% if file.get('requires-python') %}data-requires-python="{{ file['requires-python'] }}" {% endif %}{% if file.yanked %}data-yanked="{% if file.yanked is string %}{{ file.yanked }}{% endif %}" {% endif %}{% if file['data-dist-info-metadata'] %}data-dist-info-metadata="sha256={{ file['data-dist-info-metadata']['sha256'] }}"{% endif %}>{{ file.filename }}</a><br />
+    <a href="{{ file.url }}#sha256={{ file.hashes.sha256 }}" {% if file.get('requires-python') %}data-requires-python="{{ file['requires-python'] }}" {% endif %}{% if file.yanked %}data-yanked="{% if file.yanked is string %}{{ file.yanked }}{% endif %}" {% endif %}{% if file['dist-info-metadata'] %}data-dist-info-metadata="sha256={{ file['dist-info-metadata']['sha256'] }}"{% endif %}>{{ file.filename }}</a><br />
     {% endfor -%}
   </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ def _simple_detail(project, request):`
`70`	`70`	`"yanked": file.release.yanked_reason`
`71`	`71`	`if file.release.yanked and file.release.yanked_reason`
`72`	`72`	`else file.release.yanked,`
`73`		`- "data-dist-info-metadata": {"sha256": file.metadata_file_sha256_digest}`
	`73`	`+ "dist-info-metadata": {"sha256": file.metadata_file_sha256_digest}`
`74`	`74`	`if file.metadata_file_sha256_digest`
`75`	`75`	`else False,`
`76`	`76`	`}`