From 5221a2514ef491bc3b3774649af26796f8c5ba46 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:09:59 +0100 Subject: [PATCH] [imp] import os.path.isfile unqualified, use filter instead of listcomp when we just apply a function bzr revid: xmo@tinyerp.com-20091212160959-w9hgcf4btkx7yde3 --- setup.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 37a2d4d3fbc..27354ff0161 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ import imp import sys import os -from os.path import join +from os.path import join, isfile import glob from distutils.core import setup, Command @@ -122,9 +122,11 @@ def data_files(): files.append((join(man_directory, 'man5'), ['man/openerp_serverrc.5'])) doc_directory = join('share', 'doc', 'openerp-server-%s' % version) - files.append((doc_directory, [f for f in glob.glob('doc/*') if os.path.isfile(f)])) - files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'), [f for f in glob.glob('doc/migrate/3.3.0-3.4.0/*') if os.path.isfile(f)])) - files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'), [f for f in glob.glob('doc/migrate/3.4.0-4.0.0/*') if os.path.isfile(f)])) + files.append((doc_directory, filter(isfile, glob.glob('doc/*')))) + files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'), + filter(isfile, glob.glob('doc/migrate/3.3.0-3.4.0/*')))) + files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'), + filter(isfile, glob.glob('doc/migrate/3.4.0-4.0.0/*')))) openerp_site_packages = join('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server')