diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2011-09-15 12:21:17 +0200 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2011-09-15 12:21:17 +0200 |
| commit | 9b903321e7faebc8fd039340da93b2b89a8f71d2 (patch) | |
| tree | aae8d989ffe788103fabf71afaf90f9a5343b101 | |
| parent | 8d6f3158912d0d03df99439fd722d2823f3ec4fb (diff) | |
| parent | b9d6c895791789ccbc6197adb6fe1806a5e97cc0 (diff) | |
[MERGE] base: rename zipfile variable into zip_content (because zipname is an imported module).
lp bug: https://launchpad.net/bugs/795452 fixed
bzr revid: vmt@openerp.com-20110915102117-sep3t0itkjjmertz
| -rw-r--r-- | openerp/addons/base/module/module.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 034829b82b5..91801b0b1c5 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -437,11 +437,11 @@ class module(osv.osv): res.append(mod.url) if not download: continue - zipfile = urllib.urlopen(mod.url).read() + zip_content = urllib.urlopen(mod.url).read() fname = addons.get_module_path(str(mod.name)+'.zip', downloaded=True) try: fp = file(fname, 'wb') - fp.write(zipfile) + fp.write(zip_content) fp.close() except Exception: self.__logger.exception('Error when trying to create module ' |