Projet

Général

Profil

0001-workflow-do-not-fail-geolocating-None-as-address-156.patch

Frédéric Péters, 24 mars 2017 16:52

Télécharger (1,59 ko)

Voir les différences: 

Subject: [PATCH] workflow: do not fail geolocating None as address (#15624)


 tests/test_workflows.py | 6 ++++++
 wcs/wf/geolocate.py     | 4 ++++
 2 files changed, 10 insertions(+)
tests/test_workflows.py
1628 1628 
    item.perform(formdata)
1629 1629 
    assert formdata.geolocations == {}
1630 1630 

  		




  
  1631
  
    
    # check for None

  		




  
  1632
  
    
    item.address_string = '=None'

  		




  
  1633
  
    
    formdata.geolocations = None

  		




  
  1634
  
    
    item.perform(formdata)

  		




  
  1635
  
    
    assert formdata.geolocations == {}

  		




  
  1636
  
    

  		




  1631
  1637
  
    
    # check for nominatim server error

  		




  1632
  1638
  
    
    formdata.geolocations = None

  		




  1633
  1639
  
    
    with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:

  		












  

    
      wcs/wf/geolocate.py
    
  





  112
  112
  
    
            get_logger().error('error in template for address string [%r]', e)

  		




  113
  113
  
    
            return

  		




  114
  114
  
    

  		




  
  115
  
    
        if not address:

  		




  
  116
  
    
            get_logger().error('error determining address')

  		




  
  117
  
    
            return

  		




  
  118
  
    

  		




  115
  119
  
    
        url = '%s/search?q=%s&format=json' % (nominatim_url, urllib2.quote(address))

  		




  116
  120
  
    
        url += '&accept-language=%s' % (get_publisher().get_site_language() or 'en')

  		




  117
  121
  
    
        if get_publisher().get_site_option('nominatim_key'):

  		




  118
  
  
    
-