Odoo Server (MOVED TO GITHUB)

Merge lp:~numerigraphe/openobject-server/trunk-vim into lp:openobject-server

  1. trunk-vim
  2. Merge into trunk
Proposed by Numérigraphe
Status: Merged
Merged at revision: 3828
Proposed branch: lp:~numerigraphe/openobject-server/trunk-vim
Merge into: lp:openobject-server
Diff against target: 582 lines (+116/-3)
58 files modified
gunicorn.conf.py (+2/-0)
history/xml2yml.py (+2/-0)
openerp/addons/base/ir/ir_config_parameter.py (+2/-0)
openerp/addons/base/ir/ir_default.py (+2/-0)
openerp/addons/base/ir/ir_values.py (+2/-0)
openerp/addons/base/ir/osv_memory_autovacuum.py (+2/-0)
openerp/addons/base/ir/wizard/wizard_screen.py (+2/-1)
openerp/addons/base/module/__init__.py (+2/-0)
openerp/addons/base/module/module.py (+2/-0)
openerp/addons/base/module/wizard/base_import_language.py (+2/-0)
openerp/addons/base/module/wizard/base_module_scan.py (+2/-1)
openerp/addons/base/module/wizard/base_module_upgrade.py (+2/-0)
openerp/addons/base/module/wizard/base_update_translations.py (+2/-0)
openerp/addons/base/report/__init__.py (+2/-0)
openerp/addons/base/res/res_bank.py (+2/-0)
openerp/addons/base/res/res_log.py (+2/-0)
openerp/addons/base/res/res_widget.py (+2/-0)
openerp/addons/base/res/test/res_lang.py (+2/-0)
openerp/addons/base/res/wizard/partner_wizard_ean_check.py (+2/-1)
openerp/report/preprocess.py (+2/-0)
openerp/report/pyPdf/__init__.py (+2/-0)
openerp/report/pyPdf/xmp.py (+2/-0)
openerp/report/render/html2html/html2html.py (+2/-0)
openerp/report/render/makohtml2html/__init__.py (+2/-0)
openerp/report/render/makohtml2html/makohtml2html.py (+2/-0)
openerp/report/render/odt2odt/odt2odt.py (+2/-0)
openerp/report/render/rml2pdf/__init__.py (+2/-0)
openerp/report/render/rml2pdf/customfonts.py (+2/-0)
openerp/report/render/rml2pdf/trml2pdf.py (+2/-0)
openerp/report/report_sxw.py (+2/-0)
openerp/run_tests.py (+2/-0)
openerp/service/http_server.py (+2/-0)
openerp/service/netrpc_server.py (+2/-0)
openerp/service/security.py (+2/-0)
openerp/service/websrv_lib.py (+2/-0)
openerp/test/__init__.py (+2/-0)
openerp/test/test_osv.py (+2/-0)
openerp/test/test_translate.py (+2/-0)
openerp/tiny_socket.py (+2/-0)
openerp/tools/amount_to_text_en.py (+2/-0)
openerp/tools/cache.py (+2/-0)
openerp/tools/config.py (+2/-0)
openerp/tools/convert.py (+2/-0)
openerp/tools/copy.py (+2/-0)
openerp/tools/func.py (+2/-0)
openerp/tools/lru.py (+2/-0)
openerp/tools/osutil.py (+2/-0)
openerp/tools/parse_version.py (+2/-0)
openerp/tools/test_config.py (+2/-0)
openerp/tools/test_reports.py (+2/-0)
openerp/tools/which.py (+2/-0)
openerp/tools/yaml_tag.py (+2/-0)
setup.py (+2/-0)
tests/__init__.py (+2/-0)
tests/common.py (+2/-0)
tests/test_ir_sequence.py (+2/-0)
tests/test_orm.py (+2/-0)
tests/test_xmlrpc.py (+2/-0)
To merge this branch: bzr merge lp:~numerigraphe/openobject-server/trunk-vim
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+82984@code.launchpad.net

Description of the change

Adds missing VIM mode lines at the end of python files.
Added with GNU grep and bash :
    for i in $(grep -R --files-without-match "^# vim:" . |grep ".py$" ); do echo -e "\n# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:" >>$i ; done

To post a comment you must log in.
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Merged, same comment as for your MP on addons[1] :-)

Thanks!

[1] https://code.launchpad.net/~numerigraphe/openobject-addons/trunk-vim/+merge/82983

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gunicorn.conf.py'
--- gunicorn.conf.py 2011-09-12 10:21:47 +0000
+++ gunicorn.conf.py 2011-11-22 09:05:13 +0000
@@ -15,3 +15,5 @@
15conf['addons_path'] = '/home/openerp/repos/addons/trunk-xmlrpc'15conf['addons_path'] = '/home/openerp/repos/addons/trunk-xmlrpc'
16conf['static_http_document_root'] = '/tmp'16conf['static_http_document_root'] = '/tmp'
17#conf['log_level'] = 10 # 10 is DEBUG17#conf['log_level'] = 10 # 10 is DEBUG
18
19# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1820
=== modified file 'history/xml2yml.py'
--- history/xml2yml.py 2011-09-26 00:54:44 +0000
+++ history/xml2yml.py 2011-11-22 09:05:13 +0000
@@ -343,3 +343,5 @@
343 p = xml_parse()343 p = xml_parse()
344 p.parse(fname)344 p.parse(fname)
345345
346
347# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
346348
=== modified file 'openerp/addons/base/ir/ir_config_parameter.py'
--- openerp/addons/base/ir/ir_config_parameter.py 2011-10-14 09:33:28 +0000
+++ openerp/addons/base/ir/ir_config_parameter.py 2011-11-22 09:05:13 +0000
@@ -92,3 +92,5 @@
92 else:92 else:
93 self.create(cr, uid, {'key': key, 'value': value}, context=context)93 self.create(cr, uid, {'key': key, 'value': value}, context=context)
94 return False94 return False
95
96# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
9597
=== modified file 'openerp/addons/base/ir/ir_default.py'
--- openerp/addons/base/ir/ir_default.py 2011-11-07 15:19:49 +0000
+++ openerp/addons/base/ir/ir_default.py 2011-11-22 09:05:13 +0000
@@ -45,3 +45,5 @@
45 }45 }
46ir_default()46ir_default()
4747
48
49# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4850
=== modified file 'openerp/addons/base/ir/ir_values.py'
--- openerp/addons/base/ir/ir_values.py 2011-10-03 15:40:08 +0000
+++ openerp/addons/base/ir/ir_values.py 2011-11-22 09:05:13 +0000
@@ -457,3 +457,5 @@
457 def do_get(model,res_id):457 def do_get(model,res_id):
458 return self.get_actions(cr, uid, action_slot=key2, model=model, res_id=res_id, context=context)458 return self.get_actions(cr, uid, action_slot=key2, model=model, res_id=res_id, context=context)
459 return self._map_legacy_model_list(models, do_get, merge_results=True)459 return self._map_legacy_model_list(models, do_get, merge_results=True)
460
461# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
460462
=== modified file 'openerp/addons/base/ir/osv_memory_autovacuum.py'
--- openerp/addons/base/ir/osv_memory_autovacuum.py 2011-09-24 02:59:51 +0000
+++ openerp/addons/base/ir/osv_memory_autovacuum.py 2011-11-22 09:05:13 +0000
@@ -31,3 +31,5 @@
31 model._transient_vacuum(cr, uid)31 model._transient_vacuum(cr, uid)
32 return True32 return True
3333
34
35# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3436
=== modified file 'openerp/addons/base/ir/wizard/wizard_screen.py'
--- openerp/addons/base/ir/wizard/wizard_screen.py 2011-01-04 10:13:35 +0000
+++ openerp/addons/base/ir/wizard/wizard_screen.py 2011-11-22 09:05:13 +0000
@@ -49,4 +49,5 @@
49 _defaults = {49 _defaults = {
50 'config_logo': _get_image50 'config_logo': _get_image
51 }51 }
52wizard_screen()
53\ No newline at end of file52\ No newline at end of file
53wizard_screen()
54# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
5455
=== modified file 'openerp/addons/base/module/__init__.py'
--- openerp/addons/base/module/__init__.py 2010-09-27 14:13:44 +0000
+++ openerp/addons/base/module/__init__.py 2011-11-22 09:05:13 +0000
@@ -22,3 +22,5 @@
22import module22import module
23import wizard23import wizard
24import report24import report
25
26# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2527
=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py 2011-11-07 15:19:49 +0000
+++ openerp/addons/base/module/module.py 2011-11-22 09:05:13 +0000
@@ -707,3 +707,5 @@
707 ], string='State', readonly=True, select=True),707 ], string='State', readonly=True, select=True),
708 }708 }
709module_dependency()709module_dependency()
710
711# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
710712
=== modified file 'openerp/addons/base/module/wizard/base_import_language.py'
--- openerp/addons/base/module/wizard/base_import_language.py 2011-09-19 21:13:10 +0000
+++ openerp/addons/base/module/wizard/base_import_language.py 2011-11-22 09:05:13 +0000
@@ -68,3 +68,5 @@
68 return {}68 return {}
6969
70base_language_import()70base_language_import()
71
72# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
7173
=== modified file 'openerp/addons/base/module/wizard/base_module_scan.py'
--- openerp/addons/base/module/wizard/base_module_scan.py 2010-10-04 14:33:36 +0000
+++ openerp/addons/base/module/wizard/base_module_scan.py 2011-11-22 09:05:13 +0000
@@ -70,4 +70,5 @@
70 mod_obj.write(cr, uid, [mod['id']], {'state': 'uninstalled'})70 mod_obj.write(cr, uid, [mod['id']], {'state': 'uninstalled'})
71 return {}71 return {}
7272
73base_module_scan()
74\ No newline at end of file73\ No newline at end of file
74base_module_scan()
75# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
7576
=== modified file 'openerp/addons/base/module/wizard/base_module_upgrade.py'
--- openerp/addons/base/module/wizard/base_module_upgrade.py 2011-03-23 12:12:04 +0000
+++ openerp/addons/base/module/wizard/base_module_upgrade.py 2011-11-22 09:05:13 +0000
@@ -116,3 +116,5 @@
116 return self.pool.get('res.config').next(cr, uid, [], context=context)116 return self.pool.get('res.config').next(cr, uid, [], context=context)
117117
118base_module_upgrade()118base_module_upgrade()
119
120# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
119121
=== modified file 'openerp/addons/base/module/wizard/base_update_translations.py'
--- openerp/addons/base/module/wizard/base_update_translations.py 2011-01-06 13:06:54 +0000
+++ openerp/addons/base/module/wizard/base_update_translations.py 2011-11-22 09:05:13 +0000
@@ -72,3 +72,5 @@
72 }72 }
7373
74base_update_translations()74base_update_translations()
75
76# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
7577
=== modified file 'openerp/addons/base/report/__init__.py'
--- openerp/addons/base/report/__init__.py 2011-07-06 12:55:41 +0000
+++ openerp/addons/base/report/__init__.py 2011-11-22 09:05:13 +0000
@@ -1,1 +1,3 @@
1import preview_report1import preview_report
2
3# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
24
=== modified file 'openerp/addons/base/res/res_bank.py'
--- openerp/addons/base/res/res_bank.py 2011-11-07 15:19:49 +0000
+++ openerp/addons/base/res/res_bank.py 2011-11-22 09:05:13 +0000
@@ -225,3 +225,5 @@
225res_partner_bank()225res_partner_bank()
226226
227227
228
229# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
228230
=== modified file 'openerp/addons/base/res/res_log.py'
--- openerp/addons/base/res/res_log.py 2011-11-07 15:19:49 +0000
+++ openerp/addons/base/res/res_log.py 2011-11-22 09:05:13 +0000
@@ -76,3 +76,5 @@
76 return result76 return result
7777
78res_log()78res_log()
79
80# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
7981
=== modified file 'openerp/addons/base/res/res_widget.py'
--- openerp/addons/base/res/res_widget.py 2011-05-27 10:30:02 +0000
+++ openerp/addons/base/res/res_widget.py 2011-11-22 09:05:13 +0000
@@ -84,3 +84,5 @@
8484
85res_widget_wizard()85res_widget_wizard()
8686
87
88# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
8789
=== modified file 'openerp/addons/base/res/test/res_lang.py'
--- openerp/addons/base/res/test/res_lang.py 2011-05-16 09:03:12 +0000
+++ openerp/addons/base/res/test/res_lang.py 2011-11-22 09:05:13 +0000
@@ -10,3 +10,5 @@
10import openerp.addons.base.res.res_lang as res_lang10import openerp.addons.base.res.res_lang as res_lang
11res_lang._group_examples()11res_lang._group_examples()
1212
13
14# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1315
=== modified file 'openerp/addons/base/res/wizard/partner_wizard_ean_check.py'
--- openerp/addons/base/res/wizard/partner_wizard_ean_check.py 2010-08-25 11:36:24 +0000
+++ openerp/addons/base/res/wizard/partner_wizard_ean_check.py 2011-11-22 09:05:13 +0000
@@ -74,4 +74,5 @@
74 })74 })
75 return {}75 return {}
7676
77partner_wizard_ean_check()
78\ No newline at end of file77\ No newline at end of file
78partner_wizard_ean_check()
79# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
7980
=== modified file 'openerp/report/preprocess.py'
--- openerp/report/preprocess.py 2011-09-20 12:04:36 +0000
+++ openerp/report/preprocess.py 2011-11-22 09:05:13 +0000
@@ -100,3 +100,5 @@
100 result = a.preprocess_rml(node)100 result = a.preprocess_rml(node)
101 print etree.tostring(result)101 print etree.tostring(result)
102102
103
104# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
103105
=== modified file 'openerp/report/pyPdf/__init__.py'
--- openerp/report/pyPdf/__init__.py 2011-06-23 09:04:57 +0000
+++ openerp/report/pyPdf/__init__.py 2011-11-22 09:05:13 +0000
@@ -3,3 +3,5 @@
33
4__all__ = ["pdf"]4__all__ = ["pdf"]
55
6
7# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
68
=== modified file 'openerp/report/pyPdf/xmp.py'
--- openerp/report/pyPdf/xmp.py 2011-01-06 11:14:00 +0000
+++ openerp/report/pyPdf/xmp.py 2011-11-22 09:05:13 +0000
@@ -353,3 +353,5 @@
353 custom_properties = property(custom_properties)353 custom_properties = property(custom_properties)
354354
355355
356
357# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
356358
=== modified file 'openerp/report/render/html2html/html2html.py'
--- openerp/report/render/html2html/html2html.py 2011-02-07 12:57:23 +0000
+++ openerp/report/render/html2html/html2html.py 2011-11-22 09:05:13 +0000
@@ -93,3 +93,5 @@
93 root = r.url_modify(root)93 root = r.url_modify(root)
94 return root94 return root
9595
96
97# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
9698
=== modified file 'openerp/report/render/makohtml2html/__init__.py'
--- openerp/report/render/makohtml2html/__init__.py 2011-06-23 09:04:57 +0000
+++ openerp/report/render/makohtml2html/__init__.py 2011-11-22 09:05:13 +0000
@@ -23,3 +23,5 @@
2323
24#.apidoc title: MAKO to HTML engine24#.apidoc title: MAKO to HTML engine
2525
26
27# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2628
=== modified file 'openerp/report/render/makohtml2html/makohtml2html.py'
--- openerp/report/render/makohtml2html/makohtml2html.py 2011-02-07 12:57:23 +0000
+++ openerp/report/render/makohtml2html/makohtml2html.py 2011-11-22 09:05:13 +0000
@@ -131,3 +131,5 @@
131def parseNode(html, localcontext = {}):131def parseNode(html, localcontext = {}):
132 r = makohtml2html(html, localcontext)132 r = makohtml2html(html, localcontext)
133 return r.render()133 return r.render()
134
135# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
134136
=== modified file 'openerp/report/render/odt2odt/odt2odt.py'
--- openerp/report/render/odt2odt/odt2odt.py 2011-02-07 12:57:23 +0000
+++ openerp/report/render/odt2odt/odt2odt.py 2011-11-22 09:05:13 +0000
@@ -53,3 +53,5 @@
53 r = odt2odt(node, localcontext)53 r = odt2odt(node, localcontext)
54 return r.render()54 return r.render()
5555
56
57# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
5658
=== modified file 'openerp/report/render/rml2pdf/__init__.py'
--- openerp/report/render/rml2pdf/__init__.py 2011-06-23 09:04:57 +0000
+++ openerp/report/render/rml2pdf/__init__.py 2011-11-22 09:05:13 +0000
@@ -23,3 +23,5 @@
2323
24#.apidoc title: RML to PDF engine24#.apidoc title: RML to PDF engine
2525
26
27# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2628
=== modified file 'openerp/report/render/rml2pdf/customfonts.py'
--- openerp/report/render/rml2pdf/customfonts.py 2011-06-23 09:04:57 +0000
+++ openerp/report/render/rml2pdf/customfonts.py 2011-11-22 09:05:13 +0000
@@ -150,3 +150,5 @@
150 return True150 return True
151151
152#eof152#eof
153
154# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
153155
=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
--- openerp/report/render/rml2pdf/trml2pdf.py 2011-11-21 13:33:46 +0000
+++ openerp/report/render/rml2pdf/trml2pdf.py 2011-11-22 09:05:13 +0000
@@ -1015,3 +1015,5 @@
1015 print 'Usage: trml2pdf input.rml >output.pdf'1015 print 'Usage: trml2pdf input.rml >output.pdf'
1016 print 'Try \'trml2pdf --help\' for more information.'1016 print 'Try \'trml2pdf --help\' for more information.'
10171017
1018
1019# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
10181020
=== modified file 'openerp/report/report_sxw.py'
--- openerp/report/report_sxw.py 2011-09-21 23:21:50 +0000
+++ openerp/report/report_sxw.py 2011-11-22 09:05:13 +0000
@@ -656,3 +656,5 @@
656 html = create_doc(mako_html,html_parser.localcontext)656 html = create_doc(mako_html,html_parser.localcontext)
657 return (html,'html')657 return (html,'html')
658658
659
660# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
659661
=== modified file 'openerp/run_tests.py'
--- openerp/run_tests.py 2010-10-01 16:54:11 +0000
+++ openerp/run_tests.py 2011-11-22 09:05:13 +0000
@@ -25,3 +25,5 @@
2525
26if __name__ == '__main__':26if __name__ == '__main__':
27 unittest.TextTestRunner(verbosity=2).run(unittest.defaultTestLoader.loadTestsFromModule(test))27 unittest.TextTestRunner(verbosity=2).run(unittest.defaultTestLoader.loadTestsFromModule(test))
28
29# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2830
=== modified file 'openerp/service/http_server.py'
--- openerp/service/http_server.py 2011-09-25 17:08:27 +0000
+++ openerp/service/http_server.py 2011-11-22 09:05:13 +0000
@@ -183,3 +183,5 @@
183 raise AuthRequiredExc(atype='Basic', realm=self.realm)183 raise AuthRequiredExc(atype='Basic', realm=self.realm)
184184
185#eof185#eof
186
187# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
186188
=== modified file 'openerp/service/netrpc_server.py'
--- openerp/service/netrpc_server.py 2011-09-29 07:17:13 +0000
+++ openerp/service/netrpc_server.py 2011-11-22 09:05:13 +0000
@@ -153,3 +153,5 @@
153 netrpcd = TinySocketServerThread(153 netrpcd = TinySocketServerThread(
154 tools.config.get('netrpc_interface', ''), 154 tools.config.get('netrpc_interface', ''),
155 int(tools.config.get('netrpc_port', 8070)))155 int(tools.config.get('netrpc_port', 8070)))
156
157# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
156158
=== modified file 'openerp/service/security.py'
--- openerp/service/security.py 2011-09-26 12:53:58 +0000
+++ openerp/service/security.py 2011-11-22 09:05:13 +0000
@@ -40,3 +40,5 @@
40 pool = pooler.get_pool(db)40 pool = pooler.get_pool(db)
41 user_obj = pool.get('res.users')41 user_obj = pool.get('res.users')
42 return user_obj.check(db, uid, passwd)42 return user_obj.check(db, uid, passwd)
43
44# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4345
=== modified file 'openerp/service/websrv_lib.py'
--- openerp/service/websrv_lib.py 2011-09-25 17:08:27 +0000
+++ openerp/service/websrv_lib.py 2011-11-22 09:05:13 +0000
@@ -232,3 +232,5 @@
232 """232 """
233 return opts233 return opts
234234
235
236# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
235237
=== modified file 'openerp/test/__init__.py'
--- openerp/test/__init__.py 2010-11-16 12:43:28 +0000
+++ openerp/test/__init__.py 2011-11-22 09:05:13 +0000
@@ -21,3 +21,5 @@
2121
22from test_osv import *22from test_osv import *
23from test_translate import *23from test_translate import *
24
25# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2426
=== modified file 'openerp/test/test_osv.py'
--- openerp/test/test_osv.py 2011-02-07 12:57:23 +0000
+++ openerp/test/test_osv.py 2011-11-22 09:05:13 +0000
@@ -62,3 +62,5 @@
62 query.tables.append('"product_product"')62 query.tables.append('"product_product"')
63 self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)63 self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)
6464
65
66# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
6567
=== modified file 'openerp/test/test_translate.py'
--- openerp/test/test_translate.py 2011-02-07 12:57:23 +0000
+++ openerp/test/test_translate.py 2011-11-22 09:05:13 +0000
@@ -46,3 +46,5 @@
46 \\\\nope\n\n"46 \\\\nope\n\n"
47 """)47 """)
4848
49
50# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4951
=== modified file 'openerp/tiny_socket.py'
--- openerp/tiny_socket.py 2011-06-23 09:03:57 +0000
+++ openerp/tiny_socket.py 2011-11-22 09:05:13 +0000
@@ -96,3 +96,5 @@
96 raise res[0]96 raise res[0]
97 else:97 else:
98 return res[0]98 return res[0]
99
100# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
99101
=== modified file 'openerp/tools/amount_to_text_en.py'
--- openerp/tools/amount_to_text_en.py 2011-06-23 09:03:11 +0000
+++ openerp/tools/amount_to_text_en.py 2011-11-22 09:05:13 +0000
@@ -126,3 +126,5 @@
126 else:126 else:
127 print int_to_text(int(argv[1]), lang)127 print int_to_text(int(argv[1]), lang)
128128
129
130# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
129131
=== modified file 'openerp/tools/cache.py'
--- openerp/tools/cache.py 2011-08-30 12:15:41 +0000
+++ openerp/tools/cache.py 2011-11-22 09:05:13 +0000
@@ -135,3 +135,5 @@
135135
136# For backward compatibility136# For backward compatibility
137cache = ormcache137cache = ormcache
138
139# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
138140
=== modified file 'openerp/tools/config.py'
--- openerp/tools/config.py 2011-10-14 09:36:26 +0000
+++ openerp/tools/config.py 2011-11-22 09:05:13 +0000
@@ -601,3 +601,5 @@
601601
602config = configmanager()602config = configmanager()
603603
604
605# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
604606
=== modified file 'openerp/tools/convert.py'
--- openerp/tools/convert.py 2011-10-10 14:22:26 +0000
+++ openerp/tools/convert.py 2011-11-22 09:05:13 +0000
@@ -999,3 +999,5 @@
999 obj.parse(doc.getroot())999 obj.parse(doc.getroot())
1000 return True1000 return True
10011001
1002
1003# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
10021004
=== modified file 'openerp/tools/copy.py'
--- openerp/tools/copy.py 2010-07-22 13:54:36 +0000
+++ openerp/tools/copy.py 2011-11-22 09:05:13 +0000
@@ -437,3 +437,5 @@
437437
438if __name__ == '__main__':438if __name__ == '__main__':
439 _test()439 _test()
440
441# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
440442
=== modified file 'openerp/tools/func.py'
--- openerp/tools/func.py 2011-06-23 09:03:11 +0000
+++ openerp/tools/func.py 2011-11-22 09:05:13 +0000
@@ -118,3 +118,5 @@
118 return (fname, lineno)118 return (fname, lineno)
119 except Exception:119 except Exception:
120 return ("<unknown>", '')120 return ("<unknown>", '')
121
122# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
121123
=== modified file 'openerp/tools/lru.py'
--- openerp/tools/lru.py 2011-06-08 03:03:30 +0000
+++ openerp/tools/lru.py 2011-11-22 09:05:13 +0000
@@ -118,3 +118,5 @@
118 self.d = {}118 self.d = {}
119 self.first = None119 self.first = None
120 self.last = None120 self.last = None
121
122# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
121123
=== modified file 'openerp/tools/osutil.py'
--- openerp/tools/osutil.py 2009-10-20 10:52:23 +0000
+++ openerp/tools/osutil.py 2011-11-22 09:05:13 +0000
@@ -60,3 +60,5 @@
60if __name__ == '__main__':60if __name__ == '__main__':
61 from pprint import pprint as pp61 from pprint import pprint as pp
62 pp(listdir('../report', True))62 pp(listdir('../report', True))
63
64# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
6365
=== modified file 'openerp/tools/parse_version.py'
--- openerp/tools/parse_version.py 2009-10-20 10:52:23 +0000
+++ openerp/tools/parse_version.py 2011-11-22 09:05:13 +0000
@@ -99,3 +99,5 @@
99 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)99 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)
100 chk(('5.0.0-0_rc3', '5.0.0-1dev', '5.0.0-1'), False) 100 chk(('5.0.0-0_rc3', '5.0.0-1dev', '5.0.0-1'), False)
101 101
102
103# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
102104
=== modified file 'openerp/tools/test_config.py'
--- openerp/tools/test_config.py 2011-06-01 11:50:55 +0000
+++ openerp/tools/test_config.py 2011-11-22 09:05:13 +0000
@@ -44,3 +44,5 @@
44conf.parse_config(['-c', config_file_00, '--osv-memory-age-limit=2.3'])44conf.parse_config(['-c', config_file_00, '--osv-memory-age-limit=2.3'])
4545
46assert conf['osv_memory_age_limit'] == 2.346assert conf['osv_memory_age_limit'] == 2.3
47
48# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4749
=== modified file 'openerp/tools/test_reports.py'
--- openerp/tools/test_reports.py 2011-02-07 12:57:23 +0000
+++ openerp/tools/test_reports.py 2011-11-22 09:05:13 +0000
@@ -307,3 +307,5 @@
307 return True307 return True
308308
309#eof309#eof
310
311# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
310312
=== modified file 'openerp/tools/which.py'
--- openerp/tools/which.py 2011-06-23 09:03:12 +0000
+++ openerp/tools/which.py 2011-11-22 09:05:13 +0000
@@ -151,3 +151,5 @@
151if __name__ == '__main__':151if __name__ == '__main__':
152 import doctest152 import doctest
153 doctest.testmod()153 doctest.testmod()
154
155# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
154156
=== modified file 'openerp/tools/yaml_tag.py'
--- openerp/tools/yaml_tag.py 2011-11-14 21:26:27 +0000
+++ openerp/tools/yaml_tag.py 2011-11-22 09:05:13 +0000
@@ -182,3 +182,5 @@
182 yaml.add_constructor(u"!ir_set", ir_set_constructor)182 yaml.add_constructor(u"!ir_set", ir_set_constructor)
183add_constructors()183add_constructors()
184184
185
186# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
185187
=== modified file 'setup.py'
--- setup.py 2011-10-06 02:18:41 +0000
+++ setup.py 2011-11-22 09:05:13 +0000
@@ -111,3 +111,5 @@
111 **py2exe_options()111 **py2exe_options()
112)112)
113113
114
115# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
114116
=== modified file 'tests/__init__.py'
--- tests/__init__.py 2011-09-23 13:34:08 +0000
+++ tests/__init__.py 2011-11-22 09:05:13 +0000
@@ -1,2 +1,4 @@
1# -*- coding: utf-8 -*-1# -*- coding: utf-8 -*-
2import test_xmlrpc2import test_xmlrpc
3
4# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
35
=== modified file 'tests/common.py'
--- tests/common.py 2011-10-03 09:33:55 +0000
+++ tests/common.py 2011-11-22 09:05:13 +0000
@@ -61,3 +61,5 @@
61def tearDownModule():61def tearDownModule():
62 """ Shutdown the OpenERP server similarly to a single ctrl-c. """62 """ Shutdown the OpenERP server similarly to a single ctrl-c. """
63 openerp.service.stop_services()63 openerp.service.stop_services()
64
65# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
6466
=== modified file 'tests/test_ir_sequence.py'
--- tests/test_ir_sequence.py 2011-09-28 15:17:04 +0000
+++ tests/test_ir_sequence.py 2011-11-22 09:05:13 +0000
@@ -196,3 +196,5 @@
196if __name__ == '__main__':196if __name__ == '__main__':
197 unittest2.main()197 unittest2.main()
198198
199
200# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
199201
=== modified file 'tests/test_orm.py'
--- tests/test_orm.py 2011-10-11 08:57:15 +0000
+++ tests/test_orm.py 2011-11-22 09:05:13 +0000
@@ -173,3 +173,5 @@
173 self.partner.resolve_o2m_commands_to_record_dicts(173 self.partner.resolve_o2m_commands_to_record_dicts(
174 self.cr, UID, 'address', [REPLACE_WITH([42])], ['name'])174 self.cr, UID, 'address', [REPLACE_WITH([42])], ['name'])
175175
176
177# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
176178
=== modified file 'tests/test_xmlrpc.py'
--- tests/test_xmlrpc.py 2011-10-03 09:33:55 +0000
+++ tests/test_xmlrpc.py 2011-11-22 09:05:13 +0000
@@ -64,3 +64,5 @@
64if __name__ == '__main__':64if __name__ == '__main__':
65 unittest2.main()65 unittest2.main()
6666
67
68# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: