[Python-checkins] python/dist/src/Lib pyclbr.py, 1.30, 1.31 inspect.py, 1.48, 1.49

[rhettinger at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv15634

Modified Files:
	pyclbr.py inspect.py 
Log Message:
Apply extract functions instead of lambda.

Index: pyclbr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pyclbr.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** pyclbr.py	3 Dec 2002 08:14:35 -0000	1.30
--- pyclbr.py	1 Dec 2003 20:12:14 -0000	1.31
***************
*** 44,47 ****
--- 44,48 ----
  import tokenize # Python tokenizer
  from token import NAME, DEDENT, NEWLINE
+ from operator import itemgetter
  
  __all__ = ["readmodule", "readmodule_ex", "Class", "Function"]
***************
*** 327,332 ****
          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]))
              for name, lineno in methods:
                  if name != "__path__":
--- 328,332 ----
          if isinstance(obj, Class):
              print "class", obj.name, obj.super, obj.lineno
!             methods = list.sorted(obj.methods.iteritems(), key=itemgetter(1))
              for name, lineno in methods:
                  if name != "__path__":

Index: inspect.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/inspect.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** inspect.py	16 Oct 2003 05:53:16 -0000	1.48
--- inspect.py	1 Dec 2003 20:12:15 -0000	1.49
***************
*** 30,33 ****
--- 30,34 ----
  
  import sys, os, types, string, re, dis, imp, tokenize, linecache
+ from operator import attrgetter
  
  # ----------------------------------------------------------- type-checking
***************
*** 554,558 ****
      """Recursive helper function for getclasstree()."""
      results = []
!     classes.sort(key=lambda c: c.__name__)
      for c in classes:
          results.append((c, c.__bases__))
--- 555,559 ----
      """Recursive helper function for getclasstree()."""
      results = []
!     classes.sort(key=attrgetter('__name__'))
      for c in classes:
          results.append((c, c.__bases__))