openstack
/
python-glanceclient
Code Issues Proposed changes

Merge "Check if stdin has isatty attribute" into stable/yoga

This commit is contained in:
Zuul 2022-07-08 13:43:12 +00:00 committed by Gerrit Code Review
parent a6ff8c2313 2ad5f0a6b0
commit 8839d27c30
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glanceclient/common/utils.py
View File

@ -447,7 +447,7 @@ def get_data_file(args):
except OSError:
# (1) stdin is not valid (closed...)
return None
if not sys.stdin.isatty():
if hasattr(sys.stdin, 'isatty') and not sys.stdin.isatty():
# (2) image data is provided through standard input
image = sys.stdin
if hasattr(sys.stdin, 'buffer'):

4
glanceclient/v2/shell.py
View File

@ -94,7 +94,7 @@ def do_image_create(gc, args):
backend = args.store
file_name = fields.pop('file', None)
using_stdin = not sys.stdin.isatty()
using_stdin = hasattr(sys.stdin, 'isatty') and not sys.stdin.isatty()
if args.store and not (file_name or using_stdin):
utils.exit("--store option should only be provided with --file "
"option or stdin.")
@ -205,7 +205,7 @@ def do_image_create_via_import(gc, args):
fields[key] = value
file_name = fields.pop('file', None)
using_stdin = not sys.stdin.isatty()
using_stdin = hasattr(sys.stdin, 'isatty') and not sys.stdin.isatty()
# special processing for backward compatibility with image-create
if args.import_method is None and (file_name or using_stdin):