diff options
| -rw-r--r-- | Lib/lib-old/newdir.py | 12 | ||||
| -rw-r--r-- | Lib/newdir.py | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Lib/lib-old/newdir.py b/Lib/lib-old/newdir.py index 7164b98..9d07d6c 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 7164b98..9d07d6c 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]) |