openstack/python-openstackclient
Code Issues Proposed changes

typing: Remove use of optional imports

Browse Source 
Do them inline instead.

Change-Id: Icab1a0452249efc79f214c4d7b369d02291e94b4
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2025-02-19 20:15:44 +00:00
parent 2c0a3ba137
commit 9435ef825a
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openstackclient/image/v1/image.py
View File

@ -30,12 +30,6 @@ from osc_lib import utils
from openstackclient.i18n import _
if os.name == "nt":
import msvcrt
else:
msvcrt = None
CONTAINER_CHOICES = ["ami", "ari", "aki", "bare", "docker", "ova", "ovf"]
DEFAULT_CONTAINER_FORMAT = 'bare'
DEFAULT_DISK_FORMAT = 'raw'
@ -53,7 +47,6 @@ DISK_CHOICES = [
"ploop",
]
LOG = logging.getLogger(__name__)
@ -323,8 +316,10 @@ class CreateImage(command.ShowOne):
else:
# Read file from stdin
if not sys.stdin.isatty():
if msvcrt:
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
if os.name == "nt":
import msvcrt
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) # type: ignore
if hasattr(sys.stdin, 'buffer'):
kwargs['data'] = sys.stdin.buffer
else:
@ -774,8 +769,10 @@ class SetImage(command.Command):
# Read file from stdin
if sys.stdin.isatty() is not True:
if parsed_args.stdin:
if msvcrt:
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
if os.name == "nt":
import msvcrt
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) # type: ignore
if hasattr(sys.stdin, 'buffer'):
kwargs['data'] = sys.stdin.buffer
else:

13
openstackclient/image/v2/image.py
View File

@ -37,12 +37,6 @@ from openstackclient.common import progressbar
from openstackclient.i18n import _
from openstackclient.identity import common as identity_common
if os.name == "nt":
import msvcrt
else:
msvcrt = None
CONTAINER_CHOICES = ["ami", "ari", "aki", "bare", "docker", "ova", "ovf"]
DEFAULT_CONTAINER_FORMAT = 'bare'
DEFAULT_DISK_FORMAT = 'raw'
@ -61,7 +55,6 @@ DISK_CHOICES = [
]
MEMBER_STATUS_CHOICES = ["accepted", "pending", "rejected", "all"]
LOG = logging.getLogger(__name__)
@ -155,8 +148,10 @@ def get_data_from_stdin():
image = sys.stdin
if hasattr(sys.stdin, 'buffer'):
image = sys.stdin.buffer
if msvcrt:
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
if os.name == "nt":
import msvcrt
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) # type: ignore
return image
else: