Changeset 565750f in indico


Ignore:
Timestamp:
11/09/10 13:54:41 (3 years ago)
Author:
Jose Benito <jose.benito.gonzalez@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1
Children:
c3c8d1
Parents:
38575c
Message:

[FIX] Avoid exception with json encode iso-8859-1

Location:
indico/MaKaC
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/common/TemplateExec.py

    r38575c r565750f  
    1919## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. 
    2020from MaKaC.user import Avatar 
     21from MaKaC.common.logger import Logger 
    2122 
    2223""" 

  • indico/MaKaC/services/interface/rpc/json.py

    r40cfd6 r565750f  
    142142        responseBody["error"] = errorInfo 
    143143 
    144     jsonResponse = encode(responseBody) 
     144    try: 
     145        jsonResponse = encode(responseBody) 
     146    except: 
     147        Logger.get('rpc').exception("Problem encoding JSON response") 
     148        # This is to avoid exceptions due to old data encodings (based on iso-8859-1) 
     149        responseBody["result"] = responseBody["result"].decode('iso-8859-1').encode('utf-8') 
     150        jsonResponse = encode(responseBody) 
    145151 
    146152    req.content_type = "application/json" 
Note: See TracChangeset for help on using the changeset viewer.