From 759f11f11077514bbf5e45ffa88a69ec1d0066ef Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Nov 2012 14:27:38 +0100
Subject: [PATCH] [FIX] py.js: bug in tokenization of single-quoted empty
 string

bzr revid: xmo@openerp.com-20121129132738-fcnam8bkqyt7h8ey
---
 addons/web/static/lib/py.js/.hg_archival.txt | 4 ++--
 addons/web/static/lib/py.js/lib/py.js        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/lib/py.js/.hg_archival.txt b/addons/web/static/lib/py.js/.hg_archival.txt
index 33dcdd88830..771b798ac84 100644
--- a/addons/web/static/lib/py.js/.hg_archival.txt
+++ b/addons/web/static/lib/py.js/.hg_archival.txt
@@ -1,5 +1,5 @@
 repo: 076b192d0d8ab2b92d1dbcfa3da055382f30eaea
-node: ccf62e5d0291f66a39f4049f3e880004e59c3654
+node: 2b62048dd1d86c45e4bf0442b5da4122534132bf
 branch: default
 latesttag: 0.7
-latesttagdistance: 4
+latesttagdistance: 5
diff --git a/addons/web/static/lib/py.js/lib/py.js b/addons/web/static/lib/py.js/lib/py.js
index 854232a0d80..04ecd3aeb5c 100644
--- a/addons/web/static/lib/py.js/lib/py.js
+++ b/addons/web/static/lib/py.js/lib/py.js
@@ -311,7 +311,7 @@ var py = {};
                 } else if (string_pattern.test(token)) {
                     var m = string_pattern.exec(token);
                     tokens.push(create(symbols['(string)'], {
-                        value: m[2] || m[3]
+                        value: (m[2] !== undefined ? m[2] : m[3])
                     }));
                 } else if (token in symbols) {
                     var symbol;