Projet

Général

Profil

0001-formdef-allow-empty-description-tags-on-import-17291.patch

Frédéric Péters, 30 juin 2017 15:40

Télécharger (1,72 ko)

Voir les différences: 

Subject: [PATCH] formdef: allow empty <description/> tags on import (#17291)


 tests/test_formdef_import.py | 11 +++++++++++
 wcs/formdef.py               |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
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('<name>empty</name>', '<name>empty</name><description></description>')

  		




  
  75
  
    

  		




  
  76
  
    
    formdef2 = FormDef.import_from_xml_tree(ET.fromstring(export))

  		




  
  77
  
    
    assert not formdef2.description

  		




  
  78
  
    

  		




  68
  79
  
    
def test_boolean_attributes():

  		




  69
  80
  
    
    formdef = FormDef()

  		




  70
  81
  
    
    formdef.name = 'Foo'

  		












  

    
      wcs/formdef.py
    
  





  894
  894
  
    
            formdef.id = tree.attrib.get('id')

  		




  895
  895
  
    
        for text_attribute in list(cls.TEXT_ATTRIBUTES):

  		




  896
  896
  
    
            value = tree.find(text_attribute)

  		




  897
  
  
    
            if value is None:

  		




  
  897
  
    
            if value is None or value.text is None:

  		




  898
  898
  
    
                continue

  		




  899
  899
  
    
            setattr(formdef, text_attribute, value.text.encode(charset))

  		




  900
  900
  
    

  		




  901
  
  
    
-