Skip to content

Commit 31ee8b5

Browse files
CPython Developersyouknowone
authored andcommitted
Update codecs from v3.14.2
1 parent 0c17462 commit 31ee8b5

2 files changed

Lines changed: 252 additions & 173 deletions

File tree

Lib/codecs.py

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,6 @@ def __reduce_ex__(self, proto):
884884
### Shortcuts
885885

886886
def open(filename, mode='r', encoding=None, errors='strict', buffering=-1):
887-
888887
""" Open an encoded file using the given mode and return
889888
a wrapped version providing transparent encoding/decoding.
890889
@@ -912,8 +911,11 @@ def open(filename, mode='r', encoding=None, errors='strict', buffering=-1):
912911
.encoding which allows querying the used encoding. This
913912
attribute is only available if an encoding was specified as
914913
parameter.
915-
916914
"""
915+
import warnings
916+
warnings.warn("codecs.open() is deprecated. Use open() instead.",
917+
DeprecationWarning, stacklevel=2)
918+
917919
if encoding is not None and \
918920
'b' not in mode:
919921
# Force opening of the file in binary mode
@@ -1109,24 +1111,15 @@ def make_encoding_map(decoding_map):
11091111

11101112
### error handlers
11111113

1112-
try:
1113-
strict_errors = lookup_error("strict")
1114-
ignore_errors = lookup_error("ignore")
1115-
replace_errors = lookup_error("replace")
1116-
xmlcharrefreplace_errors = lookup_error("xmlcharrefreplace")
1117-
backslashreplace_errors = lookup_error("backslashreplace")
1118-
namereplace_errors = lookup_error("namereplace")
1119-
except LookupError:
1120-
# In --disable-unicode builds, these error handler are missing
1121-
strict_errors = None
1122-
ignore_errors = None
1123-
replace_errors = None
1124-
xmlcharrefreplace_errors = None
1125-
backslashreplace_errors = None
1126-
namereplace_errors = None
1114+
strict_errors = lookup_error("strict")
1115+
ignore_errors = lookup_error("ignore")
1116+
replace_errors = lookup_error("replace")
1117+
xmlcharrefreplace_errors = lookup_error("xmlcharrefreplace")
1118+
backslashreplace_errors = lookup_error("backslashreplace")
1119+
namereplace_errors = lookup_error("namereplace")
11271120

11281121
# Tell modulefinder that using codecs probably needs the encodings
11291122
# package
11301123
_false = 0
11311124
if _false:
1132-
import encodings
1125+
import encodings # noqa: F401

0 commit comments

Comments
 (0)