fixup! [IMP] snippets: preserve same file module

Author: cawo-odoo

src/util/misc.py

@@ -4,14 +4,19 @@
 import collections
 import datetime
 import functools
+import hashlib
+import inspect
 import logging
 import os
 import re
+import sys
 import textwrap
 import uuid
 from contextlib import contextmanager
 from itertools import chain, islice
 
+from .exceptions import MigrationError
+
 try:
     from odoo import release
     from odoo.modules.module import get_module_path
@@ -388,6 +393,30 @@ def log(chunk_num, size=chunk_size):
         log(i // chunk_size + 1, i % chunk_size)
 
 
+def make_pickleable_callback(callback):
+    """
+    .. noautodoc::
+    Make a callable importable.
+
+    `ProcessPoolExecutor.map` arguments needs to be pickleable
+    Functions can only be pickled if they are importable.
+    However, the callback's file is not importable due to the dash in the filename.
+    We should then put the executed function in its own importable file.
+    """
+    callback_filepath = inspect.getfile(callback)
+    name = "_upgrade_" + hashlib.sha256(callback_filepath.encode()).hexdigest()
+    if name not in sys.modules:
+        sys.modules[name] = import_script(callback_filepath, name=name)
+    try:
+        return getattr(sys.modules[name], callback.__name__)
+    except AttributeError:
+        error_msg = (
+            "The converter callback `{}` is a nested function in `{}`.\n"
+            "Move it outside the `migrate()` function to make it top-level."
+        ).format(callback.__name__, callback.__module__)
+        raise MigrationError(error_msg) from None
+
+
 class SelfPrint(object):
     """
     Class that will return a self representing string. Used to evaluate domains.

src/util/snippets.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-import hashlib
-import inspect
 import logging
 import re
-import sys
 from concurrent.futures import ProcessPoolExecutor
 
 from lxml import etree, html
@@ -12,9 +9,8 @@
 from psycopg2.extras import Json
 
 from .const import NEARLYWARN
-from .exceptions import MigrationError
 from .helpers import table_of_model
-from .misc import import_script, log_progress
+from .misc import log_progress, make_pickleable_callback
 from .pg import column_exists, column_type, get_max_workers, table_exists
 
 _logger = logging.getLogger(__name__)
@@ -161,29 +157,6 @@ def html_converter(transform_callback, selector=None):
     return HTMLConverter(make_pickleable_callback(transform_callback), selector)
 
 
-def make_pickleable_callback(callback):
-    """
-    Make a callable importable.
-
-    `ProcessPoolExecutor.map` arguments needs to be pickleable
-    Functions can only be pickled if they are importable.
-    However, the callback's file is not importable due to the dash in the filename.
-    We should then put the executed function in its own importable file.
-    """
-    callback_filepath = inspect.getfile(callback)
-    name = f"_upgrade_{hashlib.sha256(callback_filepath.encode()).hexdigest()}"
-    if name not in sys.modules:
-        sys.modules[name] = import_script(callback_filepath, name=name)
-    try:
-        return getattr(sys.modules[name], callback.__name__)
-    except AttributeError:
-        error_msg = (
-            f"The converter callback `{callback.__name__}` is a nested function in `{callback.__module__}`.\n"
-            "Move it outside the `migrate()` function to make it top-level."
-        )
-        raise MigrationError(error_msg) from None
-
-
 class BaseConverter:
     def __init__(self, callback, selector=None):
         self.callback = callback