From faf7dfa656bd52959156fed39a4c680b2b13e032 Mon Sep 17 00:00:00 2001
From: Nikita Sobolev <mail@sobolevn.me>
Date: Fri, 11 Nov 2022 12:56:57 +0300
Subject: [PATCH] gh-99325: Remove unused `NameError` handling (#99326)
---
Lib/copyreg.py | 12 +++---------
Lib/tarfile.py | 10 +++-------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/Lib/copyreg.py b/Lib/copyreg.py
index c8a52a2dc63..578392409b4 100644
--- a/Lib/copyreg.py
+++ b/Lib/copyreg.py
@@ -25,16 +25,10 @@ def constructor(object):
# Example: provide pickling support for complex numbers.
-try:
- complex
-except NameError:
- pass
-else:
+def pickle_complex(c):
+ return complex, (c.real, c.imag)
- def pickle_complex(c):
- return complex, (c.real, c.imag)
-
- pickle(complex, pickle_complex, complex)
+pickle(complex, pickle_complex, complex)
def pickle_union(obj):
import functools, operator
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index a08f247f496..42100e9a394 100755
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -57,13 +57,9 @@
grp = None
# os.symlink on Windows prior to 6.0 raises NotImplementedError
-symlink_exception = (AttributeError, NotImplementedError)
-try:
- # OSError (winerror=1314) will be raised if the caller does not hold the
- # SeCreateSymbolicLinkPrivilege privilege
- symlink_exception += (OSError,)
-except NameError:
- pass
+# OSError (winerror=1314) will be raised if the caller does not hold the
+# SeCreateSymbolicLinkPrivilege privilege
+symlink_exception = (AttributeError, NotImplementedError, OSError)
# from tarfile import *
__all__ = ["TarFile", "TarInfo", "is_tarfile", "TarError", "ReadError",
--
GitLab