Fix more formatting.

diff --git a/logwalker.py b/logwalker.py
index 592cb2281cba41393d49c5d81d3e2c3f98a511c0..555f184a529ca480102f1ab72463303c017c1e9c 100644 (file)
--- a/logwalker.py
+++ b/logwalker.py
@@ -211,7 +211,7 @@ class LogCache(CacheTable):
         """
         result = self.cachedb.execute("select name, value from revprop where rev = ?", (revnum,))
         revprops = {}
-        for k,v in result:
+        for k, v in result:
             revprops[k.encode("utf-8")] = v.encode("utf-8")
         return revprops
 
@@ -227,7 +227,7 @@ class LogCache(CacheTable):
     def insert_revprops(self, revision, revprops):
         if revprops is None:
             return
-        for k,v in revprops.items():
+        for k, v in revprops.items():
             self.insert_revprop(revision, k, v)
 
     def has_all_revprops(self, revnum):
@@ -477,7 +477,7 @@ class CachingLogWalker(CacheTable):
 def struct_revpaths_to_tuples(changed_paths):
     assert isinstance(changed_paths, dict)
     revpaths = {}
-    for k,(action, copyfrom_path, copyfrom_rev) in changed_paths.items():
+    for k, (action, copyfrom_path, copyfrom_rev) in changed_paths.items():
         if copyfrom_path is None:
             copyfrom_path = None
         else:
@@ -602,7 +602,7 @@ class LogWalker(object):
                     if num == ERR_FS_NOT_DIRECTORY:
                         continue
                     raise
-                for k,v in dirents.items():
+                for k, v in dirents.items():
                     childp = urlutils.join(nextp, k)
                     if v['kind'] == core.NODE_DIR:
                         unchecked_dirs.add(childp)

diff --git a/properties.py b/properties.py
index d81af414b6ecaef56418c3fd33815565e35a2fec..ecb5d400d474b3f5dc28a1ab31a654ea9b4eacc1 100644 (file)
--- a/properties.py
+++ b/properties.py
@@ -106,7 +106,7 @@ def parse_externals_description(base_url, val):
 def parse_mergeinfo_property(text):
     ret = {}
     for l in text.splitlines():
-        (path, ranges) = l.rsplit(":",1)
+        (path, ranges) = l.rsplit(":", 1)
         assert path.startswith("/")
         ret[path] = []
         for range in ranges.split(","):

diff --git a/tags.py b/tags.py
index b5f576d74717246922b78eab73432f89406c57de..62e5b6e5cc074b67ddaab67aae6c2aaf3ac7ff86 100644 (file)
--- a/tags.py
+++ b/tags.py
@@ -95,7 +95,7 @@ class SubversionTags(BasicTags):
 
     def _set_tag_dict(self, dest_dict):
         cur_dict = self.get_tag_dict()
-        for k,v in dest_dict.iteritems():
+        for k, v in dest_dict.iteritems():
             if cur_dict.get(k) != v:
                 self.set_tag(k, v)
         for k in cur_dict:

diff --git a/tests/test_config.py b/tests/test_config.py
index 989933e1518fcf4dd0b91d5dda9d3bf0eaf32d6d..0eae72dd56ef015fe49a61dee4dc4be8892ba6e5 100644 (file)
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -70,7 +70,7 @@ class ReposConfigTests(TestCaseInTempDir):
         c.set_user_option("override-svn-revprops", "False")
         self.assertEquals([], c.get_override_svn_revprops())
         c.set_user_option("override-svn-revprops", ["svn:author", "svn:date"])
-        self.assertEquals(["svn:author","svn:date"], c.get_override_svn_revprops())
+        self.assertEquals(["svn:author", "svn:date"], c.get_override_svn_revprops())
         c.set_user_option("override-svn-revprops", ["svn:author"])
         self.assertEquals(["svn:author"], c.get_override_svn_revprops())
 

diff --git a/tests/test_convert.py b/tests/test_convert.py
index 025a30383458be907a1c19530e7ed08c7f3c5a83..6f3420b244cd4ee1993b4cec8b479d791c671f26 100644 (file)
--- a/tests/test_convert.py
+++ b/tests/test_convert.py
@@ -80,7 +80,7 @@ class TestConversion(TestCaseWithSubversionRepository):
         dc.close()
 
     def get_commit_editor(self):
-        return super(TestConversion,self).get_commit_editor(self.repos_url)
+        return super(TestConversion, self).get_commit_editor(self.repos_url)
 
     def test_sets_parent_urls(self):
         convert_repository(Repository.open(self.repos_url), "e", 

diff --git a/tests/test_fileids.py b/tests/test_fileids.py
index edb6d3c8c06e0da847d52b3c56bbe3a88050cb45..75e4bde3f8fcbb3b85d315ba97e55bad44e44e86 100644 (file)
--- a/tests/test_fileids.py
+++ b/tests/test_fileids.py
@@ -196,7 +196,7 @@ class TestFileMapping(TestCase):
                     return renames[r][x]
                 return self.mapping.generate_file_id("uuid", revnum, branchpath, x)
             revmap = simple_apply_changes(new_file_id, mappings[r], find_children)
-            map.update(dict([(x, (revmap[x],r)) for x in revmap]))
+            map.update(dict([(x, (revmap[x], r)) for x in revmap]))
         return map
 
     def test_simple(self):

diff --git a/tests/test_logwalker.py b/tests/test_logwalker.py
index ee1bd78de2cfab0129cd64a7bd5f742ae5abf6f3..49ebe37430527494ebf08b8886eead1e3538027f 100644 (file)
--- a/tests/test_logwalker.py
+++ b/tests/test_logwalker.py
@@ -378,7 +378,7 @@ class TestLogWalker(TestCaseWithSubversionRepository):
 
         for (paths, rev, revprops) in walker.iter_changes([""], 1):
             self.assertTrue(rev == 0 or paths.has_key("foo"))
-            self.assertTrue(rev in (0,1))
+            self.assertTrue(rev in (0, 1))
 
     def test_follow_history_nohist(self):
         repos_url = self.make_repository("a")
@@ -397,7 +397,7 @@ class TestLogWalker(TestCaseWithSubversionRepository):
 
         for (paths, rev, revprops) in walker.iter_changes([""], 1):
             self.assertTrue(rev == 0 or paths.has_key("foo"))
-            self.assertTrue(rev in (0,1))
+            self.assertTrue(rev in (0, 1))
 
         iter = walker.iter_changes([""], 2)
         self.assertRaises(NoSuchRevision, list, iter)

diff --git a/tests/test_mapping.py b/tests/test_mapping.py
index b69c0b193310692acb68c8e54f229bec767a58f1..c0115cce980d8282c50551c428618eb77f40d0ab 100644 (file)
--- a/tests/test_mapping.py
+++ b/tests/test_mapping.py
@@ -218,12 +218,12 @@ class MappingTestAdapter(object):
                 self.mapping.generate_revision_id("myuuid", 5, "bla")))
 
 
-class Mappingv1Tests(MappingTestAdapter,TestCase):
+class Mappingv1Tests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv1()
 
 
-class Mappingv2Tests(MappingTestAdapter,TestCase):
+class Mappingv2Tests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv2()
 
@@ -232,7 +232,7 @@ def sha1(text):
     return sha.new(text).hexdigest()
 
 
-class Mappingv3FilePropTests(MappingTestAdapter,TestCase):
+class Mappingv3FilePropTests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv3FileProps(NoBranchingScheme())
 
@@ -296,17 +296,17 @@ class Mappingv3FilePropTests(MappingTestAdapter,TestCase):
                 self.mapping.generate_file_id("uuid", 2, u"\xe6".encode('utf-8'), u"\xe6\xf8\xe5"))
 
 
-class Mappingv3RevPropTests(MappingTestAdapter,TestCase):
+class Mappingv3RevPropTests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv3RevProps(NoBranchingScheme())
 
 
-class Mappingv3HybridTests(MappingTestAdapter,TestCase):
+class Mappingv3HybridTests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv3Hybrid(NoBranchingScheme())
 
 
-class Mappingv4TestAdapter(MappingTestAdapter,TestCase):
+class Mappingv4TestAdapter(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv4()
 

diff --git a/tests/test_properties.py b/tests/test_properties.py
index c65fa6090c956d79231bfa084d7cedd0d1218e85..27530cc789f0ddfc48de6ae7f2707b4db886dbb4 100644 (file)
--- a/tests/test_properties.py
+++ b/tests/test_properties.py
@@ -98,13 +98,13 @@ third-party/sounds             http://sounds.red-bean.com/repos
 
 class MergeInfoPropertyParserTests(TestCase):
     def test_simple_range(self):
-        self.assertEquals({"/trunk": [(1,2,True)]}, properties.parse_mergeinfo_property("/trunk:1-2\n"))
+        self.assertEquals({"/trunk": [(1, 2, True)]}, properties.parse_mergeinfo_property("/trunk:1-2\n"))
 
     def test_simple_range_uninheritable(self):
-        self.assertEquals({"/trunk": [(1,2,False)]}, properties.parse_mergeinfo_property("/trunk:1-2*\n"))
+        self.assertEquals({"/trunk": [(1, 2, False)]}, properties.parse_mergeinfo_property("/trunk:1-2*\n"))
 
     def test_simple_individual(self):
-        self.assertEquals({"/trunk": [(1,1,True)]}, properties.parse_mergeinfo_property("/trunk:1\n"))
+        self.assertEquals({"/trunk": [(1, 1, True)]}, properties.parse_mergeinfo_property("/trunk:1\n"))
 
     def test_empty(self):
         self.assertEquals({}, properties.parse_mergeinfo_property(""))
@@ -112,10 +112,10 @@ class MergeInfoPropertyParserTests(TestCase):
 
 class MergeInfoPropertyCreatorTests(TestCase):
     def test_simple_range(self):
-        self.assertEquals("/trunk:1-2\n", properties.generate_mergeinfo_property({"/trunk": [(1,2,True)]}))
+        self.assertEquals("/trunk:1-2\n", properties.generate_mergeinfo_property({"/trunk": [(1, 2, True)]}))
 
     def test_simple_individual(self):
-        self.assertEquals("/trunk:1\n", properties.generate_mergeinfo_property({"/trunk": [(1,1,True)]}))
+        self.assertEquals("/trunk:1\n", properties.generate_mergeinfo_property({"/trunk": [(1, 1, True)]}))
 
     def test_empty(self):
         self.assertEquals("", properties.generate_mergeinfo_property({}))
@@ -123,42 +123,42 @@ class MergeInfoPropertyCreatorTests(TestCase):
 
 class RevnumRangeTests(TestCase):
     def test_add_revnum_empty(self):
-        self.assertEquals([(1,1,True)], properties.range_add_revnum([], 1))
+        self.assertEquals([(1, 1, True)], properties.range_add_revnum([], 1))
 
     def test_add_revnum_before(self):
-        self.assertEquals([(2,2,True), (8,8,True)], properties.range_add_revnum([(2,2,True)], 8))
+        self.assertEquals([(2, 2, True), (8, 8, True)], properties.range_add_revnum([(2, 2, True)], 8))
 
     def test_add_revnum_included(self):
-        self.assertEquals([(1,3,True)], properties.range_add_revnum([(1,3,True)], 2))
+        self.assertEquals([(1, 3, True)], properties.range_add_revnum([(1, 3, True)], 2))
         
     def test_add_revnum_after(self):
-        self.assertEquals([(1,3,True),(5,5,True)], properties.range_add_revnum([(1,3,True)], 5))
+        self.assertEquals([(1, 3, True), (5, 5, True)], properties.range_add_revnum([(1, 3, True)], 5))
 
     def test_add_revnum_extend_before(self):
-        self.assertEquals([(1,3,True)], properties.range_add_revnum([(2,3,True)], 1))
+        self.assertEquals([(1, 3, True)], properties.range_add_revnum([(2, 3, True)], 1))
 
     def test_add_revnum_extend_after(self):
-        self.assertEquals([(1,3,True)], properties.range_add_revnum([(1,2,True)], 3))
+        self.assertEquals([(1, 3, True)], properties.range_add_revnum([(1, 2, True)], 3))
 
     def test_revnum_includes_empty(self):
         self.assertFalse(properties.range_includes_revnum([], 2))
 
     def test_revnum_includes_oor(self):
-        self.assertFalse(properties.range_includes_revnum([(1,3,True), (4,5, True)], 10))
+        self.assertFalse(properties.range_includes_revnum([(1, 3, True), (4, 5, True)], 10))
 
     def test_revnum_includes_in(self):
-        self.assertTrue(properties.range_includes_revnum([(1,3,True), (4,5, True)], 2))
+        self.assertTrue(properties.range_includes_revnum([(1, 3, True), (4, 5, True)], 2))
 
 
 class MergeInfoIncludeTests(TestCase):
     def test_includes_individual(self):
-        self.assertTrue(properties.mergeinfo_includes_revision({"/trunk": [(1,1,True)]}, "/trunk", 1))
+        self.assertTrue(properties.mergeinfo_includes_revision({"/trunk": [(1, 1, True)]}, "/trunk", 1))
 
     def test_includes_range(self):
-        self.assertTrue(properties.mergeinfo_includes_revision({"/trunk": [(1,5,True)]}, "/trunk", 3))
+        self.assertTrue(properties.mergeinfo_includes_revision({"/trunk": [(1, 5, True)]}, "/trunk", 3))
 
     def test_includes_invalid_path(self):
-        self.assertFalse(properties.mergeinfo_includes_revision({"/somepath": [(1,5,True)]}, "/trunk", 3))
+        self.assertFalse(properties.mergeinfo_includes_revision({"/somepath": [(1, 5, True)]}, "/trunk", 3))
 
     def test_includes_invalid_revnum(self):
-        self.assertFalse(properties.mergeinfo_includes_revision({"/trunk": [(1,5,True)]}, "/trunk", 30))
+        self.assertFalse(properties.mergeinfo_includes_revision({"/trunk": [(1, 5, True)]}, "/trunk", 30))

diff --git a/tests/test_versionedfiles.py b/tests/test_versionedfiles.py
index f0e2cebaaeace10541a7efbc5ecc67f5a0191751..a48f16e62fde16fd24953b4739ad9a8d67a4254f 100644 (file)
--- a/tests/test_versionedfiles.py
+++ b/tests/test_versionedfiles.py
@@ -37,12 +37,12 @@ class BasicSvnTextsTests:
                           [])
 
 
-class SvnTextsTests(TestCase,BasicSvnTextsTests):
+class SvnTextsTests(TestCase, BasicSvnTextsTests):
     def setUp(self):
         self.texts = SvnTexts(self)
 
 
-class VirtualRevisionTextsTests(TestCase,BasicSvnTextsTests):
+class VirtualRevisionTextsTests(TestCase, BasicSvnTextsTests):
     def _make_parents_provider(self):
         return self
 
@@ -53,7 +53,7 @@ class VirtualRevisionTextsTests(TestCase,BasicSvnTextsTests):
         raise NotImplementedError
 
 
-class VirtualInventoryTextsTests(TestCase,BasicSvnTextsTests):
+class VirtualInventoryTextsTests(TestCase, BasicSvnTextsTests):
     def _make_parents_provider(self):
         return self
 
@@ -70,7 +70,7 @@ class VirtualInventoryTextsTests(TestCase,BasicSvnTextsTests):
         self.assertEquals({("A",): osutils.sha_strings(["FOO"])}, self.texts.get_sha1s([("A",)]))
 
 
-class VirtualSignatureTextsTests(TestCase,BasicSvnTextsTests):
+class VirtualSignatureTextsTests(TestCase, BasicSvnTextsTests):
     def _make_parents_provider(self):
         return self
 

diff --git a/transport.py b/transport.py
index 943b5f6d1a7f5f2ac8c7c9d5b90c5e7ba9490a4c..0e8a840905a946b3e899504ef00e3d9f0f839093 100644 (file)
--- a/transport.py
+++ b/transport.py
@@ -308,7 +308,7 @@ class SvnRaTransport(Transport):
         else:
             newpaths = [self._request_path(path) for path in paths]
         
-        fetcher = logfetcher(self, paths=newpaths, start=from_revnum, end=to_revnum, limit=limit, discover_changed_paths=discover_changed_paths, strict_node_history=strict_node_history, include_merged_revisions=include_merged_revisions,revprops=revprops)
+        fetcher = logfetcher(self, paths=newpaths, start=from_revnum, end=to_revnum, limit=limit, discover_changed_paths=discover_changed_paths, strict_node_history=strict_node_history, include_merged_revisions=include_merged_revisions, revprops=revprops)
         fetcher.start()
         return iter(fetcher.next, None)
 
@@ -458,7 +458,7 @@ class SvnRaTransport(Transport):
 
     def get_locations(self, path, peg_revnum, revnums):
         conn = self.get_connection()
-        self.mutter('svn get_locations -r%d %s (%r)' % (peg_revnum,path,revnums))
+        self.mutter('svn get_locations -r%d %s (%r)' % (peg_revnum, path, revnums))
         try:
             return conn.get_locations(path, peg_revnum, revnums)
         finally:

diff --git a/versionedfiles.py b/versionedfiles.py
index e16903162be3eac9ede179a56438ec0d02b2317b..4e552a38fa8a2baf0635a68f1b770f453d9225dc 100644 (file)
--- a/versionedfiles.py
+++ b/versionedfiles.py
@@ -44,7 +44,7 @@ class SvnTexts(VersionedFiles):
             map = self.repository.get_fileid_map(revnum, branch, mapping)
             # Unfortunately, the map is the other way around
             lines = None
-            for k,(v,ck) in map.items():
+            for k, (v, ck) in map.items():
                 if v == fileid:
                     try:
                         stream = StringIO()
@@ -58,7 +58,7 @@ class SvnTexts(VersionedFiles):
                     break
             if lines is None:
                 raise Exception("Inconsistent key specified: (%r,%r)" % (fileid, revid))
-            yield FulltextContentFactory((fileid,revid), None, 
+            yield FulltextContentFactory((fileid, revid), None, 
                         sha1=osutils.sha_strings(lines),
                         text=''.join(lines))