[meld/Python3: 12/54] The future is now.

[Kai Willadsen <kaiw src gnome org>]

commit e05bdb13a4007fbea875990a34a55e62d8b18dfe
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Mar 8 09:51:23 2014 +1000

    The future is now.

 bin/meld              |    2 --
 meld/build_helpers.py |    2 --
 meld/filediff.py      |    2 --
 meld/meldapp.py       |    2 --
 meld/task.py          |    2 --
 meld/ui/vcdialogs.py  |    2 --
 meld/vcview.py        |    2 --
 setup.py              |    2 +-
 8 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 232a324..f982782 100755
--- a/bin/meld
+++ b/bin/meld
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-
 import locale
 import logging
 import os
diff --git a/meld/build_helpers.py b/meld/build_helpers.py
index 3442cbf..803b64c 100644
--- a/meld/build_helpers.py
+++ b/meld/build_helpers.py
@@ -18,8 +18,6 @@
 # Modified by Kai Willadsen for the Meld project
 # Copyright (C) 2013-2014 Kai Willadsen <kai willadsen gmail com>
 
-from __future__ import print_function
-
 import distutils.cmd
 import distutils.command.build
 import distutils.command.build_py
diff --git a/meld/filediff.py b/meld/filediff.py
index d9a1dfd..cf516b0 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1,5 +1,3 @@
-# coding=UTF-8
-
 # Copyright (C) 2002-2006 Stephen Kennedy <stevek gnome org>
 # Copyright (C) 2009-2015 Kai Willadsen <kai willadsen gmail com>
 #
diff --git a/meld/meldapp.py b/meld/meldapp.py
index cc1dcf0..4818358 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-
 import io
 import logging
 import optparse
diff --git a/meld/task.py b/meld/task.py
index 84c33ad..23ce937 100644
--- a/meld/task.py
+++ b/meld/task.py
@@ -16,8 +16,6 @@
 
 """Classes to implement scheduling for cooperative threads."""
 
-from __future__ import print_function
-
 import traceback
 
 
diff --git a/meld/ui/vcdialogs.py b/meld/ui/vcdialogs.py
index e5f0342..a355d66 100644
--- a/meld/ui/vcdialogs.py
+++ b/meld/ui/vcdialogs.py
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-
 import os
 import textwrap
 
diff --git a/meld/vcview.py b/meld/vcview.py
index e4422a7..497dc2d 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-
 import atexit
 import functools
 import logging
diff --git a/setup.py b/setup.py
index d363332..6055d76 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 from distutils.core import setup
 import glob