summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGodefroid Chapelle <gotcha@bubblenet.be>2007-06-13 21:07:43 +0000
committerGodefroid Chapelle <gotcha@bubblenet.be>2007-06-13 21:07:43 +0000
commit4cd1afa5331ee2a750d8594b2587006175c5d027 (patch)
tree4df03b77a5f0921f559dd3740059104f90b54ca8
parent714e894268134128e194b5aab464130cf7b0c7b8 (diff)
downloadzope-tal-4cd1afa5331ee2a750d8594b2587006175c5d027.tar.gz
make it work with both uncompiled and compiled rpython
-rw-r--r--src/zope/tal/_talinterpreter/applevel.py2
-rw-r--r--src/zope/tal/talinterpreter.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/zope/tal/_talinterpreter/applevel.py b/src/zope/tal/_talinterpreter/applevel.py
index ea99b03..41d90ae 100644
--- a/src/zope/tal/_talinterpreter/applevel.py
+++ b/src/zope/tal/_talinterpreter/applevel.py
@@ -43,7 +43,7 @@ _nulljoin = ''.join
_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):
diff --git a/src/zope/tal/talinterpreter.py b/src/zope/tal/talinterpreter.py
index 7632680..30b1d2a 100644
--- a/src/zope/tal/talinterpreter.py
+++ b/src/zope/tal/talinterpreter.py
@@ -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