From 7d73d767b18cb91da51ca7a71904716620f678b6 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 30 Nov 2012 15:54:52 +0100
Subject: [PATCH] [FIX] setup.py

bzr revid: chs@openerp.com-20121130145452-afqxovwvncys6d4n
---
 setup.py | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/setup.py b/setup.py
index 79d9b2d5a07..b64bde31234 100755
--- a/setup.py
+++ b/setup.py
@@ -21,34 +21,29 @@
 ##############################################################################
 
 import glob, os, re, setuptools, sys
-from os.path import join, isfile
+from os.path import join
 
 # List all data files
 def data():
-    files = []
+    r = {}
     for root, dirnames, filenames in os.walk('openerp'):
         for filename in filenames:
-            if not re.match(r'.*(\.pyc|\.pyo|\~)$',filename):
-                files.append(os.path.join(root, filename))
-    d = {}
-    for v in files:
-        k=os.path.dirname(v)
-        if k in d:
-            d[k].append(v)
-        else:
-            d[k]=[v]
-    r = d.items()
+            if not re.match(r'.*(\.pyc|\.pyo|\~)$', filename):
+                r.setdefault(root, []).append(os.path.join(root, filename))
+
     if os.name == 'nt':
-        r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
+        r["Microsoft.VC90.CRT"] = glob.glob('C:\Microsoft.VC90.CRT\*.*')
 
         import babel
-        r.append(("localedata",
-                  glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))))
+        r["localedata"] = glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))
 
         import pytz
-        r.append((os.path.join("pytz", "zoneinfo"),
-                  glob.glob(os.path.join(os.path.dirname(pytz.__file__), "zoneinfo", '*'))))
-    return r
+        tzdir = os.path.dirname(pytz.__file__)
+        for root, _, filenames in os.walk(os.path.join(tzdir, "zoneinfo")):
+            base = root[len(tzdir) + 1:]
+            r[base] = [os.path.join(root, f) for f in filenames]
+
+    return r.items()
 
 def gen_manifest():
     file_list="\n".join(data())