Rev 4266: Cleanup pronto calls. in file:///home/vila/src/bzr/bugs/355454-unicode-warning/

Vincent Ladeuil v.ladeuil+lp at free.fr
Fri Apr 17 13:52:36 BST 2009


At file:///home/vila/src/bzr/bugs/355454-unicode-warning/

------------------------------------------------------------
revno: 4266
revision-id: v.ladeuil+lp at free.fr-20090417125236-1h8bkodqys6reofz
parent: v.ladeuil+lp at free.fr-20090417124250-vb9zcpl3rgfu0uop
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355454-unicode-warning
timestamp: Fri 2009-04-17 14:52:36 +0200
message:
  Cleanup pronto calls.
-------------- next part --------------
=== modified file 'BRANCH.TODO'
--- a/BRANCH.TODO	2009-04-17 08:58:31 +0000
+++ b/BRANCH.TODO	2009-04-17 12:52:36 +0000
@@ -7,5 +7,3 @@
 
 - clean up spurious changes
 
-- check all pdb and pronto calls
-

=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py	2009-04-16 14:13:57 +0000
+++ b/bzrlib/dirstate.py	2009-04-17 12:52:36 +0000
@@ -1637,7 +1637,6 @@
         #       higher level, because there either won't be anything on disk,
         #       or the thing on disk will be a file.
         fs_encoding = osutils._fs_enc
-        import pronto; pronto.bzr_test('dirstate._read_link(%r)' % abspath)
         if isinstance(abspath, unicode):
             # abspath is defined as the path to pass to lstat. readlink is
             # buggy in python < 2.6 (it doesn't encode unicode path into FS
@@ -1648,7 +1647,6 @@
         if fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'):
             # Change encoding if needed
             target = target.decode(fs_encoding).encode('UTF-8')
-        pronto.bzr_test('dirstate._read_link() -> %r' % target)
         return target
 
     def get_ghosts(self):

=== modified file 'bzrlib/hashcache.py'
--- a/bzrlib/hashcache.py	2009-04-16 21:31:35 +0000
+++ b/bzrlib/hashcache.py	2009-04-17 12:52:36 +0000
@@ -181,8 +181,6 @@
             digest = self._really_sha1_file(abspath, filters)
         elif stat.S_ISLNK(mode):
             target = osutils.readlink(osutils.safe_unicode(abspath))
-            import pronto
-            pronto.bzr_test('HashCache.get_sha1(%r) -> %r' % (abspath, target))
             digest = osutils.sha_string(target.encode('UTF-8'))
         else:
             raise errors.BzrError("file %r: unknown file stat mode: %o"

=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2009-04-16 16:57:28 +0000
+++ b/bzrlib/osutils.py	2009-04-17 12:52:36 +0000
@@ -1395,7 +1395,6 @@
         path-from-top might be unicode or utf8, but it is the correct path to
         pass to os functions to affect the file in question. (such as os.lstat)
     """
-    import pronto; pronto.bzr_test('osutils._walkdirs_utf8')
     global _selected_dir_reader
     if _selected_dir_reader is None:
         fs_encoding = _fs_enc.upper()
@@ -1464,7 +1463,6 @@
 
         See DirReader.read_dir for details.
         """
-        import pronto; pronto.bzr_test('UnicodeDirReader._read_dir')
         _utf8_encode = self._utf8_encode
         _lstat = os.lstat
         _listdir = os.listdir

=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2009-04-17 08:58:31 +0000
+++ b/bzrlib/workingtree.py	2009-04-17 12:52:36 +0000
@@ -750,7 +750,6 @@
             return kind, None, None, None
         elif kind == 'symlink':
             target = osutils.readlink(abspath)
-#            import pronto; pronto.bzr_test('WorkingTree.path_content_summary')
             return ('symlink', None, None, target)
         else:
             return (kind, None, None, None)



More information about the bazaar-commits mailing list