0001-formdef-allow-empty-description-tags-on-import-17291.patch
tests/test_formdef_import.py | ||
---|---|---|
65 | 65 |
f2 = assert_json_import_export_works(formdef) |
66 | 66 |
assert f2.url_name == formdef.url_name |
67 | 67 | |
68 |
def test_empty_description_tag(): |
|
69 |
formdef = FormDef() |
|
70 |
formdef.name = 'empty' |
|
71 |
assert_xml_import_export_works(formdef) |
|
72 |
export = ET.tostring(export_to_indented_xml(formdef)) |
|
73 |
# add empty description tag |
|
74 |
export = export.replace(b'<name>empty</name>', b'<name>empty</name><description></description>') |
|
75 |
formdef2 = FormDef.import_from_xml_tree(ET.fromstring(export)) |
|
76 |
assert not formdef2.description |
|
77 | ||
68 | 78 |
def test_boolean_attributes(): |
69 | 79 |
formdef = FormDef() |
70 | 80 |
formdef.name = 'Foo' |
wcs/formdef.py | ||
---|---|---|
1059 | 1059 |
formdef.id = tree.attrib.get('id') |
1060 | 1060 |
for text_attribute in list(cls.TEXT_ATTRIBUTES): |
1061 | 1061 |
value = tree.find(text_attribute) |
1062 |
if value is None: |
|
1062 |
if value is None or value.text is None:
|
|
1063 | 1063 |
continue |
1064 | 1064 |
setattr(formdef, text_attribute, force_str(value.text)) |
1065 | 1065 | |
1066 |
- |