[meld: 58/60] Merge branch 'Python3'

[Kai Willadsen <kaiw src gnome org>]

commit 04db92b69d8892c17bdca4ec95386470ec59cbfe
Merge: 03fa5c7 234f9b0
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Jul 30 07:42:25 2016 +1000

    Merge branch 'Python3'

 bin/meld                |   16 ++++----------
 meld/build_helpers.py   |    2 -
 meld/diffutil.py        |    7 ++++++
 meld/dirdiff.py         |   17 ++++++---------
 meld/filediff.py        |   40 ++++++++++++++++--------------------
 meld/filters.py         |   40 ++++++++++++++++++++++++++++++++----
 meld/meldapp.py         |    6 +---
 meld/meldbuffer.py      |   25 ++++++++++++-----------
 meld/meldwindow.py      |    5 +--
 meld/misc.py            |   37 +++++----------------------------
 meld/newdifftab.py      |    7 +-----
 meld/patchdialog.py     |   11 ++-------
 meld/recent.py          |   19 +++++++----------
 meld/sourceview.py      |    5 +--
 meld/task.py            |    2 -
 meld/tree.py            |   11 +++++----
 meld/ui/historyentry.py |   25 +++++++++++------------
 meld/ui/notebook.py     |   14 +++++++-----
 meld/ui/vcdialogs.py    |    2 -
 meld/util/compat.py     |    6 -----
 meld/vc/_vc.py          |   51 ++++++++++++++++++++++++++++++++++++++++++++--
 meld/vc/bzr.py          |   15 +------------
 meld/vc/git.py          |   46 +++++++++++-------------------------------
 meld/vc/mercurial.py    |   12 +---------
 meld/vc/svn.py          |   20 +++--------------
 meld/vcview.py          |   21 ++++--------------
 setup.py                |    2 +-
 test/test_filediff.py   |    4 +-
 28 files changed, 210 insertions(+), 258 deletions(-)
---