aboutsummaryrefslogtreecommitdiffstats
path: root/mako/ext/turbogears.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-11-11 14:38:56 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-11-11 14:38:56 -0500
commit1eb56ef02a7fa825be99ddfb95f217a07dab1cdf (patch)
treebf0857b7f42dec7db03910799eed7e5dda5e7c2b /mako/ext/turbogears.py
parent4ab9664a515c265238d420b0373f7225fe2e53c7 (diff)
downloadexternal_python_mako-1eb56ef02a7fa825be99ddfb95f217a07dab1cdf.tar.gz
external_python_mako-1eb56ef02a7fa825be99ddfb95f217a07dab1cdf.tar.bz2
external_python_mako-1eb56ef02a7fa825be99ddfb95f217a07dab1cdf.zip
- first pass at running a py3k compatible base in py2k as well.
having some weird unicode issues I can't debug; the meaning of str.encode() seems to be changing globally somehow
Diffstat (limited to 'mako/ext/turbogears.py')
-rw-r--r--mako/ext/turbogears.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mako/ext/turbogears.py b/mako/ext/turbogears.py
index e453ada..74fcd8a 100644
--- a/mako/ext/turbogears.py
+++ b/mako/ext/turbogears.py
@@ -19,7 +19,7 @@ class TGPlugin(object):
# Pull the options out and initialize the lookup
lookup_options = {}
- for k, v in options.iteritems():
+ for k, v in options.items():
if k.startswith('mako.'):
lookup_options[k[5:]] = v
elif k in ['directories', 'filesystem_checks', 'module_directory']:
@@ -46,7 +46,7 @@ class TGPlugin(object):
return self.lookup.get_template(templatename)
def render(self, info, format="html", fragment=False, template=None):
- if isinstance(template, basestring):
+ if isinstance(template, str):
template = self.load_template(template)
# Load extra vars func if provided