ENH move override_existing_globals to state

cloudpickle/cloudpickle.py

@@ -585,13 +585,13 @@ def save_function_tuple(self, func):
             'module': func.__module__,
             'name': func.__name__,
             'doc': func.__doc__,
+            'override_existing_globals': self.override_existing_globals
         }
         if hasattr(func, '__annotations__') and sys.version_info >= (3, 7):
             state['annotations'] = func.__annotations__
         if hasattr(func, '__qualname__'):
             state['qualname'] = func.__qualname__
         save(state)
-        save(self.override_existing_globals)
         write(pickle.TUPLE)
         write(pickle.REDUCE)  # applies _fill_function on the tuple
 
@@ -1058,14 +1058,9 @@ def _fill_function(*args):
 
     The skeleton itself is create by _make_skel_func().
     """
-    override_existing_globals = True
     if len(args) == 2:
         func = args[0]
         state = args[1]
-    elif len(args) == 3:
-        func = args[0]
-        state = args[1]
-        override_existing_globals = args[2]
     elif len(args) == 5:
         # Backwards compat for cloudpickle v0.4.0, after which the `module`
         # argument was introduced
@@ -1083,7 +1078,7 @@ def _fill_function(*args):
 
     # This updates the variables of func's module using func's globals from the
     # time at which it was pickled.
-    if override_existing_globals:
+    if state.get('override_existing_globals', True):
         func.__globals__.update(state['globals'])
     else:
         for k, v in state['globals'].items():