[meld: 5/5] Merge branch 'cleaning' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit e805490397fa8754f3be4413f01c78f6038b7fed
Merge: 76693d38 1c74c99a
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Jun 7 22:43:24 2018 +0000

    Merge branch 'cleaning' into 'master'
    
    Cleaning of old Python 2 stuff
    
    See merge request GNOME/meld!10

 bin/meld                      |  2 +-
 meld/dirdiff.py               | 14 ++++++--------
 meld/filediff.py              | 20 ++++++++++----------
 meld/filters.py               |  2 +-
 meld/gutterrendererchunk.py   |  6 +++---
 meld/matchers/helpers.py      |  4 ++--
 meld/meldbuffer.py            |  8 ++++----
 meld/meldwindow.py            |  2 +-
 meld/misc.py                  |  2 +-
 meld/recent.py                |  2 +-
 meld/sourceview.py            |  6 +++---
 meld/task.py                  |  2 +-
 meld/ui/emblemcellrenderer.py |  2 +-
 meld/ui/gnomeglade.py         |  2 +-
 meld/ui/historyentry.py       |  2 +-
 meld/ui/listselector.py       |  2 +-
 meld/ui/msgarea.py            |  2 +-
 meld/undo.py                  |  2 +-
 meld/vc/__init__.py           |  1 -
 meld/vc/_null.py              |  1 -
 meld/vc/_vc.py                |  5 ++---
 meld/vc/bzr.py                |  3 +--
 meld/vc/darcs.py              |  1 -
 meld/vc/git.py                |  1 -
 meld/vc/mercurial.py          |  1 -
 meld/vc/svn.py                |  1 -
 meld/vcview.py                | 22 ++++++++++------------
 27 files changed, 53 insertions(+), 65 deletions(-)
---