Projet

Général

Profil

0001-tests-fix-generated_document-tests-with-py-3.8-42359.patch

Lauréline Guérin, 18 juin 2020 16:07

Télécharger (1,36 ko)

Voir les différences: 

Subject: [PATCH] tests: fix generated_document tests with py 3.8 (#42359)


 tests/test_form_pages.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
tests/test_form_pages.py
12 12 
import base64
13 13 
from webtest import Upload, Hidden
14 14 
import mock
15 
import xml.etree.ElementTree as ET
15 16 

  		




  16
  17
  
    
try:

  		




  17
  18
  
    
    from PIL import Image

  		




  ......




  64
  65
  
    
    for name in z1.namelist():

  		




  65
  66
  
    
        if name == 'styles.xml':

  		




  66
  67
  
    
            continue

  		




  67
  
  
    
        t1, t2 = z1.read(name), z2.read(name)

  		




  
  68
  
    
        if name in ['content.xml', 'meta.xml']:

  		




  
  69
  
    
            t1, t2 = ET.tostring(ET.XML(z1.read(name))), ET.tostring(ET.XML(z2.read(name)))

  		




  
  70
  
    
            try:

  		




  
  71
  
    
                # >= python 3.8: tostring preserves attribute order; use canonicalize to sort them

  		




  
  72
  
    
                t1, t2 = ET.canonicalize(t1), ET.canonicalize(t2)

  		




  
  73
  
    
            except AttributeError:

  		




  
  74
  
    
                pass

  		




  
  75
  
    
        else:

  		




  
  76
  
    
            t1, t2 = z1.read(name), z2.read(name)

  		




  68
  77
  
    
        assert t1 == t2, 'file "%s" differs' % name

  		




  69
  78
  
    

  		




  70
  79
  
    

  		




  71
  
  
    
-