Skip to content

Fix leading forward slashes in RECORD files produced by py_wheel. #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 14, 2022
Merged

Fix leading forward slashes in RECORD files produced by py_wheel. #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cf577a
Fix leading forward slashes in RECORD files produced by `py_wheel`.
UebelAndre Aug 13, 2022
c449af3
Merge branch 'main' into record
groodt Aug 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions examples/wheel/wheel_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,14 @@ def test_custom_package_root_wheel(self):
],
)

record_contents = zf.read(
"examples_custom_package_root-0.0.1.dist-info/RECORD"
).decode("utf-8")

# Ensure RECORD files do not have leading forward slashes
for line in record_contents.splitlines():
self.assertFalse(line.startswith("/"))

def test_custom_package_root_multi_prefix_wheel(self):
filename = os.path.join(
os.environ["TEST_SRCDIR"],
Expand All @@ -261,6 +269,14 @@ def test_custom_package_root_multi_prefix_wheel(self):
],
)

record_contents = zf.read(
"example_custom_package_root_multi_prefix-0.0.1.dist-info/RECORD"
).decode("utf-8")

# Ensure RECORD files do not have leading forward slashes
for line in record_contents.splitlines():
self.assertFalse(line.startswith("/"))

def test_custom_package_root_multi_prefix_reverse_order_wheel(self):
filename = os.path.join(
os.environ["TEST_SRCDIR"],
Expand All @@ -284,6 +300,14 @@ def test_custom_package_root_multi_prefix_reverse_order_wheel(self):
],
)

record_contents = zf.read(
"example_custom_package_root_multi_prefix_reverse_order-0.0.1.dist-info/RECORD"
).decode("utf-8")

# Ensure RECORD files do not have leading forward slashes
for line in record_contents.splitlines():
self.assertFalse(line.startswith("/"))

def test_python_requires_wheel(self):
filename = os.path.join(
os.environ["TEST_SRCDIR"],
Expand Down
2 changes: 1 addition & 1 deletion tools/wheelmaker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def add_recordfile(self):
contents = b""
for filename, digest, size in entries:
if sys.version_info[0] > 2 and isinstance(filename, str):
filename = filename.encode("utf-8", "surrogateescape")
filename = filename.lstrip("/").encode("utf-8", "surrogateescape")
contents += b"%s,%s,%s\n" % (filename, digest, size)
self.add_string(record_path, contents)

Expand Down