[PATCH v2 03/14] patman: Drop references to __future__

Simon Glass sjg at chromium.org
Sat Apr 18 02:08:54 CEST 2020


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

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

Changes in v2: None

 tools/binman/binman.py         | 2 --
 tools/binman/cbfs_util.py      | 2 --
 tools/binman/cbfs_util_test.py | 2 --
 tools/binman/control.py        | 2 --
 tools/binman/elf.py            | 2 --
 tools/binman/entry.py          | 2 --
 tools/binman/etype/section.py  | 2 --
 tools/binman/ftest.py          | 2 --
 tools/binman/image.py          | 2 --
 tools/buildman/buildman.py     | 2 --
 tools/dtoc/dtoc.py             | 2 --
 tools/dtoc/test_dtoc.py        | 2 --
 tools/dtoc/test_fdt.py         | 2 --
 tools/patman/series.py         | 2 --
 tools/patman/settings.py       | 2 --
 tools/patman/terminal.py       | 2 --
 tools/patman/test_util.py      | 2 --
 tools/patman/tools.py          | 2 --
 tools/patman/tout.py           | 2 --
 tools/rmboard.py               | 2 --
 20 files changed, 40 deletions(-)

diff --git a/tools/binman/binman.py b/tools/binman/binman.py
index 9e6fd72117..ec152e9b3b 100755
--- a/tools/binman/binman.py
+++ b/tools/binman/binman.py
@@ -9,8 +9,6 @@
 
 """See README for more information"""
 
-from __future__ import print_function
-
 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 99d77878c9..34c5116688 100644
--- 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
 """
 
-from __future__ import print_function
-
 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 ddc2e09e35..4aa2494fee 100755
--- 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
 """
 
-from __future__ import print_function
-
 import io
 import os
 import shutil
diff --git a/tools/binman/control.py b/tools/binman/control.py
index 68ad5fc2c0..82bc90d802 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -5,8 +5,6 @@
 # Creates binary images from input files controlled by a description
 #
 
-from __future__ import print_function
-
 from collections import OrderedDict
 import os
 import sys
diff --git a/tools/binman/elf.py b/tools/binman/elf.py
index de1ce73f2a..29fdac1b8f 100644
--- a/tools/binman/elf.py
+++ b/tools/binman/elf.py
@@ -5,8 +5,6 @@
 # Handle various things related to ELF images
 #
 
-from __future__ import print_function
-
 from collections import namedtuple, OrderedDict
 import command
 import io
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index b6f1b2c93f..1244d36c20 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -4,8 +4,6 @@
 # Base class for all entries
 #
 
-from __future__ import print_function
-
 from collections import namedtuple
 import importlib
 import os
diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index 89b7bf67fa..87b3ddce86 100644
--- 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.
 """
 
-from __future__ import print_function
-
 from collections import OrderedDict
 import re
 import sys
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 872b855444..67f976e5d0 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -6,8 +6,6 @@
 #
 #    python -m unittest func_test.TestFunctional.testHelp
 
-from __future__ import print_function
-
 import hashlib
 from optparse import OptionParser
 import os
diff --git a/tools/binman/image.py b/tools/binman/image.py
index 2beab7fd4d..3e961733f9 100644
--- a/tools/binman/image.py
+++ b/tools/binman/image.py
@@ -5,8 +5,6 @@
 # Class for an image, the output of binman
 #
 
-from __future__ import print_function
-
 from collections import OrderedDict
 import fnmatch
 from operator import attrgetter
diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py
index 30a8690f93..0add628a63 100755
--- a/tools/buildman/buildman.py
+++ b/tools/buildman/buildman.py
@@ -6,8 +6,6 @@
 
 """See README for more information"""
 
-from __future__ import print_function
-
 import multiprocessing
 import os
 import re
diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py
index b3596a5918..f7ed62cd67 100755
--- 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.txt
 """
 
-from __future__ import print_function
-
 from optparse import OptionParser
 import os
 import sys
diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py
index d733b70655..9db97489d4 100755
--- 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.
 """
 
-from __future__ import print_function
-
 import collections
 import os
 import struct
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index 3316757e61..4f39a5589f 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -4,8 +4,6 @@
 # Written by Simon Glass <sjg at chromium.org>
 #
 
-from __future__ import print_function
-
 from optparse import OptionParser
 import glob
 import os
diff --git a/tools/patman/series.py b/tools/patman/series.py
index 6d9d48b123..3869696abc 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -2,8 +2,6 @@
 # Copyright (c) 2011 The Chromium OS Authors.
 #
 
-from __future__ import print_function
-
 import itertools
 import os
 
diff --git a/tools/patman/settings.py b/tools/patman/settings.py
index 5dc83a8500..9ac96c485d 100644
--- a/tools/patman/settings.py
+++ b/tools/patman/settings.py
@@ -2,8 +2,6 @@
 # Copyright (c) 2011 The Chromium OS Authors.
 #
 
-from __future__ import print_function
-
 try:
     import configparser as ConfigParser
 except:
diff --git a/tools/patman/terminal.py b/tools/patman/terminal.py
index 5c9e3eea20..c709438bdc 100644
--- a/tools/patman/terminal.py
+++ b/tools/patman/terminal.py
@@ -7,8 +7,6 @@
 This module handles terminal interaction including ANSI color codes.
 """
 
-from __future__ import print_function
-
 import os
 import re
 import shutil
diff --git a/tools/patman/test_util.py b/tools/patman/test_util.py
index 09f258c26b..4338dbcd28 100644
--- a/tools/patman/test_util.py
+++ b/tools/patman/test_util.py
@@ -3,8 +3,6 @@
 # Copyright (c) 2016 Google, Inc
 #
 
-from __future__ import print_function
-
 from contextlib import contextmanager
 import glob
 import os
diff --git a/tools/patman/tools.py b/tools/patman/tools.py
index 3feddb292f..7b21a128f3 100644
--- a/tools/patman/tools.py
+++ b/tools/patman/tools.py
@@ -3,8 +3,6 @@
 # Copyright (c) 2016 Google, Inc
 #
 
-from __future__ import print_function
-
 import command
 import glob
 import os
diff --git a/tools/patman/tout.py b/tools/patman/tout.py
index 2a384851b0..ee3c519c80 100644
--- a/tools/patman/tout.py
+++ b/tools/patman/tout.py
@@ -4,8 +4,6 @@
 # Terminal output logging.
 #
 
-from __future__ import print_function
-
 import sys
 
 import terminal
diff --git a/tools/rmboard.py b/tools/rmboard.py
index 1feface61d..446e5d6ee2 100755
--- a/tools/rmboard.py
+++ b/tools/rmboard.py
@@ -23,8 +23,6 @@ This script works by:
 Search for ## to update the commit message manually.
 """
 
-from __future__ import print_function
-
 import glob
 import os
 import re
-- 
2.26.1.301.g55bc3eb7cb9-goog



More information about the U-Boot mailing list