mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-07 22:02:50 +00:00
Move the arguments module into cli/ and context_objects into utils
* Note: Python2 is not as intelligent at detecting false import loops as Python3. context_objects.py cannot be added to cli/arguments because it would set up an import loop between cli/__init__.py, cli/arguments/context_objects.py, and context.py on Python2. ci_complete
This commit is contained in:
@@ -8,7 +8,7 @@ __metaclass__ = type
|
||||
|
||||
import pytest
|
||||
|
||||
from ansible.arguments import optparse_helpers as opt_help
|
||||
from ansible.cli.arguments import optparse_helpers as opt_help
|
||||
|
||||
|
||||
class TestOptparseHelpersVersion:
|
||||
@@ -27,13 +27,13 @@ import tempfile
|
||||
import yaml
|
||||
|
||||
from ansible import context
|
||||
from ansible.arguments import context_objects as co
|
||||
from ansible.arguments import optparse_helpers as opt_help
|
||||
from ansible.cli.arguments import optparse_helpers as opt_help
|
||||
from ansible.cli.galaxy import GalaxyCLI
|
||||
from units.compat import unittest
|
||||
from units.compat.mock import call, patch
|
||||
from ansible.errors import AnsibleError, AnsibleOptionsError
|
||||
from ansible.module_utils.six import PY3
|
||||
from ansible.utils import context_objects as co
|
||||
from units.compat import unittest
|
||||
from units.compat.mock import call, patch
|
||||
|
||||
|
||||
class TestGalaxy(unittest.TestCase):
|
||||
|
||||
@@ -22,10 +22,10 @@ __metaclass__ = type
|
||||
from units.compat import unittest
|
||||
from units.compat.mock import MagicMock
|
||||
|
||||
from ansible.arguments import context_objects as co
|
||||
from ansible.executor.playbook_executor import PlaybookExecutor
|
||||
from ansible.playbook import Playbook
|
||||
from ansible.template import Templar
|
||||
from ansible.utils import context_objects as co
|
||||
|
||||
from units.mock.loader import DictDataLoader
|
||||
|
||||
|
||||
@@ -22,10 +22,10 @@ from units.compat import unittest
|
||||
from units.compat.mock import MagicMock
|
||||
|
||||
from ansible import context
|
||||
from ansible.arguments import context_objects as co
|
||||
from ansible.executor.task_queue_manager import TaskQueueManager
|
||||
from ansible.playbook import Playbook
|
||||
from ansible.plugins.callback import CallbackBase
|
||||
from ansible.utils import context_objects as co
|
||||
|
||||
__metaclass__ = type
|
||||
|
||||
|
||||
@@ -13,12 +13,12 @@ import pytest
|
||||
|
||||
from ansible import constants as C
|
||||
from ansible import context
|
||||
from ansible.arguments import context_objects as co
|
||||
from ansible.arguments import optparse_helpers as opt_help
|
||||
from units.compat import unittest
|
||||
from ansible.cli.arguments import optparse_helpers as opt_help
|
||||
from ansible.errors import AnsibleError, AnsibleParserError
|
||||
from ansible.module_utils.six.moves import shlex_quote
|
||||
from ansible.playbook.play_context import PlayContext
|
||||
from ansible.utils import context_objects as co
|
||||
from units.compat import unittest
|
||||
|
||||
from units.mock.loader import DictDataLoader
|
||||
|
||||
|
||||
@@ -15,8 +15,8 @@ import optparse
|
||||
|
||||
import pytest
|
||||
|
||||
from ansible.arguments import context_objects as co
|
||||
from ansible.module_utils.common.collections import ImmutableDict
|
||||
from ansible.utils import context_objects as co
|
||||
|
||||
|
||||
MAKE_IMMUTABLE_DATA = ((u'くらとみ', u'くらとみ'),
|
||||
Reference in New Issue
Block a user