diff --git a/addons/base_module_quality/wizard/pylint_test/pylint_test.py b/addons/base_module_quality/wizard/pylint_test/pylint_test.py index df4491a8f85..a640e37e96c 100644 --- a/addons/base_module_quality/wizard/pylint_test/pylint_test.py +++ b/addons/base_module_quality/wizard/pylint_test/pylint_test.py @@ -36,34 +36,16 @@ def _test_pylint(self, url, add_folder=None): subfolder.update(res) dict_files = {} for file in list_files: - if file.split('.')[-1] == 'py': - save_file = file.split('.')[0]+".txt" + if file.split('.')[-1] == 'py' and not file.startswith('__init__'): file_path = os.path.join(url, file) - os.system('pylint '+file_path+'>> '+save_file+' ') - a2 = os.system('cat '+save_file+' | tail -4 >> temp.txt') - os.system('rm '+save_file+' ') - fp = open('temp.txt','r') - result = fp.read() - fp.close() - str_result = '' - try: - for line in result: - str_result = str_result + line - finally: - fp = open('temp.txt','w') - fp.write('') - fp.close() - if str_result.startswith('Global'): + res = os.popen('pylint '+file_path+' | tail -4').read() + if res.startswith('Global'): if add_folder: - dict_files[add_folder + '/' + file] = str_result + dict_files[add_folder + '/' + file] = res else: - dict_files[file] = str_result - os.system(' rm temp.txt ') + dict_files[file] = res dict_files.update(subfolder) return dict_files -# - - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__terp__.py index 784f260fb6b..e2fb372e3bc 100644 --- a/addons/base_report_designer/__terp__.py +++ b/addons/base_report_designer/__terp__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -31,7 +31,7 @@ OpenOffice. "website" : "http://tinyerp.com", "category" : "Generic Modules/Base", "init_xml" : [ ], - "demo_xml" : ["base_report_user_data.xml"], + "demo_xml" : ["base_report_data.xml"], "update_xml" : [ "base_report_designer_wizard.xml" ], "active": False, "installable": True diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml index 0d784421a07..87b28be3bdb 100644 --- a/addons/product/product_data.xml +++ b/addons/product/product_data.xml @@ -86,7 +86,7 @@ parameter) will see those record just disappear. property_product_pricelist - +