[Checkins] SVN: grokcore.startup/branches/ipython-debug-shell/src/grokcore/startup/ use zope.conf from arguments

[Christian Klinger]

Log message for revision 125323:
  use zope.conf from arguments

Changed:
  U   grokcore.startup/branches/ipython-debug-shell/src/grokcore/startup/__init__.py
  U   grokcore.startup/branches/ipython-debug-shell/src/grokcore/startup/debug.py

-=-
Modified: grokcore.startup/branches/ipython-debug-shell/src/grokcore/startup/__init__.py
===================================================================
--- grokcore.startup/branches/ipython-debug-shell/src/grokcore/startup/__init__.py	2012-04-27 09:46:48 UTC (rev 125322)
+++ grokcore.startup/branches/ipython-debug-shell/src/grokcore/startup/__init__.py	2012-04-27 10:23:15 UTC (rev 125323)
@@ -18,7 +18,10 @@
 def get_debugger(zope_conf):
     try:
         import IPython
+        from grokcore.startup.debug import GrokDebug
+        grokd = GrokDebug(zope_conf)
         from grokcore.startup.debug import interactive_debug_prompt
+        return interactive_debug_prompt(zope_conf, grokd)
     except ImportError:
         from grokcore.startup.startup import interactive_debug_prompt
-    return interactive_debug_prompt(zope_conf)
+        return interactive_debug_prompt(zope_conf)

Modified: grokcore.startup/branches/ipython-debug-shell/src/grokcore/startup/debug.py
===================================================================
--- grokcore.startup/branches/ipython-debug-shell/src/grokcore/startup/debug.py	2012-04-27 09:46:48 UTC (rev 125322)
+++ grokcore.startup/branches/ipython-debug-shell/src/grokcore/startup/debug.py	2012-04-27 10:23:15 UTC (rev 125323)
@@ -157,8 +157,6 @@
 
 
 
-grokd = GrokDebug()
-
 def get_context_by_path(context, path):
     for name in (p for p in path.split(PATH_SEP) if p):
         context = context[name]
@@ -184,7 +182,7 @@
             if obj.__name__.startswith(tail)]
 
 
-def interactive_debug_prompt(zope_conf):
+def interactive_debug_prompt(zope_conf, grokd):
     banner = textwrap.dedent(
         """\
         IPython shell for Grok.