From 8c6cbebc0e347b69e0396b7df0bffe5eb539ebd0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 1 May 2014 21:05:44 +0200
Subject: [PATCH] [IMP] ir_qweb improve css minify

bzr revid: al@openerp.com-20140501190544-egvc85ctdxs69cmr
---
 openerp/addons/base/ir/ir_qweb.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index ae1d3fdee0e..acfac2dd892 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -1119,7 +1119,6 @@ class JavascriptAsset(WebAsset):
 class StylesheetAsset(WebAsset):
     rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U)
     rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://|data:)""", re.U)
-    rx_comments = re.compile(r"""/\*.*\*/""", re.S)
     rx_sourceMap = re.compile(r'(/\*# sourceMappingURL=.*)', re.U)
 
     def _get_content(self):
@@ -1156,8 +1155,13 @@ class StylesheetAsset(WebAsset):
 
     def minify(self):
         # remove existing sourcemaps, make no sense after re-mini
-        return self.rx_sourceMap.sub('', self.content)
-        # return self.rx_comments.sub('', self.content)
+        content = self.rx_sourceMap.sub('', self.content)
+        # comments
+        content = re.sub(r'/\*.*?\*/', '', content, flags=re.S)
+        # space
+        content = re.sub(r'\s+', ' ', content)
+        content = re.sub(r' *([{}]) *', r'\1', content)
+        return content
 
 def rjsmin(script):
     """ Minify js with a clever regex.