diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index 7b117c040f6..55adfb55070 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -15,3 +15,5 @@ conf = openerp.tools.config
 conf['addons_path'] = '/home/openerp/repos/addons/trunk-xmlrpc'
 conf['static_http_document_root'] = '/tmp'
 #conf['log_level'] = 10 # 10 is DEBUG
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/history/xml2yml.py b/history/xml2yml.py
index e926ddf5f94..8344d5f81e0 100755
--- a/history/xml2yml.py
+++ b/history/xml2yml.py
@@ -343,3 +343,5 @@ if __name__=='__main__':
     p = xml_parse()
     p.parse(fname)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py
index fe8c651621c..f21c2db8d0a 100644
--- a/openerp/addons/base/ir/ir_config_parameter.py
+++ b/openerp/addons/base/ir/ir_config_parameter.py
@@ -92,3 +92,5 @@ class ir_config_parameter(osv.osv):
         else:
             self.create(cr, uid, {'key': key, 'value': value}, context=context)
             return False
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_default.py b/openerp/addons/base/ir/ir_default.py
index a51405b32c1..2378551153d 100644
--- a/openerp/addons/base/ir/ir_default.py
+++ b/openerp/addons/base/ir/ir_default.py
@@ -45,3 +45,5 @@ class ir_default(osv.osv):
     }
 ir_default()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index 15e8f3bf3ce..3802baecddc 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -457,3 +457,5 @@ class ir_values(osv.osv):
             def do_get(model,res_id):
                 return self.get_actions(cr, uid, action_slot=key2, model=model, res_id=res_id, context=context)
         return self._map_legacy_model_list(models, do_get, merge_results=True)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/osv_memory_autovacuum.py b/openerp/addons/base/ir/osv_memory_autovacuum.py
index 975fcd0a403..1b3ca507eb8 100644
--- a/openerp/addons/base/ir/osv_memory_autovacuum.py
+++ b/openerp/addons/base/ir/osv_memory_autovacuum.py
@@ -31,3 +31,5 @@ class osv_memory_autovacuum(openerp.osv.osv.osv_memory):
                 model._transient_vacuum(cr, uid)
         return True
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/wizard/wizard_screen.py b/openerp/addons/base/ir/wizard/wizard_screen.py
index 5762bdc8752..303cd37a6f1 100644
--- a/openerp/addons/base/ir/wizard/wizard_screen.py
+++ b/openerp/addons/base/ir/wizard/wizard_screen.py
@@ -49,4 +49,5 @@ class wizard_screen(osv.osv_memory):
     _defaults = {
         'config_logo': _get_image
     }
-wizard_screen()
\ No newline at end of file
+wizard_screen()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/__init__.py b/openerp/addons/base/module/__init__.py
index 1b7abf2e76e..f92a94f735e 100644
--- a/openerp/addons/base/module/__init__.py
+++ b/openerp/addons/base/module/__init__.py
@@ -22,3 +22,5 @@
 import module
 import wizard
 import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 3a6a044832f..8e8181c89a2 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -707,3 +707,5 @@ class module_dependency(osv.osv):
             ], string='State', readonly=True, select=True),
     }
 module_dependency()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/wizard/base_import_language.py b/openerp/addons/base/module/wizard/base_import_language.py
index fdb9a177d8b..acc0aa9640a 100644
--- a/openerp/addons/base/module/wizard/base_import_language.py
+++ b/openerp/addons/base/module/wizard/base_import_language.py
@@ -68,3 +68,5 @@ class base_language_import(osv.osv_memory):
         return {}
 
 base_language_import()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/wizard/base_module_scan.py b/openerp/addons/base/module/wizard/base_module_scan.py
index d47e091955f..d99c2db7e4d 100644
--- a/openerp/addons/base/module/wizard/base_module_scan.py
+++ b/openerp/addons/base/module/wizard/base_module_scan.py
@@ -70,4 +70,5 @@ class base_module_scan(osv.osv_memory):
                         mod_obj.write(cr, uid, [mod['id']], {'state': 'uninstalled'})
         return {}
 
-base_module_scan()
\ No newline at end of file
+base_module_scan()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index ca82cfb20d2..3b8671b0ebb 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -116,3 +116,5 @@ class base_module_upgrade(osv.osv_memory):
         return self.pool.get('res.config').next(cr, uid, [], context=context)
 
 base_module_upgrade()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/wizard/base_update_translations.py b/openerp/addons/base/module/wizard/base_update_translations.py
index bd950ea628d..ebdfc05b75c 100644
--- a/openerp/addons/base/module/wizard/base_update_translations.py
+++ b/openerp/addons/base/module/wizard/base_update_translations.py
@@ -72,3 +72,5 @@ class base_update_translations(osv.osv_memory):
     }
 
 base_update_translations()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/report/__init__.py b/openerp/addons/base/report/__init__.py
index 254008f0185..6faf7839863 100644
--- a/openerp/addons/base/report/__init__.py
+++ b/openerp/addons/base/report/__init__.py
@@ -1 +1,3 @@
 import preview_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index 9184cf2ad1c..35deb32d551 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -225,3 +225,5 @@ class res_partner_bank(osv.osv):
 res_partner_bank()
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_log.py b/openerp/addons/base/res/res_log.py
index 0ec39dbf615..ef49b52ee52 100644
--- a/openerp/addons/base/res/res_log.py
+++ b/openerp/addons/base/res/res_log.py
@@ -76,3 +76,5 @@ class res_log(osv.osv):
         return result
 
 res_log()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_widget.py b/openerp/addons/base/res/res_widget.py
index 71bdd85fc21..c4765c3cb1f 100644
--- a/openerp/addons/base/res/res_widget.py
+++ b/openerp/addons/base/res/res_widget.py
@@ -84,3 +84,5 @@ class res_widget_wizard(osv.osv_memory):
 
 res_widget_wizard()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/test/res_lang.py b/openerp/addons/base/res/test/res_lang.py
index 9272f1142ea..58963043ee6 100644
--- a/openerp/addons/base/res/test/res_lang.py
+++ b/openerp/addons/base/res/test/res_lang.py
@@ -10,3 +10,5 @@ for k, v in list(sys.modules.items()):
 import openerp.addons.base.res.res_lang as res_lang
 res_lang._group_examples()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/wizard/partner_wizard_ean_check.py b/openerp/addons/base/res/wizard/partner_wizard_ean_check.py
index 8ee383c18f5..cf55fe753a8 100644
--- a/openerp/addons/base/res/wizard/partner_wizard_ean_check.py
+++ b/openerp/addons/base/res/wizard/partner_wizard_ean_check.py
@@ -74,4 +74,5 @@ class partner_wizard_ean_check(osv.osv_memory):
             })
         return {}
 
-partner_wizard_ean_check()
\ No newline at end of file
+partner_wizard_ean_check()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/preprocess.py b/openerp/report/preprocess.py
index b339e078d81..e681860d7a2 100644
--- a/openerp/report/preprocess.py
+++ b/openerp/report/preprocess.py
@@ -100,3 +100,5 @@ if __name__=='__main__':
     result = a.preprocess_rml(node)
     print etree.tostring(result)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/pyPdf/__init__.py b/openerp/report/pyPdf/__init__.py
index 8d17648d4b9..9e4f84d3863 100644
--- a/openerp/report/pyPdf/__init__.py
+++ b/openerp/report/pyPdf/__init__.py
@@ -3,3 +3,5 @@ from pdf import PdfFileReader, PdfFileWriter
 
 __all__ = ["pdf"]
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/pyPdf/xmp.py b/openerp/report/pyPdf/xmp.py
index b070df9093e..0813b806d45 100644
--- a/openerp/report/pyPdf/xmp.py
+++ b/openerp/report/pyPdf/xmp.py
@@ -353,3 +353,5 @@ class XmpInformation(PdfObject):
     custom_properties = property(custom_properties)
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/render/html2html/html2html.py b/openerp/report/render/html2html/html2html.py
index 9847c4412e3..181c7f7ba67 100644
--- a/openerp/report/render/html2html/html2html.py
+++ b/openerp/report/render/html2html/html2html.py
@@ -93,3 +93,5 @@ def parseString(node, localcontext = {}):
     root = r.url_modify(root)
     return root
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/render/makohtml2html/__init__.py b/openerp/report/render/makohtml2html/__init__.py
index ee458d04718..8ce38649762 100644
--- a/openerp/report/render/makohtml2html/__init__.py
+++ b/openerp/report/render/makohtml2html/__init__.py
@@ -23,3 +23,5 @@ from makohtml2html import parseNode
 
 #.apidoc title: MAKO to HTML engine
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/render/makohtml2html/makohtml2html.py b/openerp/report/render/makohtml2html/makohtml2html.py
index 9241862d251..1682385be19 100644
--- a/openerp/report/render/makohtml2html/makohtml2html.py
+++ b/openerp/report/render/makohtml2html/makohtml2html.py
@@ -131,3 +131,5 @@ class makohtml2html(object):
 def parseNode(html, localcontext = {}):
     r = makohtml2html(html, localcontext)
     return r.render()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/render/odt2odt/odt2odt.py b/openerp/report/render/odt2odt/odt2odt.py
index a28ec904a22..d077207f4d7 100644
--- a/openerp/report/render/odt2odt/odt2odt.py
+++ b/openerp/report/render/odt2odt/odt2odt.py
@@ -53,3 +53,5 @@ def parseNode(node, localcontext = {}):
     r = odt2odt(node, localcontext)
     return r.render()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/render/rml2pdf/__init__.py b/openerp/report/render/rml2pdf/__init__.py
index ffe9339b659..fdbb5f77b89 100644
--- a/openerp/report/render/rml2pdf/__init__.py
+++ b/openerp/report/render/rml2pdf/__init__.py
@@ -23,3 +23,5 @@ from trml2pdf import parseString, parseNode
 
 #.apidoc title: RML to PDF engine
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/render/rml2pdf/customfonts.py b/openerp/report/render/rml2pdf/customfonts.py
index bc70d1f65ea..56803648b4f 100644
--- a/openerp/report/render/rml2pdf/customfonts.py
+++ b/openerp/report/render/rml2pdf/customfonts.py
@@ -150,3 +150,5 @@ def SetCustomFonts(rmldoc):
     return True
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py
index 13ba8fee40d..6cb8a7ec83e 100644
--- a/openerp/report/render/rml2pdf/trml2pdf.py
+++ b/openerp/report/render/rml2pdf/trml2pdf.py
@@ -1015,3 +1015,5 @@ if __name__=="__main__":
         print 'Usage: trml2pdf input.rml >output.pdf'
         print 'Try \'trml2pdf --help\' for more information.'
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/report_sxw.py b/openerp/report/report_sxw.py
index 98de86b01a8..742efd7e5f5 100644
--- a/openerp/report/report_sxw.py
+++ b/openerp/report/report_sxw.py
@@ -656,3 +656,5 @@ class report_sxw(report_rml, preprocess.report):
         html = create_doc(mako_html,html_parser.localcontext)
         return (html,'html')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/run_tests.py b/openerp/run_tests.py
index 7c0ee2a2431..4735bc9f331 100644
--- a/openerp/run_tests.py
+++ b/openerp/run_tests.py
@@ -25,3 +25,5 @@ import test
 
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(unittest.defaultTestLoader.loadTestsFromModule(test))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py
index 63bd991ee35..506138b7fb4 100644
--- a/openerp/service/http_server.py
+++ b/openerp/service/http_server.py
@@ -183,3 +183,5 @@ class OpenERPAuthProvider(AuthProvider):
         raise AuthRequiredExc(atype='Basic', realm=self.realm)
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py
index 5b0fe239e51..c15ed514249 100644
--- a/openerp/service/netrpc_server.py
+++ b/openerp/service/netrpc_server.py
@@ -153,3 +153,5 @@ def init_servers():
         netrpcd = TinySocketServerThread(
             tools.config.get('netrpc_interface', ''), 
             int(tools.config.get('netrpc_port', 8070)))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/service/security.py b/openerp/service/security.py
index ff140ad261b..d327efe5443 100644
--- a/openerp/service/security.py
+++ b/openerp/service/security.py
@@ -40,3 +40,5 @@ def check(db, uid, passwd):
     pool = pooler.get_pool(db)
     user_obj = pool.get('res.users')
     return user_obj.check(db, uid, passwd)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py
index 3df441458fd..a4bdebcec27 100644
--- a/openerp/service/websrv_lib.py
+++ b/openerp/service/websrv_lib.py
@@ -232,3 +232,5 @@ class HttpOptions:
         """
         return opts
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/test/__init__.py b/openerp/test/__init__.py
index 248f468a34c..7a6c167d85b 100644
--- a/openerp/test/__init__.py
+++ b/openerp/test/__init__.py
@@ -21,3 +21,5 @@
 
 from test_osv import *
 from test_translate import *
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/test/test_osv.py b/openerp/test/test_osv.py
index 48039fa46fa..d3ff75c03d5 100644
--- a/openerp/test/test_osv.py
+++ b/openerp/test/test_osv.py
@@ -62,3 +62,5 @@ class QueryTestCase(unittest.TestCase):
         query.tables.append('"product_product"')
         self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/test/test_translate.py b/openerp/test/test_translate.py
index 85c980bede5..d9f771b69fb 100644
--- a/openerp/test/test_translate.py
+++ b/openerp/test/test_translate.py
@@ -46,3 +46,5 @@ class TranslationToolsTestCase(unittest.TestCase):
          \\\\nope\n\n"
          """)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tiny_socket.py b/openerp/tiny_socket.py
index 29782109347..b4bed83a4c0 100644
--- a/openerp/tiny_socket.py
+++ b/openerp/tiny_socket.py
@@ -96,3 +96,5 @@ class mysocket:
             raise res[0]
         else:
             return res[0]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py
index 914794118aa..48999c066df 100644
--- a/openerp/tools/amount_to_text_en.py
+++ b/openerp/tools/amount_to_text_en.py
@@ -126,3 +126,5 @@ if __name__=='__main__':
     else:
         print int_to_text(int(argv[1]), lang)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/cache.py b/openerp/tools/cache.py
index 33a821ce3b3..2c5c4a46e0d 100644
--- a/openerp/tools/cache.py
+++ b/openerp/tools/cache.py
@@ -135,3 +135,5 @@ if __name__ == '__main__':
 
 # For backward compatibility
 cache = ormcache
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index f1c3931e81f..7708ab1812d 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -601,3 +601,5 @@ class configmanager(object):
 
 config = configmanager()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 7d6a982986b..66522f47c8b 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -999,3 +999,5 @@ def convert_xml_import(cr, module, xmlfile, idref=None, mode='init', noupdate=Fa
     obj.parse(doc.getroot())
     return True
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/copy.py b/openerp/tools/copy.py
index badd4d51fc5..2f8ddb52cd3 100644
--- a/openerp/tools/copy.py
+++ b/openerp/tools/copy.py
@@ -437,3 +437,5 @@ def _test():
 
 if __name__ == '__main__':
     _test()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/func.py b/openerp/tools/func.py
index 03463678ffb..9f52f1da956 100644
--- a/openerp/tools/func.py
+++ b/openerp/tools/func.py
@@ -118,3 +118,5 @@ def frame_codeinfo(fframe, back=0):
         return (fname, lineno)
     except Exception:
         return ("<unknown>", '')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/lru.py b/openerp/tools/lru.py
index aa7b14a745c..5e84775a352 100644
--- a/openerp/tools/lru.py
+++ b/openerp/tools/lru.py
@@ -118,3 +118,5 @@ class LRU(object):
         self.d = {}
         self.first = None
         self.last = None
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/osutil.py b/openerp/tools/osutil.py
index 51540ae28c7..3da9fa624a3 100644
--- a/openerp/tools/osutil.py
+++ b/openerp/tools/osutil.py
@@ -60,3 +60,5 @@ def walksymlinks(top, topdown=True, onerror=None):
 if __name__ == '__main__':
 	from pprint import pprint as pp
 	pp(listdir('../report', True))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/parse_version.py b/openerp/tools/parse_version.py
index c743a9bb239..316f102a5e6 100644
--- a/openerp/tools/parse_version.py
+++ b/openerp/tools/parse_version.py
@@ -99,3 +99,5 @@ if __name__ == '__main__':
         chk(('0', '4.2', '4.2.3.4', '5.0.0-alpha', '5.0.0-rc1', '5.0.0-rc1.1', '5.0.0_rc2', '5.0.0_rc3', '5.0.0'), False)
         chk(('5.0.0-0_rc3', '5.0.0-1dev', '5.0.0-1'), False) 
         
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/test_config.py b/openerp/tools/test_config.py
index 256e7ba4c32..d89fda19b2e 100644
--- a/openerp/tools/test_config.py
+++ b/openerp/tools/test_config.py
@@ -44,3 +44,5 @@ conf = config.configmanager()
 conf.parse_config(['-c', config_file_00, '--osv-memory-age-limit=2.3'])
 
 assert conf['osv_memory_age_limit'] == 2.3
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/test_reports.py b/openerp/tools/test_reports.py
index 88430dffc5c..ede199a44f8 100644
--- a/openerp/tools/test_reports.py
+++ b/openerp/tools/test_reports.py
@@ -307,3 +307,5 @@ def try_report_action(cr, uid, action_id, active_model=None, active_ids=None,
     return True
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/which.py b/openerp/tools/which.py
index 548b836247c..81318541bdc 100755
--- a/openerp/tools/which.py
+++ b/openerp/tools/which.py
@@ -151,3 +151,5 @@ def which(file, mode=F_OK | X_OK, path=None, pathext=None):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/yaml_tag.py b/openerp/tools/yaml_tag.py
index 6f7ceec4aee..aca802c374a 100644
--- a/openerp/tools/yaml_tag.py
+++ b/openerp/tools/yaml_tag.py
@@ -182,3 +182,5 @@ def add_constructors():
     yaml.add_constructor(u"!ir_set", ir_set_constructor)
 add_constructors()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 3f108685f94..40695bd7c41
--- a/setup.py
+++ b/setup.py
@@ -1,73 +1,115 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 
-import os
-import re
-import sys
-from setuptools import setup, find_packages
+import glob, os, re, setuptools, sys
+from os.path import join, isfile
 
-execfile('addons/web/common/release.py')
+# List all data files
+def data():
+    files = []
+    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()
+    return r
 
-version_dash_incompatible = False
-if 'bdist_rpm' in sys.argv:
-    version_dash_incompatible = True
-try:
-    import py2exe
-    from py2exe_utils import opts
-    version_dash_incompatible = True
-except ImportError:
-    opts = {}
-if version_dash_incompatible:
-    version = version.split('-')[0]
+def gen_manifest():
+    file_list="\n".join(data())
+    open('MANIFEST','w').write(file_list)
 
-FILE_PATTERNS = \
-    r'.+\.(py|cfg|po|pot|mo|txt|rst|gif|png|jpg|ico|mako|html|js|css|htc|swf)$'
-def find_data_files(source, patterns=FILE_PATTERNS):
-    file_matcher = re.compile(patterns, re.I)
-    out = []
-    for base, _, files in os.walk(source):
-        cur_files = []
-        for f in files:
-            if file_matcher.match(f):
-                cur_files.append(os.path.join(base, f))
-        if cur_files:
-            out.append(
-                (base, cur_files))
+def py2exe_options():
+    if os.name == 'nt':
+        import py2exe
+        return {
+            "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], }],
+            'options' : {
+                "py2exe": {
+                    "skip_archive": 1,
+                    "optimize": 2,
+                    "dist_dir": 'dist',
+                    "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber" "vobject", "xml", "xml", "xml.dom", "xml.xpath", "yaml", ],
+                    "excludes" : ["Tkconstants","Tkinter","tcl"],
+                }
+            }
+        }
+    else:
+        return {}
 
-    return out
+execfile(join(os.path.dirname(__file__), 'openerp', 'release.py'))
 
-setup(
-    name=name,
-    version=version,
-    description=description,
-    long_description=long_description,
-    author=author,
-    author_email=author_email,
-    url=url,
-    download_url=download_url,
-    license=license,
-    install_requires=[
-        "Babel >= 0.9.6",
-        "simplejson >= 2.0.9",
-        "python-dateutil >= 1.4.1",
-        "pytz",
-        "werkzeug == 0.7",
-    ],
-    tests_require=[
-        'unittest2',
-        'mock',
-    ],
-    test_suite = 'unittest2.collector',
-    zip_safe=False,
-    packages=find_packages(),
-    classifiers=[
-        'Development Status :: 6 - Production/Stable',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Environment :: Web Environment',
-        'Topic :: Office/Business :: Financial',
-        ],
-    scripts=['openerp-web'],
-    data_files=(find_data_files('addons')
-              + opts.pop('data_files', [])
-    ),
-    **opts
+setuptools.setup(
+      name             = 'openerp',
+      version          = version,
+      description      = description,
+      long_description = long_desc,
+      url              = url,
+      author           = author,
+      author_email     = author_email,
+      classifiers      = filter(None, classifiers.split("\n")),
+      license          = license,
+      scripts          = ['openerp-server'],
+      data_files       = data(),
+      packages         = setuptools.find_packages(),
+      #include_package_data = True,
+      install_requires = [
+        # TODO the pychart package we include in openerp corresponds to PyChart 1.37.
+        # It seems there is a single difference, which is a spurious print in generate_docs.py.
+        # It is probably safe to move to PyChart 1.39 (the latest one).
+        # (Let setup.py choose the latest one, and we should check we can remove pychart from
+        # our tree.) http://download.gna.org/pychart/
+        # TODO  'pychart',
+          'babel',
+          'feedparser',
+          'gdata',
+          'lxml',
+          'mako',
+          'psycopg2',
+          'pydot',
+          'python-dateutil',
+          'python-ldap',
+          'python-openid',
+          'pytz',
+          'pywebdav',
+          'pyyaml',
+          'reportlab',
+          'simplejson',
+          'vatnumber',
+          'vobject',
+          'werkzeug',
+          'zsi',
+      ],
+      extras_require = {
+          'SSL' : ['pyopenssl'],
+      },
+      **py2exe_options()
 )
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/tests/__init__.py b/tests/__init__.py
index 396284efaf7..ec2b8de39b1 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,2 +1,4 @@
 # -*- coding: utf-8 -*-
 import test_xmlrpc
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/tests/common.py b/tests/common.py
index 116898dc7ef..3de65489587 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -61,3 +61,5 @@ def setUpModule():
 def tearDownModule():
     """ Shutdown the OpenERP server similarly to a single ctrl-c. """
     openerp.service.stop_services()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/tests/test_ir_sequence.py b/tests/test_ir_sequence.py
index 8a4731d524f..263710cbd3b 100644
--- a/tests/test_ir_sequence.py
+++ b/tests/test_ir_sequence.py
@@ -196,3 +196,5 @@ class test_ir_sequence_generate(unittest2.TestCase):
 if __name__ == '__main__':
     unittest2.main()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/tests/test_orm.py b/tests/test_orm.py
index 61b574df5eb..0dfed0005cb 100644
--- a/tests/test_orm.py
+++ b/tests/test_orm.py
@@ -173,3 +173,5 @@ class TestO2MSerialization(unittest2.TestCase):
             self.partner.resolve_o2m_commands_to_record_dicts(
                 self.cr, UID, 'address', [REPLACE_WITH([42])], ['name'])
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/tests/test_xmlrpc.py b/tests/test_xmlrpc.py
index 4ad530cbeda..3f7286cfab1 100644
--- a/tests/test_xmlrpc.py
+++ b/tests/test_xmlrpc.py
@@ -64,3 +64,5 @@ class test_xmlrpc(unittest2.TestCase):
 if __name__ == '__main__':
     unittest2.main()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: