no more has_key

2012-08-26 18:34:50 -05:00
parent 334e150638
commit 030203effd
6 changed files with 17 additions and 17 deletions
@@ -293,7 +293,7 @@ class TemplateParser(object):
        if delimiters != self.default_delimiters:
            escaped_delimiters = (re.escape(delimiters[0]),re.escape(delimiters[1]))
            self.r_tag = re.compile(r'(%s.*?%s)' % escaped_delimiters, re.DOTALL)
-        elif context.has_key('response') and hasattr(context['response'],'delimiters'):
+        elif hasattr(context.get('response',None),'delimiters'):
            if context['response'].delimiters != self.default_delimiters:
                escaped_delimiters = (re.escape(context['response'].delimiters[0]),
                                      re.escape(context['response'].delimiters[1]))