[meld] dirdiff: More PEP8 line lengths
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] dirdiff: More PEP8 line lengths
- Date: Sun, 31 Dec 2017 20:14:25 +0000 (UTC)
commit c8872167c6740d2310e1aab1a432d4068ce62574
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Dec 17 07:46:03 2017 +1000
dirdiff: More PEP8 line lengths
meld/dirdiff.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index dad70c50..9e3b43e6 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -126,10 +126,10 @@ def _files_same(files, regexes, comparison_args):
# Compare files superficially if the options tells us to
if shallow_comparison:
- if all(s.shallow_equal(stats[0], time_resolution_ns) for s in stats[1:]):
- return DodgySame
- else:
- return Different
+ all_same_timestamp = all(
+ s.shallow_equal(stats[0], time_resolution_ns) for s in stats[1:]
+ )
+ return DodgySame if all_same_timestamp else Different
# If there are no text filters, unequal sizes imply a difference
if not need_contents and not all_same([s.size for s in stats]):
@@ -675,7 +675,8 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
sel.unselect_all()
yield _("[%s] Scanning %s") % (self.label_text, "")
- prefixlen = 1 + len(self.model.value_path(self.model.get_iter(rootpath), 0))
+ prefixlen = 1 + len(
+ self.model.value_path(self.model.get_iter(rootpath), 0))
symlinks_followed = set()
# TODO: This is horrible.
if isinstance(rootpath, tuple):
@@ -698,7 +699,8 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
if not any(os.path.isdir(root) for root in roots):
continue
- yield _("[%s] Scanning %s") % (self.label_text, roots[0][prefixlen:])
+ yield _("[%s] Scanning %s") % (
+ self.label_text, roots[0][prefixlen:])
differences = False
encoding_errors = []
@@ -1136,7 +1138,8 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
self._update_diffmaps()
def on_popup_deactivate_event(self, popup):
- for (treeview, inid, outid) in zip(self.treeview, self.focus_in_events, self.focus_out_events):
+ for (treeview, inid, outid) in zip(
+ self.treeview, self.focus_in_events, self.focus_out_events):
treeview.handler_unblock(inid)
treeview.handler_unblock(outid)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]