diff --git a/lib/ansible/errors/__init__.py b/lib/ansible/errors/__init__.py index d8f6a61c97..a2411b7bef 100644 --- a/lib/ansible/errors/__init__.py +++ b/lib/ansible/errors/__init__.py @@ -19,7 +19,13 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from ansible.errors.yaml_strings import * +from ansible.errors.yaml_strings import ( YAML_POSITION_DETAILS, + YAML_COMMON_UNQUOTED_VARIABLE_ERROR, + YAML_COMMON_DICT_ERROR, + YAML_COMMON_UNQUOTED_COLON_ERROR, + YAML_COMMON_PARTIALLY_QUOTED_LINE_ERROR, + YAML_COMMON_UNBALANCED_QUOTES_ERROR ) + from ansible.utils.unicode import to_unicode, to_str diff --git a/lib/ansible/executor/process/worker.py b/lib/ansible/executor/process/worker.py index 390efd30d9..da62438f28 100644 --- a/lib/ansible/executor/process/worker.py +++ b/lib/ansible/executor/process/worker.py @@ -70,7 +70,7 @@ class WorkerProcess(multiprocessing.Process): if fileno is not None: try: self._new_stdin = os.fdopen(os.dup(fileno)) - except OSError as e: + except OSError: # couldn't dupe stdin, most likely because it's # not a valid file descriptor, so we just rely on # using the one that was passed in