Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add/correct missing imports for AnsibleError in v2 lookup plugins #10715

Merged
merged 1 commit into from
Apr 14, 2015
Merged

Add/correct missing imports for AnsibleError in v2 lookup plugins #10715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions v2/ansible/plugins/lookup/cartesian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from itertools import product

from ansible.errors import *
from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase
from ansible.utils.listify import listify_lookup_plugin_terms

Expand All @@ -42,7 +42,7 @@ def run(self, terms, variables=None, **kwargs):

my_list = terms[:]
if len(my_list) == 0:
raise errors.AnsibleError("with_cartesian requires at least one element in each list")
raise AnsibleError("with_cartesian requires at least one element in each list")

return [self._flatten(x) for x in product(*my_list, fillvalue=None)]

3 changes: 2 additions & 1 deletion v2/ansible/plugins/lookup/dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase

class LookupModule(LookupBase):

def run(self, terms, varibles=None, **kwargs):

if not isinstance(terms, dict):
raise errors.AnsibleError("with_dict expects a dict")
raise AnsibleError("with_dict expects a dict")

return self._flatten_hash_to_list(terms)
3 changes: 2 additions & 1 deletion v2/ansible/plugins/lookup/indexed_items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase

class LookupModule(LookupBase):
Expand All @@ -27,7 +28,7 @@ def __init__(self, basedir=None, **kwargs):
def run(self, terms, variables, **kwargs):

if not isinstance(terms, list):
raise errors.AnsibleError("with_indexed_items expects a list")
raise AnsibleError("with_indexed_items expects a list")

items = self._flatten(terms)
return zip(range(len(items)), items)
Expand Down