From 29cd983258f27819a25cec218fda6948f946992c Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 15 Jan 2014 17:22:42 +0100
Subject: [PATCH] [FIX] http: correct jsonp 2pass

bzr revid: chs@openerp.com-20140115162242-cyqb02wxmlhxqtu6
---
 openerp/http.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/http.py b/openerp/http.py
index 4205c578ba9..7069cbdeefe 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -286,7 +286,7 @@ class JsonRequest(WebRequest):
         if jsonp and self.httprequest.method == 'POST':
             # jsonp 2 steps step1 POST: save call
             def handler():
-                self.session.jsonp_requests[request_id] = self.httprequest.form['r']
+                self.session['jsonp_request_%s' % (request_id,)] = self.httprequest.form['r']
                 self.session.modified = True
                 headers=[('Content-Type', 'text/plain; charset=utf-8')]
                 r = werkzeug.wrappers.Response(request_id, headers=headers)
@@ -298,7 +298,7 @@ class JsonRequest(WebRequest):
             request = args.get('r')
         elif jsonp and request_id:
             # jsonp 2 steps step2 GET: run and return result
-            request = self.session.jsonp_requests.pop(request_id, "")
+            request = self.session.pop('jsonp_request_%s' % (request_id,), '{}')
         else:
             # regular jsonrpc2
             request = self.httprequest.stream.read()
@@ -637,7 +637,6 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         self.setdefault("login", None)
         self.setdefault("password", None)
         self.setdefault("context", {'tz': "UTC", "uid": None})
-        self.setdefault("jsonp_requests", {})
 
     def get_context(self):
         """