ENH: Sort __globals__ dict to make pickle string more deterministic

effigies · effigies · commit a2237d395a4b · 2021-04-21T10:56:36.000-04:00
diff --git a/cloudpickle/cloudpickle_fast.py b/cloudpickle/cloudpickle_fast.py
@@ -155,8 +155,8 @@ def _function_getstate(func):
     }
 
     f_globals_ref = _extract_code_globals(func.__code__)
-    f_globals = {k: func.__globals__[k] for k in f_globals_ref if k in
-                 func.__globals__}
+    f_globals = {k: func.__globals__[k] for k in sorted(f_globals_ref)
+                 if k in func.__globals__}
 
     closure_values = (
         list(map(_get_cell_contents, func.__closure__))

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ def _function_getstate(func):`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`f_globals_ref = _extract_code_globals(func.__code__)`
`158`		`- f_globals = {k: func.__globals__[k] for k in f_globals_ref if k in`
`159`		`- func.__globals__}`
	`158`	`+ f_globals = {k: func.__globals__[k] for k in sorted(f_globals_ref)`
	`159`	`+ if k in func.__globals__}`
`160`	`160`
`161`	`161`	`closure_values = (`
`162`	`162`	`list(map(_get_cell_contents, func.__closure__))`