From 50ccb24528eb36529d1432808f3ff385cc4c04aa Mon Sep 17 00:00:00 2001 From: Jiashuo Li Date: Wed, 24 Mar 2021 11:10:34 +0800 Subject: [PATCH] {Misc} Drop `from __future__ import print_function` (#17364) --- doc/sphinx/__main__.py | 2 -- scripts/_common.py | 3 --- scripts/curl_install_pypi/install.py | 1 - scripts/dev_setup.py | 2 -- scripts/dump_command_table.py | 2 -- src/azure-cli-core/azure/cli/core/__init__.py | 2 -- src/azure-cli-core/azure/cli/core/_help.py | 1 - src/azure-cli-core/azure/cli/core/_profile.py | 2 -- src/azure-cli-core/azure/cli/core/commands/__init__.py | 2 -- src/azure-cli-core/azure/cli/core/commands/template_create.py | 1 - src/azure-cli-core/azure/cli/core/file_util.py | 2 -- src/azure-cli-core/azure/cli/core/parser.py | 2 -- src/azure-cli-core/azure/cli/core/tests/test_help.py | 2 -- src/azure-cli-core/azure/cli/core/util.py | 1 - src/azure-cli-core/setup.py | 1 - src/azure-cli/azure/cli/command_modules/acr/check_health.py | 2 -- src/azure-cli/azure/cli/command_modules/acs/custom.py | 1 - src/azure-cli/azure/cli/command_modules/ams/_format.py | 3 --- src/azure-cli/azure/cli/command_modules/appconfig/_utils.py | 2 -- src/azure-cli/azure/cli/command_modules/appservice/custom.py | 1 - .../azure/cli/command_modules/appservice/vsts_cd_provider.py | 1 - src/azure-cli/azure/cli/command_modules/batchai/custom.py | 2 -- .../batchai/tests/latest/test_batchai_scenario.py | 2 -- src/azure-cli/azure/cli/command_modules/configure/custom.py | 1 - src/azure-cli/azure/cli/command_modules/container/_format.py | 1 - .../tests/latest/test_deploymentmanager_scenario.py | 1 - .../cli/command_modules/dla/tests/latest/test_dla_commands.py | 2 -- .../cli/command_modules/dls/tests/latest/test_dls_commands.py | 2 -- src/azure-cli/azure/cli/command_modules/feedback/custom.py | 1 - src/azure-cli/azure/cli/command_modules/find/custom.py | 2 -- src/azure-cli/azure/cli/command_modules/iot/custom.py | 1 - .../keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py | 2 -- .../keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py | 2 -- .../keyvault/tests/latest/test_keyvault_commands.py | 2 -- .../monitor/grammar/autoscale/AutoscaleConditionLexer.py | 1 - .../monitor/grammar/autoscale/AutoscaleConditionParser.py | 1 - .../monitor/grammar/metric_alert/MetricAlertConditionLexer.py | 1 - .../monitor/grammar/metric_alert/MetricAlertConditionParser.py | 1 - src/azure-cli/azure/cli/command_modules/network/custom.py | 2 -- .../cli/command_modules/network/zone_file/make_zone_file.py | 3 --- .../cli/command_modules/network/zone_file/record_processors.py | 2 -- src/azure-cli/azure/cli/command_modules/privatedns/custom.py | 1 - src/azure-cli/azure/cli/command_modules/profile/custom.py | 2 -- src/azure-cli/azure/cli/command_modules/resource/custom.py | 1 - src/azure-cli/azure/cli/command_modules/role/custom.py | 2 -- .../azure/cli/command_modules/storage/operations/azcopy.py | 1 - .../azure/cli/command_modules/storage/operations/blob.py | 2 -- .../cli/command_modules/storage/operations/blob_azure_stack.py | 2 -- src/azure-cli/azure/cli/command_modules/vm/custom.py | 3 --- src/azure-cli/setup.py | 1 - tools/automation/coverage/run_command_coverage.py | 2 -- tools/automation/tests/nose_helper.py | 1 - tools/automation/tests/verify_package_versions.py | 2 -- tools/automation/tests/verify_readme_history.py | 2 -- tools/automation/utilities/display.py | 2 -- tools/automation/verify/default_modules.py | 2 -- tools/automation/verify/doc_source_map.py | 2 -- tools/automation/verify/verify_module_load_times.py | 2 -- 58 files changed, 98 deletions(-) diff --git a/doc/sphinx/__main__.py b/doc/sphinx/__main__.py index 6eabf0afd35..27fdacf5d17 100644 --- a/doc/sphinx/__main__.py +++ b/doc/sphinx/__main__.py @@ -5,8 +5,6 @@ # -------------------------------------------------------------------------------------------- # -*- coding: utf-8 -*- -from __future__ import print_function - import os import sphinx diff --git a/scripts/_common.py b/scripts/_common.py index a5d5db8523d..17960b7a4a7 100644 --- a/scripts/_common.py +++ b/scripts/_common.py @@ -7,9 +7,6 @@ # common utilities for scripts -from __future__ import print_function - - def get_repo_root(): """ Returns the root path to this repository. The root is where .git folder is. diff --git a/scripts/curl_install_pypi/install.py b/scripts/curl_install_pypi/install.py index 29b4b4c5c4b..c921ca75740 100644 --- a/scripts/curl_install_pypi/install.py +++ b/scripts/curl_install_pypi/install.py @@ -14,7 +14,6 @@ #pylint: disable=line-too-long -from __future__ import print_function import os import sys import platform diff --git a/scripts/dev_setup.py b/scripts/dev_setup.py index 03032645ed3..1c6f42b34fa 100755 --- a/scripts/dev_setup.py +++ b/scripts/dev_setup.py @@ -5,8 +5,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import sys import os from subprocess import check_call, CalledProcessError diff --git a/scripts/dump_command_table.py b/scripts/dump_command_table.py index 92c45ecb0c5..a4c70bcea78 100644 --- a/scripts/dump_command_table.py +++ b/scripts/dump_command_table.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import argparse import inspect import json diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py index ec34afbd1de..5b2ba49bdfd 100644 --- a/src/azure-cli-core/azure/cli/core/__init__.py +++ b/src/azure-cli-core/azure/cli/core/__init__.py @@ -4,8 +4,6 @@ # -------------------------------------------------------------------------------------------- # pylint: disable=line-too-long -from __future__ import print_function - __version__ = "2.21.0" import os diff --git a/src/azure-cli-core/azure/cli/core/_help.py b/src/azure-cli-core/azure/cli/core/_help.py index e30c986addf..ddda05d31f9 100644 --- a/src/azure-cli-core/azure/cli/core/_help.py +++ b/src/azure-cli-core/azure/cli/core/_help.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function import argparse from azure.cli.core.commands import ExtensionCommandSource diff --git a/src/azure-cli-core/azure/cli/core/_profile.py b/src/azure-cli-core/azure/cli/core/_profile.py index 3107f1bc54d..ddb80d4e2e9 100644 --- a/src/azure-cli-core/azure/cli/core/_profile.py +++ b/src/azure-cli-core/azure/cli/core/_profile.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import collections import errno import json diff --git a/src/azure-cli-core/azure/cli/core/commands/__init__.py b/src/azure-cli-core/azure/cli/core/commands/__init__.py index 087557cf1c1..6598a22308b 100644 --- a/src/azure-cli-core/azure/cli/core/commands/__init__.py +++ b/src/azure-cli-core/azure/cli/core/commands/__init__.py @@ -5,8 +5,6 @@ # pylint: disable=too-many-lines -from __future__ import print_function - import argparse import datetime import json diff --git a/src/azure-cli-core/azure/cli/core/commands/template_create.py b/src/azure-cli-core/azure/cli/core/commands/template_create.py index 6834b175e00..0cb72e76161 100644 --- a/src/azure-cli-core/azure/cli/core/commands/template_create.py +++ b/src/azure-cli-core/azure/cli/core/commands/template_create.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function import platform from azure.cli.core.commands.arm import resource_exists diff --git a/src/azure-cli-core/azure/cli/core/file_util.py b/src/azure-cli-core/azure/cli/core/file_util.py index 978b1862ee1..adbb18d7706 100644 --- a/src/azure-cli-core/azure/cli/core/file_util.py +++ b/src/azure-cli-core/azure/cli/core/file_util.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - from azure.cli.core._help import CliCommandHelpFile, CliGroupHelpFile from knack.log import get_logger diff --git a/src/azure-cli-core/azure/cli/core/parser.py b/src/azure-cli-core/azure/cli/core/parser.py index fccd9cce814..a0c194ffba2 100644 --- a/src/azure-cli-core/azure/cli/core/parser.py +++ b/src/azure-cli-core/azure/cli/core/parser.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import difflib import argparse diff --git a/src/azure-cli-core/azure/cli/core/tests/test_help.py b/src/azure-cli-core/azure/cli/core/tests/test_help.py index 9f185b46d72..6f6ffe99e25 100644 --- a/src/azure-cli-core/azure/cli/core/tests/test_help.py +++ b/src/azure-cli-core/azure/cli/core/tests/test_help.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import logging import shutil import inspect diff --git a/src/azure-cli-core/azure/cli/core/util.py b/src/azure-cli-core/azure/cli/core/util.py index 50c19b33802..b5fe178872d 100644 --- a/src/azure-cli-core/azure/cli/core/util.py +++ b/src/azure-cli-core/azure/cli/core/util.py @@ -4,7 +4,6 @@ # -------------------------------------------------------------------------------------------- # pylint: disable=too-many-lines -from __future__ import print_function import sys import json import getpass diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index 297b25a3f4b..196252b9e3f 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -5,7 +5,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function from codecs import open from setuptools import setup, find_packages diff --git a/src/azure-cli/azure/cli/command_modules/acr/check_health.py b/src/azure-cli/azure/cli/command_modules/acr/check_health.py index 815b44e0bf6..dea06a33da9 100644 --- a/src/azure-cli/azure/cli/command_modules/acr/check_health.py +++ b/src/azure-cli/azure/cli/command_modules/acr/check_health.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import re from knack.util import CLIError from knack.log import get_logger diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py index c84a9261a68..0977e7d1c1a 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/custom.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function import binascii import datetime import errno diff --git a/src/azure-cli/azure/cli/command_modules/ams/_format.py b/src/azure-cli/azure/cli/command_modules/ams/_format.py index 23d2a831f84..decdd76863a 100644 --- a/src/azure-cli/azure/cli/command_modules/ams/_format.py +++ b/src/azure-cli/azure/cli/command_modules/ams/_format.py @@ -3,8 +3,5 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - - def get_sp_create_output_xml(result): return print('\n'.join([''.format(k, v) for k, v in result.items()])) diff --git a/src/azure-cli/azure/cli/command_modules/appconfig/_utils.py b/src/azure-cli/azure/cli/command_modules/appconfig/_utils.py index 9661ee8fd58..1e6307e0298 100644 --- a/src/azure-cli/azure/cli/command_modules/appconfig/_utils.py +++ b/src/azure-cli/azure/cli/command_modules/appconfig/_utils.py @@ -1,5 +1,3 @@ -from __future__ import print_function - # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/src/azure-cli/azure/cli/command_modules/appservice/custom.py b/src/azure-cli/azure/cli/command_modules/appservice/custom.py index 9f2481e91f1..6f8e1bc2e0f 100644 --- a/src/azure-cli/azure/cli/command_modules/appservice/custom.py +++ b/src/azure-cli/azure/cli/command_modules/appservice/custom.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function import threading import time import ast diff --git a/src/azure-cli/azure/cli/command_modules/appservice/vsts_cd_provider.py b/src/azure-cli/azure/cli/command_modules/appservice/vsts_cd_provider.py index dc844840d6e..a2887de4631 100644 --- a/src/azure-cli/azure/cli/command_modules/appservice/vsts_cd_provider.py +++ b/src/azure-cli/azure/cli/command_modules/appservice/vsts_cd_provider.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function from sys import stderr from vsts_cd_manager.continuous_delivery_manager import ContinuousDeliveryManager from azure.cli.core._profile import Profile diff --git a/src/azure-cli/azure/cli/command_modules/batchai/custom.py b/src/azure-cli/azure/cli/command_modules/batchai/custom.py index c9bb30a87fe..2b8a848dda0 100644 --- a/src/azure-cli/azure/cli/command_modules/batchai/custom.py +++ b/src/azure-cli/azure/cli/command_modules/batchai/custom.py @@ -4,8 +4,6 @@ # -------------------------------------------------------------------------------------------- # pylint: disable=too-many-lines -from __future__ import print_function - import collections import copy import datetime diff --git a/src/azure-cli/azure/cli/command_modules/batchai/tests/latest/test_batchai_scenario.py b/src/azure-cli/azure/cli/command_modules/batchai/tests/latest/test_batchai_scenario.py index e274e380787..d94efcdec78 100644 --- a/src/azure-cli/azure/cli/command_modules/batchai/tests/latest/test_batchai_scenario.py +++ b/src/azure-cli/azure/cli/command_modules/batchai/tests/latest/test_batchai_scenario.py @@ -2,8 +2,6 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import time import uuid from contextlib import contextmanager diff --git a/src/azure-cli/azure/cli/command_modules/configure/custom.py b/src/azure-cli/azure/cli/command_modules/configure/custom.py index dca05d41759..994141ea9ab 100644 --- a/src/azure-cli/azure/cli/command_modules/configure/custom.py +++ b/src/azure-cli/azure/cli/command_modules/configure/custom.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function import json import os diff --git a/src/azure-cli/azure/cli/command_modules/container/_format.py b/src/azure-cli/azure/cli/command_modules/container/_format.py index 92d9612f9e2..575b0ad1d42 100644 --- a/src/azure-cli/azure/cli/command_modules/container/_format.py +++ b/src/azure-cli/azure/cli/command_modules/container/_format.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function from collections import OrderedDict diff --git a/src/azure-cli/azure/cli/command_modules/deploymentmanager/tests/latest/test_deploymentmanager_scenario.py b/src/azure-cli/azure/cli/command_modules/deploymentmanager/tests/latest/test_deploymentmanager_scenario.py index f13a14d5d67..89567662656 100644 --- a/src/azure-cli/azure/cli/command_modules/deploymentmanager/tests/latest/test_deploymentmanager_scenario.py +++ b/src/azure-cli/azure/cli/command_modules/deploymentmanager/tests/latest/test_deploymentmanager_scenario.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function import os import json import os diff --git a/src/azure-cli/azure/cli/command_modules/dla/tests/latest/test_dla_commands.py b/src/azure-cli/azure/cli/command_modules/dla/tests/latest/test_dla_commands.py index 520a1ae6ca1..cc0f090c214 100644 --- a/src/azure-cli/azure/cli/command_modules/dla/tests/latest/test_dla_commands.py +++ b/src/azure-cli/azure/cli/command_modules/dla/tests/latest/test_dla_commands.py @@ -4,8 +4,6 @@ # -------------------------------------------------------------------------------------------- # pylint: disable=line-too-long -from __future__ import print_function - try: import unittest.mock as mock except ImportError: diff --git a/src/azure-cli/azure/cli/command_modules/dls/tests/latest/test_dls_commands.py b/src/azure-cli/azure/cli/command_modules/dls/tests/latest/test_dls_commands.py index 1d66eadb235..6865ed33f19 100644 --- a/src/azure-cli/azure/cli/command_modules/dls/tests/latest/test_dls_commands.py +++ b/src/azure-cli/azure/cli/command_modules/dls/tests/latest/test_dls_commands.py @@ -4,8 +4,6 @@ # -------------------------------------------------------------------------------------------- # pylint: disable=line-too-long -from __future__ import print_function - import datetime import os import time diff --git a/src/azure-cli/azure/cli/command_modules/feedback/custom.py b/src/azure-cli/azure/cli/command_modules/feedback/custom.py index e125ec4c73e..4e004c96486 100644 --- a/src/azure-cli/azure/cli/command_modules/feedback/custom.py +++ b/src/azure-cli/azure/cli/command_modules/feedback/custom.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function import os import re import math diff --git a/src/azure-cli/azure/cli/command_modules/find/custom.py b/src/azure-cli/azure/cli/command_modules/find/custom.py index 7ac29be0085..f59a9202ca4 100644 --- a/src/azure-cli/azure/cli/command_modules/find/custom.py +++ b/src/azure-cli/azure/cli/command_modules/find/custom.py @@ -2,8 +2,6 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - from collections import namedtuple import hashlib import random diff --git a/src/azure-cli/azure/cli/command_modules/iot/custom.py b/src/azure-cli/azure/cli/command_modules/iot/custom.py index e96efe9009e..285e0b3352d 100644 --- a/src/azure-cli/azure/cli/command_modules/iot/custom.py +++ b/src/azure-cli/azure/cli/command_modules/iot/custom.py @@ -4,7 +4,6 @@ # -------------------------------------------------------------------------------------------- # pylint: disable=no-self-use,no-member,line-too-long,too-few-public-methods,too-many-lines,too-many-arguments,too-many-locals -from __future__ import print_function from enum import Enum from knack.log import get_logger from knack.util import CLIError diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py b/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py index 088be577599..b0ee9256a82 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import os import time import unittest diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py b/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py index 718dbd0c9c5..f57eefa507b 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import json import os import time diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py b/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py index 1493aa50b41..669cca066b9 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import json import os import pytest diff --git a/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionLexer.py b/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionLexer.py index ba02e6bda14..916d9ef4305 100644 --- a/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionLexer.py +++ b/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionLexer.py @@ -5,7 +5,6 @@ # Generated from AutoscaleCondition.g4 by ANTLR 4.7.2 # encoding: utf-8 # pylint: disable=all -from __future__ import print_function from antlr4 import * from io import StringIO import sys diff --git a/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionParser.py b/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionParser.py index 5e0baef9ad5..7a56610ec39 100644 --- a/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionParser.py +++ b/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionParser.py @@ -5,7 +5,6 @@ # Generated from AutoscaleCondition.g4 by ANTLR 4.7.2 # encoding: utf-8 # pylint: disable=all -from __future__ import print_function from antlr4 import * from io import StringIO import sys diff --git a/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionLexer.py b/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionLexer.py index d0887bdf16c..8cba977b81e 100644 --- a/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionLexer.py +++ b/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionLexer.py @@ -5,7 +5,6 @@ # Generated from MetricAlertCondition.g4 by ANTLR 4.7.2 # encoding: utf-8 # pylint: disable=all -from __future__ import print_function from antlr4 import * from io import StringIO import sys diff --git a/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionParser.py b/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionParser.py index a6e440032d6..521b75c9558 100644 --- a/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionParser.py +++ b/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionParser.py @@ -5,7 +5,6 @@ # Generated from MetricAlertCondition.g4 by ANTLR 4.7.2 # encoding: utf-8 # pylint: disable=all -from __future__ import print_function from antlr4 import * from io import StringIO import sys diff --git a/src/azure-cli/azure/cli/command_modules/network/custom.py b/src/azure-cli/azure/cli/command_modules/network/custom.py index ee1941654d9..e9b448e09a7 100644 --- a/src/azure-cli/azure/cli/command_modules/network/custom.py +++ b/src/azure-cli/azure/cli/command_modules/network/custom.py @@ -2,8 +2,6 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - from collections import Counter, OrderedDict from msrestazure.azure_exceptions import CloudError diff --git a/src/azure-cli/azure/cli/command_modules/network/zone_file/make_zone_file.py b/src/azure-cli/azure/cli/command_modules/network/zone_file/make_zone_file.py index aac2e9b0829..d3f3594fcfb 100644 --- a/src/azure-cli/azure/cli/command_modules/network/zone_file/make_zone_file.py +++ b/src/azure-cli/azure/cli/command_modules/network/zone_file/make_zone_file.py @@ -24,9 +24,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. # pylint: skip-file -from __future__ import print_function - - def make_zone_file(json_obj): """ Generate the DNS zonefile, given a json-encoded description of the diff --git a/src/azure-cli/azure/cli/command_modules/network/zone_file/record_processors.py b/src/azure-cli/azure/cli/command_modules/network/zone_file/record_processors.py index 04977ef1444..d9896a6b83f 100644 --- a/src/azure-cli/azure/cli/command_modules/network/zone_file/record_processors.py +++ b/src/azure-cli/azure/cli/command_modules/network/zone_file/record_processors.py @@ -25,8 +25,6 @@ # SOFTWARE. # pylint: skip-file -from __future__ import print_function - import copy diff --git a/src/azure-cli/azure/cli/command_modules/privatedns/custom.py b/src/azure-cli/azure/cli/command_modules/privatedns/custom.py index 9339f4ccd65..757ad50b9cf 100644 --- a/src/azure-cli/azure/cli/command_modules/privatedns/custom.py +++ b/src/azure-cli/azure/cli/command_modules/privatedns/custom.py @@ -4,7 +4,6 @@ # -------------------------------------------------------------------------------------------- # pylint: disable=line-too-long -from __future__ import print_function from collections import Counter, OrderedDict from knack.log import get_logger from msrestazure.azure_exceptions import CloudError diff --git a/src/azure-cli/azure/cli/command_modules/profile/custom.py b/src/azure-cli/azure/cli/command_modules/profile/custom.py index 23bd7384ae0..c6ce073d4f9 100644 --- a/src/azure-cli/azure/cli/command_modules/profile/custom.py +++ b/src/azure-cli/azure/cli/command_modules/profile/custom.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - from knack.log import get_logger from knack.prompting import prompt_pass, NoTTYException from knack.util import CLIError diff --git a/src/azure-cli/azure/cli/command_modules/resource/custom.py b/src/azure-cli/azure/cli/command_modules/resource/custom.py index e02f77df008..8cfd914b203 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/custom.py +++ b/src/azure-cli/azure/cli/command_modules/resource/custom.py @@ -6,7 +6,6 @@ # pylint: disable=too-many-lines # pylint: disable=line-too-long -from __future__ import print_function from collections import OrderedDict import codecs import json diff --git a/src/azure-cli/azure/cli/command_modules/role/custom.py b/src/azure-cli/azure/cli/command_modules/role/custom.py index 6d1b9441eb6..910845a25e0 100644 --- a/src/azure-cli/azure/cli/command_modules/role/custom.py +++ b/src/azure-cli/azure/cli/command_modules/role/custom.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import base64 import datetime import json diff --git a/src/azure-cli/azure/cli/command_modules/storage/operations/azcopy.py b/src/azure-cli/azure/cli/command_modules/storage/operations/azcopy.py index 685f1030b69..ce76eead051 100644 --- a/src/azure-cli/azure/cli/command_modules/storage/operations/azcopy.py +++ b/src/azure-cli/azure/cli/command_modules/storage/operations/azcopy.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function from ..azcopy.util import AzCopy, client_auth_for_azcopy, login_auth_for_azcopy, _generate_sas_token diff --git a/src/azure-cli/azure/cli/command_modules/storage/operations/blob.py b/src/azure-cli/azure/cli/command_modules/storage/operations/blob.py index 2de066e4423..36287ae47b6 100644 --- a/src/azure-cli/azure/cli/command_modules/storage/operations/blob.py +++ b/src/azure-cli/azure/cli/command_modules/storage/operations/blob.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import os from datetime import datetime diff --git a/src/azure-cli/azure/cli/command_modules/storage/operations/blob_azure_stack.py b/src/azure-cli/azure/cli/command_modules/storage/operations/blob_azure_stack.py index 6f5da4398e2..4592709b918 100644 --- a/src/azure-cli/azure/cli/command_modules/storage/operations/blob_azure_stack.py +++ b/src/azure-cli/azure/cli/command_modules/storage/operations/blob_azure_stack.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import os from datetime import datetime diff --git a/src/azure-cli/azure/cli/command_modules/vm/custom.py b/src/azure-cli/azure/cli/command_modules/vm/custom.py index 8a67a2d5bf9..1ebd3e7eea9 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/custom.py +++ b/src/azure-cli/azure/cli/command_modules/vm/custom.py @@ -11,9 +11,6 @@ # -------------------------------------------------------------------------- # pylint: disable=no-self-use,too-many-lines -from __future__ import print_function - - import json import os diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 79b4e06f189..6195abf1317 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -5,7 +5,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function from codecs import open from setuptools import setup, find_packages import sys diff --git a/tools/automation/coverage/run_command_coverage.py b/tools/automation/coverage/run_command_coverage.py index 65d9b0c552e..65e4539e42c 100644 --- a/tools/automation/coverage/run_command_coverage.py +++ b/tools/automation/coverage/run_command_coverage.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import collections import json import os diff --git a/tools/automation/tests/nose_helper.py b/tools/automation/tests/nose_helper.py index 432f352b889..d77b5aab855 100644 --- a/tools/automation/tests/nose_helper.py +++ b/tools/automation/tests/nose_helper.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function from ..utilities.path import get_repo_root diff --git a/tools/automation/tests/verify_package_versions.py b/tools/automation/tests/verify_package_versions.py index 9ba0b97d21c..caf9cdd066a 100644 --- a/tools/automation/tests/verify_package_versions.py +++ b/tools/automation/tests/verify_package_versions.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import os import sys import argparse diff --git a/tools/automation/tests/verify_readme_history.py b/tools/automation/tests/verify_readme_history.py index 07f9d9cc4f3..c18ce39d88a 100644 --- a/tools/automation/tests/verify_readme_history.py +++ b/tools/automation/tests/verify_readme_history.py @@ -5,8 +5,6 @@ """Verify the README and HISTORY files for each module so they format correctly on PyPI. """ -from __future__ import print_function - import os import sys import argparse diff --git a/tools/automation/utilities/display.py b/tools/automation/utilities/display.py index c9d6aa66ce4..8cadf878ca9 100644 --- a/tools/automation/utilities/display.py +++ b/tools/automation/utilities/display.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - import sys diff --git a/tools/automation/verify/default_modules.py b/tools/automation/verify/default_modules.py index 541d886f093..23f804bddc3 100644 --- a/tools/automation/verify/default_modules.py +++ b/tools/automation/verify/default_modules.py @@ -5,8 +5,6 @@ """Verify the list of modules that should be included as part of the CLI install. """ -from __future__ import print_function - import os import sys import json diff --git a/tools/automation/verify/doc_source_map.py b/tools/automation/verify/doc_source_map.py index 0053aee1307..f4ab70ee916 100644 --- a/tools/automation/verify/doc_source_map.py +++ b/tools/automation/verify/doc_source_map.py @@ -5,8 +5,6 @@ """Verify the document source map. """ -from __future__ import print_function - import os import sys import json diff --git a/tools/automation/verify/verify_module_load_times.py b/tools/automation/verify/verify_module_load_times.py index 5b4dd062488..6336750c0f3 100644 --- a/tools/automation/verify/verify_module_load_times.py +++ b/tools/automation/verify/verify_module_load_times.py @@ -3,8 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from __future__ import print_function - from collections import OrderedDict import re from subprocess import check_output, STDOUT, CalledProcessError