Rev 5472: (spiv) Give slightly more informative errors when a bad object or str is in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5472 [merge]
revision-id: pqm at pqm.ubuntu.com-20101008050114-iwil1v5hc6o4b6xb
parent: pqm at pqm.ubuntu.com-20101008023856-vzzhacepdv47oxk7
parent: andrew.bennetts at canonical.com-20101008042510-sg9vdhmnggilzxsk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-10-08 06:01:14 +0100
message:
  (spiv) Give slightly more informative errors when a bad object or str is
   passed to _chk_map_pyx._bytes_to_text_key. (Andrew Bennetts)
modified:
  bzrlib/_chk_map_pyx.pyx        _chk_map_pyx.pyx-20090309111231-peyz7p2azr0dzdrb-1
  bzrlib/tests/test_chk_map.py   test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
=== modified file 'bzrlib/_chk_map_pyx.pyx'
--- a/bzrlib/_chk_map_pyx.pyx	2010-05-16 15:18:43 +0000
+++ b/bzrlib/_chk_map_pyx.pyx	2010-10-08 04:25:10 +0000
@@ -413,7 +413,7 @@
     cdef Py_ssize_t byte_size, pos, file_id_len
 
     if not PyString_CheckExact(bytes):
-        raise TypeError('bytes must be a string')
+        raise TypeError('bytes must be a string, got %r' % (type(bytes),))
     byte_str = PyString_AS_STRING(bytes)
     byte_size = PyString_GET_SIZE(bytes)
     byte_end = byte_str + byte_size
@@ -421,7 +421,8 @@
     if cur_end == NULL:
         raise ValueError('No kind section found.')
     if cur_end[1] != c' ':
-        raise ValueError('Kind section should end with ": "')
+        raise ValueError(
+            'Kind section should end with ": ", got %r' % str(cur_end[:2],))
     file_id_str = cur_end + 2
     # file_id is now the data up until the next newline
     cur_end = <char*>memchr(file_id_str, c'\n', byte_end - file_id_str)

=== modified file 'bzrlib/tests/test_chk_map.py'
--- a/bzrlib/tests/test_chk_map.py	2010-07-21 09:58:42 +0000
+++ b/bzrlib/tests/test_chk_map.py	2010-10-08 02:13:25 +0000
@@ -16,8 +16,6 @@
 
 """Tests for maps built on a CHK versionedfiles facility."""
 
-from itertools import izip
-
 from bzrlib import (
     chk_map,
     errors,