Apply extract functions instead of lambda.

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 4874904076ee3d0fc4412fd5eca16e6b0e8c0fe5..0e0e9e5078f770d032c33b9187423f20b6579a2c 100644 (file)
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -29,6 +29,7 @@ __author__ = 'Ka-Ping Yee <ping@lfw.org>'
 __date__ = '1 Jan 2001'
 
 import sys, os, types, string, re, dis, imp, tokenize, linecache
+from operator import attrgetter
 
 # ----------------------------------------------------------- type-checking
 def ismodule(object):
@@ -553,7 +554,7 @@ def getsource(object):
 def walktree(classes, children, parent):
     """Recursive helper function for getclasstree()."""
     results = []
-    classes.sort(key=lambda c: c.__name__)
+    classes.sort(key=attrgetter('__name__'))
     for c in classes:
         results.append((c, c.__bases__))
         if c in children:

diff --git a/Lib/pyclbr.py b/Lib/pyclbr.py
index 26cc0ce0dade507065f6e232c8c6c187bda30703..6674b71ff094eec27d7f009c3460efcb9704668b 100644 (file)
--- a/Lib/pyclbr.py
+++ b/Lib/pyclbr.py
@@ -43,6 +43,7 @@ import sys
 import imp
 import tokenize # Python tokenizer
 from token import NAME, DEDENT, NEWLINE
+from operator import itemgetter
 
 __all__ = ["readmodule", "readmodule_ex", "Class", "Function"]
 
@@ -326,8 +327,7 @@ def _main():
     for obj in objs:
         if isinstance(obj, Class):
             print "class", obj.name, obj.super, obj.lineno
-            methods = obj.methods.items()
-            methods.sort(lambda a, b: cmp(a[1], b[1]))
+            methods = list.sorted(obj.methods.iteritems(), key=itemgetter(1))
             for name, lineno in methods:
                 if name != "__path__":
                     print "  def", name, lineno