odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] warnings in module.pyfix ordering and grouping of imports 

bzr revid: xmo@openerp.com-20100929065441-3xdi5tkbh71qole8
This commit is contained in:
Xavier Morel 2010-09-29 08:54:41 +02:00
parent 16e73105c1
commit 9d8bbcbb60
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bin/addons/base/module/module.py
View File

@ -19,27 +19,24 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
import tarfile
import re
import urllib
import os
import imp import imp
import logging import logging
import tools import os
from osv import fields, osv, orm import re
import zipfile import urllib
import release
import zipimport import zipimport
import wizard
import addons import addons
import pooler
import netsvc import netsvc
import pooler
import release
import tools
from tools.parse_version import parse_version from tools.parse_version import parse_version
from tools.translate import _ from tools.translate import _
from osv import fields, osv, orm
class module_category(osv.osv): class module_category(osv.osv):
_name = "ir.module.category" _name = "ir.module.category"
_description = "Module Category" _description = "Module Category"
@ -126,7 +123,7 @@ class module(osv.osv):
res[mnames[data_id.module]]['menus_by_module'] += m.complete_name + '\n' res[mnames[data_id.module]]['menus_by_module'] += m.complete_name + '\n'
except: except:
pass pass
except KeyError, e: except KeyError:
pass pass
return res return res
@ -393,7 +390,7 @@ class module(osv.osv):
fp = file(fname, 'wb') fp = file(fname, 'wb')
fp.write(zipfile) fp.write(zipfile)
fp.close() fp.close()
except Exception, e: except Exception:
raise orm.except_orm(_('Error'), _('Can not create the module file:\n %s') % (fname,)) raise orm.except_orm(_('Error'), _('Can not create the module file:\n %s') % (fname,))
terp = self.get_module_info(mod.name) terp = self.get_module_info(mod.name)
self.write(cr, uid, mod.id, self.get_values_from_terp(terp)) self.write(cr, uid, mod.id, self.get_values_from_terp(terp))