[pypy-svn] r34647 - in pypy/dist/pypy/translator: . test

[pedronis at codespeak.net]

Author: pedronis
Date: Thu Nov 16 00:25:37 2006
New Revision: 34647

Modified:
   pypy/dist/pypy/translator/interactive.py
   pypy/dist/pypy/translator/test/test_interactive.py
Log:
fix for config out of sync with test.



Modified: pypy/dist/pypy/translator/interactive.py
==============================================================================
--- pypy/dist/pypy/translator/interactive.py	(original)
+++ pypy/dist/pypy/translator/interactive.py	Thu Nov 16 00:25:37 2006
@@ -14,15 +14,15 @@
 class Translation(object):
 
     def __init__(self, entry_point, argtypes=None, **kwds):
+        self.driver = driver.TranslationDriver(overrides=DEFAULTS)
+        self.config = self.driver.config
+
         self.entry_point = entry_point
-        self.context = TranslationContext()
+        self.context = TranslationContext(config=self.config)
         # for t.view() to work just after construction
         graph = self.context.buildflowgraph(entry_point)
         self.context._prebuilt_graphs[entry_point] = graph
 
-        self.driver = driver.TranslationDriver(overrides=DEFAULTS)
-        self.config = self.driver.config
-
         # hook into driver events
         driver_own_event = self.driver._event
         def _event(kind, goal, func):
@@ -53,7 +53,8 @@
             else:
                 if argtypes is None:
                     argtypes = []
-            self.driver.setup(self.entry_point, argtypes, policy, empty_translator=self.context)
+            self.driver.setup(self.entry_point, argtypes, policy,
+                              empty_translator=self.context)
             self.ann_argtypes = argtypes
             self.ann_policy = policy
             self.driver_setup = True

Modified: pypy/dist/pypy/translator/test/test_interactive.py
==============================================================================
--- pypy/dist/pypy/translator/test/test_interactive.py	(original)
+++ pypy/dist/pypy/translator/test/test_interactive.py	Thu Nov 16 00:25:37 2006
@@ -8,6 +8,7 @@
 
     t = Translation(f, [int, int])
     assert t.context is t.driver.translator
+    assert t.config is t.driver.config is t.context.config
     
     s = t.annotate([int, int])
     assert s.knowntype == int