Merge p3yk branch with the trunk up to revision 45595. This breaks a fair

number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html

Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:

test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec

This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.

1 files changed, 3 insertions, 3 deletions

diff --git a/Lib/bdb.py b/Lib/bdb.py
index 8f808cc..08b48c3 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -479,10 +479,10 @@ class Breakpoint:
         else:
             disp = 'keep '
         if self.enabled:
-            disp = disp + 'yes'
+            disp = disp + 'yes  '
         else:
-            disp = disp + 'no '
-        print '%-4dbreakpoint    %s at %s:%d' % (self.number, disp,
+            disp = disp + 'no   '
+        print '%-4dbreakpoint   %s at %s:%d' % (self.number, disp,
                              self.file, self.line)
         if self.cond:
             print '\tstop only if %s' % (self.cond,)