Fix NameError in pause module (#42038)
* Fix NameError in pause module * Add comment and changelog Co-authored-by: Jerry Chong <jchong@netbase.com>
This commit is contained in:
parent
cde3a03b32
commit
42f44b24c6
2 changed files with 10 additions and 3 deletions
2
changelogs/fragments/pause-try-except-curses.yaml
Normal file
2
changelogs/fragments/pause-try-except-curses.yaml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- pause - nest try except when importing curses to gracefully fail if curses is not present (https://github.com/ansible/ansible/issues/42004)
|
|
@ -39,9 +39,14 @@ except ImportError:
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import curses
|
import curses
|
||||||
curses.setupterm()
|
|
||||||
HAS_CURSES = True
|
# Nest the try except since curses.error is not available if curses did not import
|
||||||
except (ImportError, curses.error):
|
try:
|
||||||
|
curses.setupterm()
|
||||||
|
HAS_CURSES = True
|
||||||
|
except curses.error:
|
||||||
|
HAS_CURSES = False
|
||||||
|
except ImportError:
|
||||||
HAS_CURSES = False
|
HAS_CURSES = False
|
||||||
|
|
||||||
if HAS_CURSES:
|
if HAS_CURSES:
|
||||||
|
|
Loading…
Reference in a new issue