Merge "Remove __future__ references from python scripts" into main am: 880b50fd84 am: 3ba2914573
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3393440
Change-Id: Ibf4aa361636a759adcaf3bf3b9bfc64f449cf15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/scripts/build-apex-bundle.py b/scripts/build-apex-bundle.py
index dcdd9ef..277e112 100644
--- a/scripts/build-apex-bundle.py
+++ b/scripts/build-apex-bundle.py
@@ -16,8 +16,6 @@
#
"""A tool to create an APEX bundle out of Soong-built base.zip"""
-from __future__ import print_function
-
import argparse
import sys
import tempfile
diff --git a/scripts/check_boot_jars/check_boot_jars.py b/scripts/check_boot_jars/check_boot_jars.py
index b711f9d..174b96e 100755
--- a/scripts/check_boot_jars/check_boot_jars.py
+++ b/scripts/check_boot_jars/check_boot_jars.py
@@ -4,7 +4,6 @@
Usage: check_boot_jars.py <dexdump_path> <package_allow_list_file> <jar1> \
<jar2> ...
"""
-from __future__ import print_function
import logging
import re
import subprocess
diff --git a/scripts/construct_context.py b/scripts/construct_context.py
index fc3a89e..882c2db 100755
--- a/scripts/construct_context.py
+++ b/scripts/construct_context.py
@@ -16,8 +16,6 @@
#
"""A tool for constructing class loader context."""
-from __future__ import print_function
-
import argparse
import json
import sys
diff --git a/scripts/manifest.py b/scripts/manifest.py
index 32603e8..87f4f0c 100755
--- a/scripts/manifest.py
+++ b/scripts/manifest.py
@@ -16,7 +16,6 @@
#
"""A tool for inserting values from the build system into a manifest or a test config."""
-from __future__ import print_function
from xml.dom import minidom
diff --git a/scripts/manifest_check.py b/scripts/manifest_check.py
index 1e32d1d..175451e 100755
--- a/scripts/manifest_check.py
+++ b/scripts/manifest_check.py
@@ -16,8 +16,6 @@
#
"""A tool for checking that a manifest agrees with the build system."""
-from __future__ import print_function
-
import argparse
import json
import re
diff --git a/scripts/manifest_fixer.py b/scripts/manifest_fixer.py
index 9847ad5..ad3b313 100755
--- a/scripts/manifest_fixer.py
+++ b/scripts/manifest_fixer.py
@@ -16,8 +16,6 @@
#
"""A tool for inserting values from the build system into a manifest."""
-from __future__ import print_function
-
import argparse
import sys
from xml.dom import minidom
diff --git a/scripts/modify_permissions_allowlist.py b/scripts/modify_permissions_allowlist.py
index 38ec7ec..4a0ca8f 100755
--- a/scripts/modify_permissions_allowlist.py
+++ b/scripts/modify_permissions_allowlist.py
@@ -16,8 +16,6 @@
#
"""A tool for modifying privileged permission allowlists."""
-from __future__ import print_function
-
import argparse
import sys
from xml.dom import minidom
diff --git a/scripts/modify_permissions_allowlist_test.py b/scripts/modify_permissions_allowlist_test.py
index ee8b12c..577388f 100755
--- a/scripts/modify_permissions_allowlist_test.py
+++ b/scripts/modify_permissions_allowlist_test.py
@@ -16,8 +16,6 @@
#
"""Unit tests for modify_permissions_allowlist.py."""
-from __future__ import print_function
-
import unittest
from xml.dom import minidom
diff --git a/scripts/test_config_fixer.py b/scripts/test_config_fixer.py
index 2876bcb..91a83f2 100644
--- a/scripts/test_config_fixer.py
+++ b/scripts/test_config_fixer.py
@@ -16,8 +16,6 @@
#
"""A tool for modifying values in a test config."""
-from __future__ import print_function
-
import argparse
import json
import sys