From a707f5acfed51090583d50f9bb35d7a3aae71b55 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 15 Oct 2014 18:40:03 -0400 Subject: [PATCH] Fix relative imports --- v2/test/errors/test_errors.py | 2 +- v2/test/parsing/test_general.py | 2 +- v2/test/parsing/test_mod_args.py | 4 ++-- v2/test/parsing/yaml/test_yaml.py | 2 +- v2/test/playbook/test_task.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/v2/test/errors/test_errors.py b/v2/test/errors/test_errors.py index ff3b562d25c..f67af449dc6 100644 --- a/v2/test/errors/test_errors.py +++ b/v2/test/errors/test_errors.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from ..compat import unittest +from .. compat import unittest from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject from ansible.errors import AnsibleError diff --git a/v2/test/parsing/test_general.py b/v2/test/parsing/test_general.py index 377aa886935..d003f15d2bd 100644 --- a/v2/test/parsing/test_general.py +++ b/v2/test/parsing/test_general.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from ..compat import unittest +from .. compat import unittest from ansible.parsing import load from ansible.errors import AnsibleParserError diff --git a/v2/test/parsing/test_mod_args.py b/v2/test/parsing/test_mod_args.py index b52b6f9cc3e..4c7d5b5f9e9 100644 --- a/v2/test/parsing/test_mod_args.py +++ b/v2/test/parsing/test_mod_args.py @@ -17,9 +17,9 @@ from ansible.parsing.mod_args import ModuleArgsParser -from .. compat import CompatTestCase +from .. compat import unittest -class TestModArgsDwim(CompatTestCase): +class TestModArgsDwim(unittest.TestCase): # TODO: add tests that construct ModuleArgsParser with a task reference # TODO: verify the AnsibleError raised on failure knows the task diff --git a/v2/test/parsing/yaml/test_yaml.py b/v2/test/parsing/yaml/test_yaml.py index b8d7771c7cb..61859b0d168 100644 --- a/v2/test/parsing/yaml/test_yaml.py +++ b/v2/test/parsing/yaml/test_yaml.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from ..compat import unittest +from ... compat import unittest from yaml.scanner import ScannerError diff --git a/v2/test/playbook/test_task.py b/v2/test/playbook/test_task.py index ec7ce9012e8..286437b4d4f 100644 --- a/v2/test/playbook/test_task.py +++ b/v2/test/playbook/test_task.py @@ -16,7 +16,7 @@ # along with Ansible. If not, see . from ansible.playbook.task import Task -from ..compat import unittest +from .. compat import unittest basic_shell_task = dict( name = 'Test Task',