summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-12-05 00:32:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-12-05 00:32:14 +0000
commit3ba291457374f9781d49262ced66ac7c80b4f9cb (patch)
tree730646238c6f733a03765ef13b4f4b7758f642f4
parentda9246d61d89b7bf65930a24c106081d46e70d8a (diff)
parent880b50fd84584f96bb0f1ff56e3eb5339cf0a047 (diff)
Merge "Remove __future__ references from python scripts" into main am: 880b50fd84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3393440 Change-Id: Ia69d06bf002a7caefb6f396c18014d1b1dfcec8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--scripts/build-apex-bundle.py2
-rwxr-xr-xscripts/check_boot_jars/check_boot_jars.py1
-rwxr-xr-xscripts/construct_context.py2
-rwxr-xr-xscripts/manifest.py1
-rwxr-xr-xscripts/manifest_check.py2
-rwxr-xr-xscripts/manifest_fixer.py2
-rwxr-xr-xscripts/modify_permissions_allowlist.py2
-rwxr-xr-xscripts/modify_permissions_allowlist_test.py2
-rw-r--r--scripts/test_config_fixer.py2
9 files changed, 0 insertions, 16 deletions
diff --git a/scripts/build-apex-bundle.py b/scripts/build-apex-bundle.py
index dcdd9ef7d..277e11261 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 b711f9dcc..174b96e56 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 fc3a89eee..882c2dbf5 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 32603e869..87f4f0cc7 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 1e32d1d7d..175451e74 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 9847ad5bb..ad3b31330 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 38ec7ec86..4a0ca8fe1 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 ee8b12cc8..577388f17 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 2876bcb63..91a83f25c 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