Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 6 additions & 11 deletions Lib/copy.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,14 @@ def copy(x):
if copier:
return copier(x)

reductor = dispatch_table.get(cls)
if reductor:
if (reductor := dispatch_table.get(cls)):
rv = reductor(x)
elif (reductor := getattr(x, "__reduce_ex__", None)):
rv = reductor(4)
elif (reductor := getattr(x, "__reduce__", None)):
rv = reductor()
else:
reductor = getattr(x, "__reduce_ex__", None)
if reductor:
rv = reductor(4)
else:
reductor = getattr(x, "__reduce__", None)
if reductor:
rv = reductor()
else:
raise Error("un(shallow)copyable object of type %s" % cls)
raise Error("un(shallow)copyable object of type %s" % cls)

if isinstance(rv, str):
return x
Expand Down
8 changes: 3 additions & 5 deletions Lib/zipfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -681,12 +681,10 @@ def _get_decompressor(compress_type):
return bz2.BZ2Decompressor()
elif compress_type == ZIP_LZMA:
return LZMADecompressor()
elif descr := compressor_names.get(compress_type):
raise NotImplementedError("compression type %d (%s)" % (compress_type, descr))
else:
descr = compressor_names.get(compress_type)
if descr:
raise NotImplementedError("compression type %d (%s)" % (compress_type, descr))
else:
raise NotImplementedError("compression type %d" % (compress_type,))
raise NotImplementedError("compression type %d" % (compress_type,))


class _SharedFile:
Expand Down