Dropped support for unmaintained Python versions

4 files changed, 3 insertions, 15 deletions

diff --git a/src/wheel/cli/__init__.py b/src/wheel/cli/__init__.py
index 95740bf..d41dcfd 100644
--- a/src/wheel/cli/__init__.py
+++ b/src/wheel/cli/__init__.py
@@ -2,8 +2,6 @@
 Wheel command-line utility.
 """
 
-from __future__ import print_function
-
 import argparse
 import os
 import sys
diff --git a/src/wheel/cli/convert.py b/src/wheel/cli/convert.py
index 154f1b1..b502daf 100755
--- a/src/wheel/cli/convert.py
+++ b/src/wheel/cli/convert.py
@@ -1,7 +1,6 @@
 import os.path
 import re
 import shutil
-import sys
 import tempfile
 import zipfile
 from distutils import dist
@@ -261,8 +260,7 @@ def convert(files, dest_dir, verbose):
                 conv = wininst2wheel
 
             if verbose:
-                print("{}... ".format(installer))
-                sys.stdout.flush()
+                print("{}... ".format(installer), flush=True)
 
             conv(installer, dest_dir)
             if verbose:
diff --git a/src/wheel/cli/pack.py b/src/wheel/cli/pack.py
index 9403c51..04d858d 100644
--- a/src/wheel/cli/pack.py
+++ b/src/wheel/cli/pack.py
@@ -1,8 +1,5 @@
-from __future__ import print_function
-
 import os.path
 import re
-import sys
 
 from wheel.cli import WheelError
 from wheel.wheelfile import WheelFile
@@ -75,8 +72,7 @@ def pack(directory, dest_dir, build_number):
     # Repack the wheel
     wheel_path = os.path.join(dest_dir, '{}-{}.whl'.format(name_version, tagline))
     with WheelFile(wheel_path, 'w') as wf:
-        print("Repacking wheel as {}...".format(wheel_path), end='')
-        sys.stdout.flush()
+        print("Repacking wheel as {}...".format(wheel_path), end='', flush=True)
         wf.write_files(directory)
 
     print('OK')
diff --git a/src/wheel/cli/unpack.py b/src/wheel/cli/unpack.py
index 2e9857a..8aa8180 100644
--- a/src/wheel/cli/unpack.py
+++ b/src/wheel/cli/unpack.py
@@ -1,7 +1,4 @@
-from __future__ import print_function
-
 import os.path
-import sys
 
 from ..wheelfile import WheelFile
 
@@ -18,8 +15,7 @@ def unpack(path, dest='.'):
     with WheelFile(path) as wf:
         namever = wf.parsed_filename.group('namever')
         destination = os.path.join(dest, namever)
-        print("Unpacking to: {}...".format(destination), end='')
-        sys.stdout.flush()
+        print("Unpacking to: {}...".format(destination), end='', flush=True)
         wf.extractall(destination)
 
     print('OK')