From: Guido van Rossum <guido@python.org>
Date: Thu, 26 Dec 1991 13:04:02 +0000 (+0000)
Subject: Use AttributeError
X-Git-Tag: v0.9.8~658
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=946749f6fe31c07433cb58bf82803fa8e2acdd38;p=thirdparty%2FPython%2Fcpython.git

Use AttributeError
---

diff --git a/Lib/lib-old/newdir.py b/Lib/lib-old/newdir.py
index 7164b989743c..9d07d6ceb28e 100644
--- a/Lib/lib-old/newdir.py
+++ b/Lib/lib-old/newdir.py
@@ -11,27 +11,27 @@ def getattr(x, name):
 def listattrs(x):
 	try:
 		dictkeys = x.__dict__.keys()
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		dictkeys = []
 	#
 	try:
 		methods = x.__methods__
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		methods = []
 	#
 	try:
 		members = x.__members__
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		members = []
 	#
 	try:
 		the_class = x.__class__
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		the_class = None
 	#
 	try:
 		bases = x.__bases__
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		bases = ()
 	#
 	total = dictkeys + methods + members
@@ -69,7 +69,7 @@ def is_function(x):
 # Use a class method to make a function that can be called
 # with or without arguments.
 #
-class _dirclass():
+class _dirclass:
 	def dir(args):
 		if type(args) = type(()):
 			return listattrs(args[1])
diff --git a/Lib/newdir.py b/Lib/newdir.py
index 7164b989743c..9d07d6ceb28e 100644
--- a/Lib/newdir.py
+++ b/Lib/newdir.py
@@ -11,27 +11,27 @@ def getattr(x, name):
 def listattrs(x):
 	try:
 		dictkeys = x.__dict__.keys()
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		dictkeys = []
 	#
 	try:
 		methods = x.__methods__
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		methods = []
 	#
 	try:
 		members = x.__members__
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		members = []
 	#
 	try:
 		the_class = x.__class__
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		the_class = None
 	#
 	try:
 		bases = x.__bases__
-	except (NameError, TypeError):
+	except (AttributeError, TypeError):
 		bases = ()
 	#
 	total = dictkeys + methods + members
@@ -69,7 +69,7 @@ def is_function(x):
 # Use a class method to make a function that can be called
 # with or without arguments.
 #
-class _dirclass():
+class _dirclass:
 	def dir(args):
 		if type(args) = type(()):
 			return listattrs(args[1])