Rev 2492: Cleanup according to PEP8 and some other small whitespace fixes in http://bzr.arbash-meinel.com/branches/bzr/jam-integration
John Arbash Meinel
john at arbash-meinel.com
Thu May 24 13:13:18 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/jam-integration
------------------------------------------------------------
revno: 2492
revision-id: john at arbash-meinel.com-20070524121306-jlb942ezpitxujud
parent: john at arbash-meinel.com-20070524115407-lcnak713swd59lvk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 07:13:06 -0500
message:
Cleanup according to PEP8 and some other small whitespace fixes
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py 2007-05-07 11:51:28 +0000
+++ b/bzrlib/log.py 2007-05-24 12:13:06 +0000
@@ -54,18 +54,18 @@
from itertools import izip
import re
-from bzrlib import(
+from bzrlib import (
registry,
symbol_versioning,
)
import bzrlib.errors as errors
-from bzrlib.symbol_versioning import(
+from bzrlib.symbol_versioning import (
deprecated_method,
zero_eleven,
zero_seventeen,
)
from bzrlib.trace import mutter
-from bzrlib.tsort import(
+from bzrlib.tsort import (
merge_sort,
topo_sort,
)
@@ -167,7 +167,7 @@
lf.end_log()
finally:
branch.unlock()
-
+
def _show_log(branch,
lf,
specific_fileid=None,
@@ -220,7 +220,7 @@
mainline_revs.insert(0, None)
else:
mainline_revs.insert(0, which_revs[start_revision-2][1])
- legacy_lf = not getattr(lf,'log_revision',None)
+ legacy_lf = getattr(lf, 'log_revision', None) is None
if legacy_lf:
# pre-0.17 formatters use show for mainline revisions.
# how should we show merged revisions ?
@@ -290,7 +290,7 @@
continue
if not legacy_lf:
- lr = LogRevision(rev,revno,merge_depth,delta,
+ lr = LogRevision(rev, revno, merge_depth, delta,
rev_tag_dict.get(rev_id))
lf.log_revision(lr)
else:
@@ -430,7 +430,8 @@
logging options and the log formatter capabilities.
"""
- def __init__(self,rev=None,revno=None,merge_depth=0,delta=None,tags=None):
+ def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
+ tags=None):
self.rev = rev
self.revno = revno
self.merge_depth = merge_depth
@@ -489,18 +490,18 @@
@deprecated_method(zero_seventeen)
def show(self, revno, rev, delta, tags=None):
- lr = LogRevision(rev,revno,0,delta,tags)
+ lr = LogRevision(rev, revno, 0, delta, tags)
return self.log_revision(lr)
@deprecated_method(zero_eleven)
def show_merge(self, rev, merge_depth):
- lr = LogRevision(rev,merge_depth=merge_depth)
+ lr = LogRevision(rev, merge_depth=merge_depth)
return self.log_revision(lr)
@deprecated_method(zero_seventeen)
def show_merge_revno(self, rev, merge_depth, revno, tags=None):
"""Show a merged revision rev, with merge_depth and a revno."""
- lr = LogRevision(rev,revno,merge_depth,tags=tags)
+ lr = LogRevision(rev, revno, merge_depth, tags=tags)
return self.log_revision(lr)
def log_revision(self, revision):
@@ -514,10 +515,10 @@
if revision.tags:
print >>to_file, indent+'tags: %s' % (', '.join(revision.tags))
if self.show_ids:
- print >>to_file, indent+'revision-id:', revision.rev.revision_id
+ print >>to_file, indent+'revision-id:', revision.rev.revision_id
for parent_id in revision.rev.parent_ids:
print >>to_file, indent+'parent:', parent_id
- print >>to_file, indent+'committer:', revision.rev.committer
+ print >>to_file, indent+'committer:', revision.rev.committer
try:
print >>to_file, indent+'branch nick: %s' % \
@@ -546,7 +547,7 @@
@deprecated_method(zero_seventeen)
def show(self, revno, rev, delta):
- lr = LogRevision(rev,revno,0,delta)
+ lr = LogRevision(rev, revno, 0, delta)
return self.log_revision(lr)
def log_revision(self, revision):
@@ -608,8 +609,8 @@
print >> self.to_file, self.log_string(revno, rev, terminal_width()-1)
def log_revision(self, revision):
- print >> self.to_file, self.log_string(revision.revno, revision.rev,
- self._max_chars)
+ print >>self.to_file, self.log_string(revision.revno, revision.rev,
+ self._max_chars)
def log_string(self, revno, rev, max_chars):
"""Format log info into one string. Truncate tail of string
=== modified file 'bzrlib/missing.py'
--- a/bzrlib/missing.py 2007-04-29 03:46:30 +0000
+++ b/bzrlib/missing.py 2007-05-24 12:13:06 +0000
@@ -16,14 +16,14 @@
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
-from bzrlib.log import(
+from bzrlib import ui
+from bzrlib.log import (
LogRevision,
)
-from bzrlib.symbol_versioning import(
+from bzrlib.symbol_versioning import (
deprecated_function,
zero_seventeen,
)
-import bzrlib.ui as ui
@deprecated_function(zero_seventeen)
@@ -50,7 +50,7 @@
delta = revision_tree.changes_from(parent_tree)
else:
delta = None
- yield LogRevision(rev,revno,delta=delta)
+ yield LogRevision(rev, revno, delta=delta)
def find_unmerged(local_branch, remote_branch):
=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py 2007-04-29 03:46:30 +0000
+++ b/bzrlib/tests/test_log.py 2007-05-24 12:13:06 +0000
@@ -19,12 +19,12 @@
from bzrlib import log
from bzrlib.tests import BzrTestBase, TestCaseWithTransport
-from bzrlib.log import (show_log,
- get_view_revisions,
+from bzrlib.log import (show_log,
+ get_view_revisions,
LogRevision,
- LogFormatter,
- LongLogFormatter,
- ShortLogFormatter,
+ LogFormatter,
+ LongLogFormatter,
+ ShortLogFormatter,
LineLogFormatter)
from bzrlib.branch import Branch
from bzrlib.errors import InvalidRevisionNumber
@@ -40,7 +40,7 @@
We should also test the LogFormatter.
"""
- supports_delta = True
+ supports_delta = True
def __init__(self):
super(LogCatcher, self).__init__(to_file=None)
=== modified file 'bzrlib/tests/test_missing.py'
--- a/bzrlib/tests/test_missing.py 2007-04-29 03:46:30 +0000
+++ b/bzrlib/tests/test_missing.py 2007-05-24 12:13:06 +0000
@@ -18,7 +18,7 @@
from bzrlib.builtins import merge
-from bzrlib.missing import(
+from bzrlib.missing import (
find_unmerged,
iter_log_revisions,
)
More information about the bazaar-commits
mailing list