Skip to content
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

gh-101144: Allow open and read_text encoding to be positional. #101145

Merged
merged 13 commits into from
Jan 20, 2023
Merged

gh-101144: Allow open and read_text encoding to be positional. #101145

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a4f19a4
gh-101144: Allow open and read_text encoding to be positional.
gpshead Jan 19, 2023
b495172
news wording tweak
gpshead Jan 19, 2023
e304094
Explicitly handle encoding as an arg.
gpshead Jan 19, 2023
9caec6c
wording tweak in news.
gpshead Jan 19, 2023
b4248b1
Explicitly test an unusual encoding to verify it passed through.
gpshead Jan 19, 2023
32b252b
simplify read_text, just defer encoding to open
gpshead Jan 19, 2023
d1228b5
address review comments: fixup pos+kw logic, test it.
gpshead Jan 19, 2023
8ee213e
Apply jaraco's suggestion: an encoding extraction method.
gpshead Jan 19, 2023
25dd5bd
Test EncodingWarning blame of open & read_text.
gpshead Jan 20, 2023
e9b373f
Surface the behavior in the zipfile.Path docs.
gpshead Jan 20, 2023
a12243b
simplify the doc wording.
gpshead Jan 20, 2023
35abedb
more doc wording updates based on review.
gpshead Jan 20, 2023
88ecd56
use () on single element tuple assignment for clarity.
gpshead Jan 20, 2023
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
5 changes: 2 additions & 3 deletions Lib/zipfile/_path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,8 @@ def stem(self):
def filename(self):
return pathlib.Path(self.root.filename).joinpath(self.at)

def read_text(self, encoding=None, *args, **kwargs):
encoding = io.text_encoding(encoding)
with self.open('r', *args, encoding=encoding, **kwargs) as strm:
def read_text(self, *args, **kwargs):
with self.open('r', *args, **kwargs) as strm:
gpshead marked this conversation as resolved.
Show resolved Hide resolved
return strm.read()

def read_bytes(self):
Expand Down