Projet

Général

Profil

0001-general-don-t-mention-encoding-of-XML-export-default.patch

Frédéric Péters, 11 novembre 2019 20:47

Télécharger (3,31 ko)

Voir les différences: 

Subject: [PATCH] general: don't mention encoding of XML export (= default as
 utf-8) (#37574)


 wcs/admin/forms.py     | 2 +-
 wcs/admin/settings.py  | 6 +++---
 wcs/admin/workflows.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
wcs/admin/forms.py
1174 1174 
        response.set_content_type('application/x-wcs-form')
1175 1175 
        response.set_header('content-disposition',
1176 1176 
                'attachment; filename=%s-%s.wcs' % (self.formdef_export_prefix, self.formdef.url_name))
1177 
        return '<?xml version="1.0" encoding="iso-8859-15"?>\n' + ET.tostring(x)
1177 
        return '<?xml version="1.0"?>\n' + ET.tostring(x)
1178 1178 

  		




  1179
  1179
  
    
    def archive(self):

  		




  1180
  1180
  
    
        if get_publisher().is_using_postgresql():

  		












  

    
      wcs/admin/settings.py
    
  





  900
  900
  
    
                        node = formdef.export_to_xml(include_id=True)

  		




  901
  901
  
    
                        misc.indent_xml(node)

  		




  902
  902
  
    
                        z.writestr(os.path.join('formdefs_xml', str(formdef.id)),

  		




  903
  
  
    
                                '<?xml version="1.0" encoding="iso-8859-15"?>\n' + ET.tostring(node))

  		




  
  903
  
    
                                '<?xml version="1.0"?>\n' + ET.tostring(node))

  		




  904
  904
  
    
                if 'carddefs' in self.dirs:

  		




  905
  905
  
    
                    for formdef in CardDef.select():

  		




  906
  906
  
    
                        node = formdef.export_to_xml(include_id=True)

  		




  907
  907
  
    
                        misc.indent_xml(node)

  		




  908
  908
  
    
                        z.writestr(os.path.join('carddefs_xml', str(formdef.id)),

  		




  909
  
  
    
                                '<?xml version="1.0" encoding="iso-8859-15"?>\n' + ET.tostring(node))

  		




  
  909
  
    
                                '<?xml version="1.0"?>\n' + ET.tostring(node))

  		




  910
  910
  
    
                if 'workflows' in self.dirs:

  		




  911
  911
  
    
                    for workflow in Workflow.select():

  		




  912
  912
  
    
                        node = workflow.export_to_xml(include_id=True)

  		




  913
  913
  
    
                        misc.indent_xml(node)

  		




  914
  914
  
    
                        z.writestr(os.path.join('workflows_xml', str(workflow.id)),

  		




  915
  
  
    
                                '<?xml version="1.0" encoding="iso-8859-15"?>\n' + ET.tostring(node))

  		




  
  915
  
    
                                '<?xml version="1.0"?>\n' + ET.tostring(node))

  		




  916
  916
  
    

  		




  917
  917
  
    
                if self.settings:

  		




  918
  918
  
    
                    z.write(os.path.join(self.app_dir, 'config.pck'), 'config.pck')

  		












  

    
      wcs/admin/workflows.py
    
  





  1669
  1669
  
    
        response.set_content_type('application/x-wcs-form')

  		




  1670
  1670
  
    
        response.set_header('content-disposition',

  		




  1671
  1671
  
    
                'attachment; filename=workflow-%s.wcs' % misc.simplify(self.workflow.name))

  		




  1672
  
  
    
        return '<?xml version="1.0" encoding="utf-8"?>\n' + ET.tostring(x)

  		




  
  1672
  
    
        return '<?xml version="1.0"?>\n' + ET.tostring(x)

  		




  1673
  1673
  
    

  		




  1674
  1674
  
    
    def get_new_status_form(self):

  		




  1675
  1675
  
    
        r = TemplateIO(html=True)

  		




  1676
  
  
    
-