patman: Drop references to __future__

We don't need these now that the tools using Python 3. Drop them.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/binman/binman.py b/tools/binman/binman.py
index 9e6fd7211754cd192718a566918e6072f7e93106..ec152e9b3bdc92abec52b72cf4b6e3fd90d5bf5d 100755 (executable)
--- a/tools/binman/binman.py
+++ b/tools/binman/binman.py
@@ -9,8 +9,6 @@
 
 """See README for more information"""
 
 
 """See README for more information"""
 

-from __future__ import print_function
-

 from distutils.sysconfig import get_python_lib
 import glob
 import multiprocessing
 from distutils.sysconfig import get_python_lib
 import glob
 import multiprocessing

diff --git a/tools/binman/cbfs_util.py b/tools/binman/cbfs_util.py
index 99d77878c9a648346c5db432634f82f2a4a2d301..34c51166882b5ff3c175a5108e426ee2d59a69ca 100644 (file)
--- a/tools/binman/cbfs_util.py
+++ b/tools/binman/cbfs_util.py
@@ -15,8 +15,6 @@ Currently supported: raw and stage types with compression, padding empty areas
     with empty files, fixed-offset files
 """
 
     with empty files, fixed-offset files
 """
 

-from __future__ import print_function
-

 from collections import OrderedDict
 import io
 import struct
 from collections import OrderedDict
 import io
 import struct

diff --git a/tools/binman/cbfs_util_test.py b/tools/binman/cbfs_util_test.py
index ddc2e09e35870bf7948ac1515bdab8449821a427..4aa2494fee5a731ff6cf44b0db633d095fa60c4d 100755 (executable)
--- a/tools/binman/cbfs_util_test.py
+++ b/tools/binman/cbfs_util_test.py
@@ -9,8 +9,6 @@ These create and read various CBFSs and compare the results with expected
 values and with cbfstool
 """
 
 values and with cbfstool
 """
 

-from __future__ import print_function
-

 import io
 import os
 import shutil
 import io
 import os
 import shutil

diff --git a/tools/binman/control.py b/tools/binman/control.py
index 68ad5fc2c0c4d098ddcf430d77be8b21dbe23668..82bc90d802d1b9de9e3b3a07d70a850083bce5c0 100644 (file)
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -5,8 +5,6 @@
 # Creates binary images from input files controlled by a description
 #
 
 # Creates binary images from input files controlled by a description
 #
 

-from __future__ import print_function
-

 from collections import OrderedDict
 import os
 import sys
 from collections import OrderedDict
 import os
 import sys

diff --git a/tools/binman/elf.py b/tools/binman/elf.py
index de1ce73f2ae9bdd86856bbe10411a103196f186e..29fdac1b8f6d731346b6eb44c49c1d101f4c3c99 100644 (file)
--- a/tools/binman/elf.py
+++ b/tools/binman/elf.py
@@ -5,8 +5,6 @@
 # Handle various things related to ELF images
 #
 
 # Handle various things related to ELF images
 #
 

-from __future__ import print_function
-

 from collections import namedtuple, OrderedDict
 import command
 import io
 from collections import namedtuple, OrderedDict
 import command
 import io

diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index b6f1b2c93fb195381d4d9d6130ab7cb2c72fa4f1..1244d36c20fcfa7be0b1600bd311e65287d2eed5 100644 (file)
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -4,8 +4,6 @@
 # Base class for all entries
 #
 
 # Base class for all entries
 #
 

-from __future__ import print_function
-

 from collections import namedtuple
 import importlib
 import os
 from collections import namedtuple
 import importlib
 import os

diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index 89b7bf67fa6fab589d55500c1dfcf32e3982403b..87b3ddce863e6c0eefc8adef453cf3431e6927d6 100644 (file)
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -8,8 +8,6 @@ Sections are entries which can contain other entries. This allows hierarchical
 images to be created.
 """
 
 images to be created.
 """
 

-from __future__ import print_function
-

 from collections import OrderedDict
 import re
 import sys
 from collections import OrderedDict
 import re
 import sys

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 872b8554440d6a3799a4d0652b1a1e570109addb..67f976e5d0665e34a8aac23d84e554764a7d2973 100644 (file)
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -6,8 +6,6 @@
 #
 #    python -m unittest func_test.TestFunctional.testHelp
 
 #
 #    python -m unittest func_test.TestFunctional.testHelp
 

-from __future__ import print_function
-

 import hashlib
 from optparse import OptionParser
 import os
 import hashlib
 from optparse import OptionParser
 import os

diff --git a/tools/binman/image.py b/tools/binman/image.py
index 2beab7fd4d2d50ebdf9b2627005a1944cea78631..3e961733f9ec211b6ab86fa1dc6d2d5f06e79668 100644 (file)
--- a/tools/binman/image.py
+++ b/tools/binman/image.py
@@ -5,8 +5,6 @@
 # Class for an image, the output of binman
 #
 
 # Class for an image, the output of binman
 #
 

-from __future__ import print_function
-

 from collections import OrderedDict
 import fnmatch
 from operator import attrgetter
 from collections import OrderedDict
 import fnmatch
 from operator import attrgetter

diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py
index 30a8690f9352ce9620f05dc386768ec1bc11fe48..0add628a636f2d34e6fe6df2afd0d7496ee1ebe2 100755 (executable)
--- a/tools/buildman/buildman.py
+++ b/tools/buildman/buildman.py
@@ -6,8 +6,6 @@
 
 """See README for more information"""
 
 
 """See README for more information"""
 

-from __future__ import print_function
-

 import multiprocessing
 import os
 import re
 import multiprocessing
 import os
 import re

diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py
index f31cba900e56aa92bfd8ad171bfd29c24c3ad284..8e05b434318ac46597dc8add71dd20e662da13c2 100755 (executable)
--- a/tools/dtoc/dtoc.py
+++ b/tools/dtoc/dtoc.py
@@ -25,8 +25,6 @@ options. For more information about the use of this options and tool please
 see doc/driver-model/of-plat.rst
 """
 
 see doc/driver-model/of-plat.rst
 """
 

-from __future__ import print_function
-

 from optparse import OptionParser
 import os
 import sys
 from optparse import OptionParser
 import os
 import sys

diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py
index d733b70655865584dad970b556dd88ecf484b40a..9db97489d4c5edb0c4e83169d76bd7bf04e72079 100755 (executable)
--- a/tools/dtoc/test_dtoc.py
+++ b/tools/dtoc/test_dtoc.py
@@ -9,8 +9,6 @@ This includes unit tests for some functions and functional tests for the dtoc
 tool.
 """
 
 tool.
 """
 

-from __future__ import print_function
-

 import collections
 import os
 import struct
 import collections
 import os
 import struct

diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index 3316757e61e3ede85355587edc4dd9c290c10838..4f39a5589f5865ebd35e767ad0b3444e5462666b 100755 (executable)
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -4,8 +4,6 @@
 # Written by Simon Glass <sjg@chromium.org>
 #
 
 # Written by Simon Glass <sjg@chromium.org>
 #
 

-from __future__ import print_function
-

 from optparse import OptionParser
 import glob
 import os
 from optparse import OptionParser
 import glob
 import os

diff --git a/tools/patman/series.py b/tools/patman/series.py
index 6d9d48b1233a467ef2b52339fedf49fc50c99fd2..3869696abc13dd4b50f0c3ed9c9732fbdf97dfc3 100644 (file)
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -2,8 +2,6 @@
 # Copyright (c) 2011 The Chromium OS Authors.
 #
 
 # Copyright (c) 2011 The Chromium OS Authors.
 #
 

-from __future__ import print_function
-

 import itertools
 import os
 
 import itertools
 import os
 

diff --git a/tools/patman/settings.py b/tools/patman/settings.py
index 5dc83a850023c779d6ce76ce96aaea9df3056646..9ac96c485db4d967851ab0c680232b8f49aeb76d 100644 (file)
--- a/tools/patman/settings.py
+++ b/tools/patman/settings.py
@@ -2,8 +2,6 @@
 # Copyright (c) 2011 The Chromium OS Authors.
 #
 
 # Copyright (c) 2011 The Chromium OS Authors.
 #
 

-from __future__ import print_function
-

 try:
     import configparser as ConfigParser
 except:
 try:
     import configparser as ConfigParser
 except:

diff --git a/tools/patman/terminal.py b/tools/patman/terminal.py
index 5c9e3eea20cf967a4f92477ac46789985b97ddbd..c709438bdc4f737b8509e6e69f6565381785994e 100644 (file)
--- a/tools/patman/terminal.py
+++ b/tools/patman/terminal.py
@@ -7,8 +7,6 @@
 This module handles terminal interaction including ANSI color codes.
 """
 
 This module handles terminal interaction including ANSI color codes.
 """
 

-from __future__ import print_function
-

 import os
 import re
 import shutil
 import os
 import re
 import shutil

diff --git a/tools/patman/test_util.py b/tools/patman/test_util.py
index 09f258c26b4736b5784b05583347257074b42024..4338dbcd282952cc0b275ebcf56bb2e58a090afc 100644 (file)
--- a/tools/patman/test_util.py
+++ b/tools/patman/test_util.py
@@ -3,8 +3,6 @@
 # Copyright (c) 2016 Google, Inc
 #
 
 # Copyright (c) 2016 Google, Inc
 #
 

-from __future__ import print_function
-

 from contextlib import contextmanager
 import glob
 import os
 from contextlib import contextmanager
 import glob
 import os

diff --git a/tools/patman/tools.py b/tools/patman/tools.py
index 3feddb292fc70a5a250ab3de30cb01eb17a77403..7b21a128f3b17153d5536df2fdc3539e226602ec 100644 (file)
--- a/tools/patman/tools.py
+++ b/tools/patman/tools.py
@@ -3,8 +3,6 @@
 # Copyright (c) 2016 Google, Inc
 #
 
 # Copyright (c) 2016 Google, Inc
 #
 

-from __future__ import print_function
-

 import command
 import glob
 import os
 import command
 import glob
 import os

diff --git a/tools/patman/tout.py b/tools/patman/tout.py
index 2a384851b0d186fe1ecd7ddd273e201dd94495bf..ee3c519c80baf041adc3178408edf08f661648c3 100644 (file)
--- a/tools/patman/tout.py
+++ b/tools/patman/tout.py
@@ -4,8 +4,6 @@
 # Terminal output logging.
 #
 
 # Terminal output logging.
 #
 

-from __future__ import print_function
-

 import sys
 
 import terminal
 import sys
 
 import terminal

diff --git a/tools/rmboard.py b/tools/rmboard.py
index 1feface61d72daeba100086726830efe196660a5..446e5d6ee2291e37c7203692e8c3ecf050073dc9 100755 (executable)
--- a/tools/rmboard.py
+++ b/tools/rmboard.py
@@ -23,8 +23,6 @@ This script works by:
 Search for ## to update the commit message manually.
 """
 
 Search for ## to update the commit message manually.
 """
 

-from __future__ import print_function
-

 import glob
 import os
 import re
 import glob
 import os
 import re