Commit 1b74102a by Brian Coca

Merge pull request #11435 from hfinucane/ipwrap-generator

Treat generators like lists and tuples
parents 71f72b65 2d1cb7f3
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
from functools import partial from functools import partial
import types
try: try:
import netaddr import netaddr
...@@ -319,7 +320,7 @@ def ipaddr(value, query = '', version = False, alias = 'ipaddr'): ...@@ -319,7 +320,7 @@ def ipaddr(value, query = '', version = False, alias = 'ipaddr'):
return False return False
# Check if value is a list and parse each element # Check if value is a list and parse each element
elif isinstance(value, (list, tuple)): elif isinstance(value, (list, tuple, types.GeneratorType)):
_ret = [] _ret = []
for element in value: for element in value:
...@@ -457,7 +458,7 @@ def ipaddr(value, query = '', version = False, alias = 'ipaddr'): ...@@ -457,7 +458,7 @@ def ipaddr(value, query = '', version = False, alias = 'ipaddr'):
def ipwrap(value, query = ''): def ipwrap(value, query = ''):
try: try:
if isinstance(value, (list, tuple)): if isinstance(value, (list, tuple, types.GeneratorType)):
_ret = [] _ret = []
for element in value: for element in value:
if ipaddr(element, query, version = False, alias = 'ipwrap'): if ipaddr(element, query, version = False, alias = 'ipwrap'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment