##// END OF EJS Templates
Fix regression in embed() from pull-request #2096....
Bradley M. Froehle -
Show More
@@ -200,7 +200,8 b' class InteractiveShellEmbed(TerminalInteractiveShell):'
200 module.__dict__ = global_ns
200 module.__dict__ = global_ns
201
201
202 # Get locals and globals from caller
202 # Get locals and globals from caller
203 if (local_ns is None or module is None) and self.default_user_namespaces:
203 if ((local_ns is None or module is None or compile_flags is None)
204 and self.default_user_namespaces):
204 call_frame = sys._getframe(stack_depth).f_back
205 call_frame = sys._getframe(stack_depth).f_back
205
206
206 if local_ns is None:
207 if local_ns is None:
@@ -233,7 +234,8 b' class InteractiveShellEmbed(TerminalInteractiveShell):'
233 self.init_user_ns()
234 self.init_user_ns()
234
235
235 # Compiler flags
236 # Compiler flags
236 self.compile.flags = compile_flags
237 if compile_flags is not None:
238 self.compile.flags = compile_flags
237
239
238 # Patch for global embedding to make sure that things don't overwrite
240 # Patch for global embedding to make sure that things don't overwrite
239 # user globals accidentally. Thanks to Richard <rxe@renre-europe.com>
241 # user globals accidentally. Thanks to Richard <rxe@renre-europe.com>
General Comments 0
You need to be logged in to leave comments. Login now