Rev 3485: (vila) Trivial drive-by cleanups in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Jun 9 08:45:27 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3485
revision-id:pqm at pqm.ubuntu.com-20080609074519-afx3xh7bd8wqzjy0
parent: pqm at pqm.ubuntu.com-20080609032621-t822lbsu7n2ide2k
parent: v.ladeuil+lp at free.fr-20080609072213-h2a1782lvvyfr4vi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-06-09 08:45:19 +0100
message:
(vila) Trivial drive-by cleanups
modified:
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 3484.1.1
revision-id:v.ladeuil+lp at free.fr-20080609072213-h2a1782lvvyfr4vi
parent: pqm at pqm.ubuntu.com-20080609032621-t822lbsu7n2ide2k
parent: v.ladeuil+lp at free.fr-20080609072006-d5ehy1bri7syq21b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2008-06-09 09:22:13 +0200
message:
(vila) Trivial drive-by cleanups
modified:
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 3484.2.1
revision-id:v.ladeuil+lp at free.fr-20080609072006-d5ehy1bri7syq21b
parent: pqm at pqm.ubuntu.com-20080609032621-t822lbsu7n2ide2k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: various
timestamp: Mon 2008-06-09 09:20:06 +0200
message:
Trivial drive-by cleanups.
* transport/__init__.py:
(Transport.iter_files_recursive): Fix comment.
* tests/test_transport_implementations.py:
Fix some spurious white spaces.
modified:
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
=== modified file 'bzrlib/tests/test_transport_implementations.py'
--- a/bzrlib/tests/test_transport_implementations.py 2008-06-04 14:33:40 +0000
+++ b/bzrlib/tests/test_transport_implementations.py 2008-06-09 07:20:06 +0000
@@ -951,14 +951,14 @@
except TransportNotPossible:
# ok, this transport does not support delete_tree
return
-
+
# did it delete that trivial case?
self.assertRaises(NoSuchFile, t.stat, 'adir')
self.build_tree(['adir/',
- 'adir/file',
- 'adir/subdir/',
- 'adir/subdir/file',
+ 'adir/file',
+ 'adir/subdir/',
+ 'adir/subdir/file',
'adir/subdir2/',
'adir/subdir2/file',
], transport=t)
@@ -1045,7 +1045,7 @@
return
paths = ['a', 'b/', 'b/c', 'b/d/', 'b/d/e']
- sizes = [14, 0, 16, 0, 18]
+ sizes = [14, 0, 16, 0, 18]
self.build_tree(paths, transport=t, line_endings='binary')
for path, size in zip(paths, sizes):
@@ -1073,7 +1073,7 @@
def test_list_dir(self):
# TODO: Test list_dir, just try once, and if it throws, stop testing
t = self.get_transport()
-
+
if not t.listable():
self.assertRaises(TransportNotPossible, t.list_dir, '.')
return
@@ -1109,7 +1109,7 @@
else:
os.unlink('c/d')
os.unlink('b')
-
+
self.assertEqual(['a', 'a%2525b', 'c', 'c2'], sorted_list('.', t))
self.assertEqual(['e'], sorted_list('c', t))
@@ -1126,7 +1126,7 @@
self.build_tree(['a/', 'a/%'], transport=t)
else:
self.build_tree(['a/', 'a/%'])
-
+
names = list(t.list_dir('a'))
self.assertEqual(['%25'], names)
self.assertIsInstance(names[0], str)
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py 2008-05-19 10:55:48 +0000
+++ b/bzrlib/transport/__init__.py 2008-06-09 07:20:06 +0000
@@ -537,7 +537,7 @@
*NOTE*: This only lists *files*, not subdirectories!
As with other listing functions, only some transports implement this,.
- you may check via is_listable to determine if it will.
+ you may check via listable() to determine if it will.
"""
raise errors.TransportNotPossible("This transport has not "
"implemented iter_files_recursive "
More information about the bazaar-commits
mailing list