Commit cea638f7 authored by Stefan Behnel's avatar Stefan Behnel

import cleanup, avoid importing tempita before it's needed

--HG--
extra : rebase_source : bc3948c9063583e68888ce16f208393451503877
parent 85121d05
...@@ -10,7 +10,6 @@ cython.declare(re=object, Naming=object, Options=object, StringEncoding=object, ...@@ -10,7 +10,6 @@ cython.declare(re=object, Naming=object, Options=object, StringEncoding=object,
import os import os
import re import re
import codecs
import glob import glob
import Naming import Naming
...@@ -20,8 +19,6 @@ from Cython import Utils ...@@ -20,8 +19,6 @@ from Cython import Utils
from Scanning import SourceDescriptor from Scanning import SourceDescriptor
from Cython.StringIOTree import StringIOTree from Cython.StringIOTree import StringIOTree
import DebugFlags import DebugFlags
import Errors
from Cython import Tempita as tempita
try: try:
from __builtin__ import basestring from __builtin__ import basestring
...@@ -215,7 +212,7 @@ class UtilityCodeBase(object): ...@@ -215,7 +212,7 @@ class UtilityCodeBase(object):
def sub_tempita(s, context, file, name): def sub_tempita(s, context, file, name):
"Run tempita on string s with context context." "Run tempita on string s with given context."
if not s: if not s:
return None return None
...@@ -224,7 +221,8 @@ def sub_tempita(s, context, file, name): ...@@ -224,7 +221,8 @@ def sub_tempita(s, context, file, name):
elif name: elif name:
context['__name'] = name context['__name'] = name
return tempita.sub(s, **context) from Cython.Tempita import sub
return sub(s, **context)
class UtilityCode(UtilityCodeBase): class UtilityCode(UtilityCodeBase):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment