Skip to content

Simplify migration calling, fix breakpoint use #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hbrunn merged 1 commit into from
Jun 4, 2014
Merged

Simplify migration calling, fix breakpoint use #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions openerp/modules/migration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,14 @@ def mergedict(a, b):
name, ext = os.path.splitext(os.path.basename(pyfile))
if ext.lower() != '.py':
continue
mod = fp = fp2 = None
# OpenUpgrade edit start:
# Removed a copy of migration script to temp directory
# Replaced call to load_source with load_module so frame isn't lost and breakpoints can be set
mod = fp = None
try:
fp = tools.file_open(pyfile)

# imp.load_source need a real file object, so we create
# one from the file-like object we get from file_open
fp2 = os.tmpfile()
fp2.write(fp.read())
fp2.seek(0)
fp, pathname = tools.file_open(pyfile, pathinfo=True)
try:
mod = imp.load_source(name, pyfile, fp2)
mod = imp.load_module(name, fp, pathname, ('.py', 'r', imp.PY_SOURCE))
_logger.info('module %(addon)s: Running migration %(version)s %(name)s',
mergedict({'name': mod.__name__}, strfmt))
except ImportError:
Expand All @@ -186,10 +183,9 @@ def mergedict(a, b):
finally:
if fp:
fp.close()
if fp2:
fp2.close()
if mod:
del mod
# OpenUpgrade edit end


# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: