External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 07:26:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #514 from AlanCoding/no_ordereddit

Browse Source 
[3.2.2] prevent OrderedDict syntax in error message
This commit is contained in:
Alan Rominger
2017-10-10 10:12:37 -04:00
committed by Matthew Jones
parent 2b539cab85 2fb67a3648
commit 6f9fc0c3f8
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/conf/fields.py
View File

@@ -1,6 +1,7 @@
# Python # Python
import logging import logging
import urlparse import urlparse
from collections import OrderedDict
# Django # Django
from django.core.validators import URLValidator from django.core.validators import URLValidator
@@ -98,5 +99,7 @@ class KeyValueField(DictField):
ret = super(KeyValueField, self).to_internal_value(data) ret = super(KeyValueField, self).to_internal_value(data)
for value in data.values(): for value in data.values():
if not isinstance(value, six.string_types + six.integer_types + (float,)): if not isinstance(value, six.string_types + six.integer_types + (float,)):
if isinstance(value, OrderedDict):
value = dict(value)
self.fail('invalid_child', input=value) self.fail('invalid_child', input=value)
return ret return ret