[meld] filediff: Minor PEP8
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff: Minor PEP8
- Date: Wed, 31 Dec 2014 23:32:26 +0000 (UTC)
commit 794875ab34605cc5148a79eadeeb6e6c58f738e6
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Oct 12 08:50:56 2014 +1000
filediff: Minor PEP8
meld/filediff.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index cecfbb6..a864e61 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1634,11 +1634,12 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
if not force_overwrite and not bufdata.current_on_disk():
gfile = Gio.File.new_for_path(bufdata.filename)
- primary = _("File %s has changed on disk since it was opened") % \
- gfile.get_parse_name()
+ primary = (
+ _("File %s has changed on disk since it was opened") %
+ gfile.get_parse_name())
secondary = _("If you save it, any external changes will be lost.")
msgarea = self.msgarea_mgr[pane].new_from_text_and_icon(
- Gtk.STOCK_DIALOG_WARNING, primary, secondary)
+ Gtk.STOCK_DIALOG_WARNING, primary, secondary)
msgarea.add_button(_("Save Anyway"), Gtk.ResponseType.ACCEPT)
msgarea.add_button(_("Don't Save"), Gtk.ResponseType.CLOSE)
@@ -1651,7 +1652,6 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
msgarea.show_all()
return
-
start, end = buf.get_bounds()
text = text_type(buf.get_text(start, end, False), 'utf8')
if bufdata.newlines:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]