diff --git a/.vscode/launch.json b/.vscode/launch.json index e7ed7a11353..391442467ac 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "program": "${workspaceRoot}/src/azure-cli/azure/cli/__main__.py", "cwd": "${workspaceRoot}", "args": [ - "--help" + "Version" ], "console": "integratedTerminal", "justMyCode": false diff --git a/src/azure-cli-core/azure/cli/core/util.py b/src/azure-cli-core/azure/cli/core/util.py index 05f96a575c3..b3c09db185c 100644 --- a/src/azure-cli-core/azure/cli/core/util.py +++ b/src/azure-cli-core/azure/cli/core/util.py @@ -8,14 +8,12 @@ import binascii import getpass import json -import yaml import logging import os import platform import re import ssl import sys -from urllib.request import urlopen from knack.log import get_logger from knack.util import CLIError, to_snake_case, to_camel_case @@ -534,6 +532,7 @@ def get_file_json(file_path, throw_on_empty=True, preserve_order=False): def get_file_yaml(file_path, throw_on_empty=True): + import yaml content = read_file_content(file_path) if not content: if throw_on_empty: @@ -1168,6 +1167,7 @@ def _ssl_context(): def urlretrieve(url): + from urllib.request import urlopen req = urlopen(url, context=_ssl_context()) return req.read() diff --git a/src/azure-cli/azure/cli/command_modules/util/custom.py b/src/azure-cli/azure/cli/command_modules/util/custom.py index ea2f2ea0bd0..17aa71787e9 100644 --- a/src/azure-cli/azure/cli/command_modules/util/custom.py +++ b/src/azure-cli/azure/cli/command_modules/util/custom.py @@ -35,8 +35,7 @@ def rest_call(cmd, url, method=None, headers=None, uri_parameters=None, def show_version(cmd): # pylint: disable=unused-argument from azure.cli.core.util import get_az_version_json - versions = get_az_version_json() - return versions + return get_az_version_json() def upgrade_version(cmd, update_all=None, yes=None, allow_preview=None): # pylint: disable=too-many-locals, too-many-statements, too-many-branches, no-member, unused-argument