https://github.com/python/cpython/commit/7cc89496922b7edb033e2ed47550c7c9e2ae8525
commit: 7cc89496922b7edb033e2ed47550c7c9e2ae8525
branch: main
author: Andrii Hrimov <[email protected]>
committer: picnixz <[email protected]>
date: 2025-06-19T16:47:35+02:00
summary:
gh-135273: Unify `ZoneInfo.from_file` signatures (#135274)
Align `ZoneInfo.from_file` pure-Python signature with Argument Clinic signature.
files:
M Doc/library/zoneinfo.rst
M Lib/zoneinfo/_zoneinfo.py
diff --git a/Doc/library/zoneinfo.rst b/Doc/library/zoneinfo.rst
index a57f3b8b3e858c..53d8e2598ec1c7 100644
--- a/Doc/library/zoneinfo.rst
+++ b/Doc/library/zoneinfo.rst
@@ -195,7 +195,7 @@ The ``ZoneInfo`` class
The ``ZoneInfo`` class has two alternate constructors:
-.. classmethod:: ZoneInfo.from_file(fobj, /, key=None)
+.. classmethod:: ZoneInfo.from_file(file_obj, /, key=None)
Constructs a ``ZoneInfo`` object from a file-like object returning bytes
(e.g. a file opened in binary mode or an :class:`io.BytesIO` object).
@@ -325,7 +325,7 @@ The behavior of a ``ZoneInfo`` file depends on how it was
constructed:
>>> a is b
False
-3. ``ZoneInfo.from_file(fobj, /, key=None)``: When constructed from a file, the
+3. ``ZoneInfo.from_file(file_obj, /, key=None)``: When constructed from a
file, the
``ZoneInfo`` object raises an exception on pickling. If an end user wants to
pickle a ``ZoneInfo`` constructed from a file, it is recommended that they
use a wrapper type or a custom serialization function: either serializing by
diff --git a/Lib/zoneinfo/_zoneinfo.py b/Lib/zoneinfo/_zoneinfo.py
index b77dc0ed391bb3..3ffdb4c837192b 100644
--- a/Lib/zoneinfo/_zoneinfo.py
+++ b/Lib/zoneinfo/_zoneinfo.py
@@ -75,12 +75,12 @@ def _new_instance(cls, key):
return obj
@classmethod
- def from_file(cls, fobj, /, key=None):
+ def from_file(cls, file_obj, /, key=None):
obj = super().__new__(cls)
obj._key = key
obj._file_path = None
- obj._load_file(fobj)
- obj._file_repr = repr(fobj)
+ obj._load_file(file_obj)
+ obj._file_repr = repr(file_obj)
# Disable pickling for objects created from files
obj.__reduce__ = obj._file_reduce
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
