[Checkins] SVN: zope.tal/branches/pypyzpt/src/zope/tal/ make it work with both uncompiled and compiled rpython

Godefroid Chapelle gotcha at bubblenet.be
Wed Jun 13 17:07:44 EDT 2007


Log message for revision 76671:
  make it work with both uncompiled and compiled rpython

Changed:
  U   zope.tal/branches/pypyzpt/src/zope/tal/_talinterpreter/applevel.py
  U   zope.tal/branches/pypyzpt/src/zope/tal/talinterpreter.py

-=-
Modified: zope.tal/branches/pypyzpt/src/zope/tal/_talinterpreter/applevel.py
===================================================================
--- zope.tal/branches/pypyzpt/src/zope/tal/_talinterpreter/applevel.py	2007-06-13 16:12:11 UTC (rev 76670)
+++ zope.tal/branches/pypyzpt/src/zope/tal/_talinterpreter/applevel.py	2007-06-13 21:07:43 UTC (rev 76671)
@@ -43,7 +43,7 @@
 _spacejoin = ' '.join
 
 def normalize(value):
-    return zope.tal._talinterpreter._normalize(value)
+    return zope.tal.talinterpreter.normalize(value)
 
 class MacroStackItem(object):
     def __init__(self, macroName, slots, definingName, extending, entering, i18nContext):

Modified: zope.tal/branches/pypyzpt/src/zope/tal/talinterpreter.py
===================================================================
--- zope.tal/branches/pypyzpt/src/zope/tal/talinterpreter.py	2007-06-13 16:12:11 UTC (rev 76670)
+++ zope.tal/branches/pypyzpt/src/zope/tal/talinterpreter.py	2007-06-13 21:07:43 UTC (rev 76671)
@@ -1,10 +1,12 @@
 try:
     from pypy.interpreter.mixedmodule import testmodule
     _talinterpreter =  testmodule('_talinterpreter', 'zope.tal')
+except AttributeError:
+    import _talinterpreter
 except ImportError:
     import _talinterpreter
 
 
-normalize = _talinterpreter.normalize
+normalize = _talinterpreter._normalize
 TALInterpreter = _talinterpreter.TALInterpreter
 



More information about the Checkins mailing list