Merged revisions 74741 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74741 | benjamin.peterson | 2009-09-11 16:17:13 -0500 (Fri, 11 Sep 2009) | 1 line

  #6888 fix the alias command with no arguments
........

diff --git a/Lib/pdb.py b/Lib/pdb.py
index e272f2ebb323e1604937645b7632ee484339fc98..627cd29ba7b6da67493965f104fc6aae84ee6997 100755 (executable)
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -841,8 +841,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
     def do_alias(self, arg):
         args = arg.split()
         if len(args) == 0:
-            keys = self.aliases.keys()
-            keys.sort()
+            keys = sorted(self.aliases.keys())
             for alias in keys:
                 print("%s = %s" % (alias, self.aliases[alias]), file=self.stdout)
             return

diff --git a/Misc/NEWS b/Misc/NEWS
index 85fad1cbadb1d8a2dbcbf8f19221b873f9025b04..3e06581c42b2b63f90bf22995c72fc30512c4780 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,8 @@ C-API
 Library
 -------
 
+- Issue #6888: pdb's alias command was broken when no arguments were given.
+
 - Issue #6795: int(Decimal('nan')) now raises ValueError instead of
   returning NaN or raising InvalidContext.  Also, fix infinite recursion
   in long(Decimal('nan')).