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

Proposed by Numérigraphe
Status: Merged
Merged at revision: 2009
Proposed branch: lp:~numerigraphe/openobject-client/trunk-vim
Merge into: lp:openobject-client
Diff against target: 119 lines (+24/-0)
12 files modified
bin/environment_info.py (+2/-0)
bin/tools/user_locale_format.py (+2/-0)
bin/tools/win32.py (+2/-0)
bin/widget/view/form_gtk/button.py (+2/-0)
bin/widget/view/form_gtk/pager.py (+2/-0)
bin/widget/view/form_gtk/progressbar.py (+2/-0)
bin/widget/view/form_gtk/wid_common.py (+2/-0)
bin/widget/view/list.py (+2/-0)
bin/widget_search/filter.py (+2/-0)
msgfmt.py (+2/-0)
mydistutils.py (+2/-0)
setup.py (+2/-0)
To merge this branch: bzr merge lp:~numerigraphe/openobject-client/trunk-vim
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+82985@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], although this time there was nothing to fix manually in your MP :-)

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 'bin/environment_info.py'
--- bin/environment_info.py 2010-08-10 11:48:52 +0000
+++ bin/environment_info.py 2011-11-22 09:11:24 +0000
@@ -114,3 +114,5 @@
114 sys.exit(1)114 sys.exit(1)
115 else:115 else:
116 parser.get_with_server_info()116 parser.get_with_server_info()
117
118# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
117119
=== modified file 'bin/tools/user_locale_format.py'
--- bin/tools/user_locale_format.py 2011-01-31 10:28:17 +0000
+++ bin/tools/user_locale_format.py 2011-11-22 09:11:24 +0000
@@ -224,3 +224,5 @@
224 if func == int:224 if func == int:
225 type = 'integer'225 type = 'integer'
226 raise ValueError("%r does not represent a valid %s value" % (string,type))226 raise ValueError("%r does not represent a valid %s value" % (string,type))
227
228# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
227229
=== modified file 'bin/tools/win32.py'
--- bin/tools/win32.py 2010-04-26 14:05:54 +0000
+++ bin/tools/win32.py 2011-11-22 09:11:24 +0000
@@ -64,3 +64,5 @@
64 widget_class "*" style "openerp-user-font"64 widget_class "*" style "openerp-user-font"
65 ''' % (font_name, font_size)65 ''' % (font_name, font_size)
66 return font_style66 return font_style
67
68# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
6769
=== modified file 'bin/widget/view/form_gtk/button.py'
--- bin/widget/view/form_gtk/button.py 2010-12-13 15:45:20 +0000
+++ bin/widget/view/form_gtk/button.py 2011-11-22 09:11:24 +0000
@@ -47,3 +47,5 @@
47 _('The content of the widget or ValueError if not valid'))47 _('The content of the widget or ValueError if not valid'))
4848
4949
50
51# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
5052
=== modified file 'bin/widget/view/form_gtk/pager.py'
--- bin/widget/view/form_gtk/pager.py 2011-04-13 10:36:24 +0000
+++ bin/widget/view/form_gtk/pager.py 2011-11-22 09:11:24 +0000
@@ -157,3 +157,5 @@
157157
158158
159159
160
161# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
160162
=== modified file 'bin/widget/view/form_gtk/progressbar.py'
--- bin/widget/view/form_gtk/progressbar.py 2011-04-20 09:31:42 +0000
+++ bin/widget/view/form_gtk/progressbar.py 2011-11-22 09:11:24 +0000
@@ -45,3 +45,5 @@
45 def set_value(self, *args, **argv):45 def set_value(self, *args, **argv):
46 pass46 pass
4747
48
49# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4850
=== modified file 'bin/widget/view/form_gtk/wid_common.py'
--- bin/widget/view/form_gtk/wid_common.py 2011-10-19 08:37:33 +0000
+++ bin/widget/view/form_gtk/wid_common.py 2011-11-22 09:11:24 +0000
@@ -70,3 +70,5 @@
70 rpc.session.rpc_exec_auth('/object', 'execute', 'ir.values', 'set', 'default', deps, field, [(model,False)], value, True, False, False, radio.get_active(), True)70 rpc.session.rpc_exec_auth('/object', 'execute', 'ir.values', 'set', 'default', deps, field, [(model,False)], value, True, False, False, radio.get_active(), True)
71 return True71 return True
72 return False72 return False
73
74# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
7375
=== modified file 'bin/widget/view/list.py'
--- bin/widget/view/list.py 2011-09-22 09:48:53 +0000
+++ bin/widget/view/list.py 2011-11-22 09:11:24 +0000
@@ -946,3 +946,5 @@
946 if len(values) < 1:946 if len(values) < 1:
947 return final_path947 return final_path
948948
949
950# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
949951
=== modified file 'bin/widget_search/filter.py'
--- bin/widget_search/filter.py 2011-09-22 06:45:44 +0000
+++ bin/widget_search/filter.py 2011-11-22 09:11:24 +0000
@@ -79,3 +79,5 @@
79 _('The content of the widget or ValueError if not valid'))79 _('The content of the widget or ValueError if not valid'))
8080
8181
82
83# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
8284
=== modified file 'msgfmt.py'
--- msgfmt.py 2011-05-06 15:22:17 +0000
+++ msgfmt.py 2011-11-22 09:11:24 +0000
@@ -204,3 +204,5 @@
204204
205if __name__ == '__main__':205if __name__ == '__main__':
206 main()206 main()
207
208# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
207209
=== modified file 'mydistutils.py'
--- mydistutils.py 2011-05-06 15:22:17 +0000
+++ mydistutils.py 2011-11-22 09:11:24 +0000
@@ -198,3 +198,5 @@
198198
199199
200#eof200#eof
201
202# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
201203
=== modified file 'setup.py'
--- setup.py 2011-11-21 12:18:00 +0000
+++ setup.py 2011-11-22 09:11:24 +0000
@@ -243,3 +243,5 @@
243 z.write(os.path.join(absdir, f), os.path.join(zip_dir, f))243 z.write(os.path.join(absdir, f), os.path.join(zip_dir, f))
244244
245 z.close()245 z.close()
246
247# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: