From ed7f7582888a59e6b2fc47c9fd0ee583adef60d4 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 23 Jan 2026 01:27:45 +0900 Subject: [PATCH] Drop unnecessary __future__ import print_function is now the default in Python 3. Also drop legacy fallback of urllib for Python 2-3 compatibility. Change-Id: I98fe467cf95530ba45682404a0a7a8a2a1a0c50c Signed-off-by: Takashi Kajinami --- diskimage_builder/element_dependencies.py | 1 - .../elements/pypi/pre-install.d/04-configure-pypi-mirror | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/diskimage_builder/element_dependencies.py b/diskimage_builder/element_dependencies.py index 522d16fd7..023c056b5 100644 --- a/diskimage_builder/element_dependencies.py +++ b/diskimage_builder/element_dependencies.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import print_function import argparse import collections import errno diff --git a/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror b/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror index 5d5bf08cb..0e1e10802 100755 --- a/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror +++ b/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror @@ -12,14 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import print_function - import os.path -try: - from urllib.parse import urlparse -except ImportError: - from urlparse import urlparse +from urllib.parse import urlparse def main():