Permalink
Browse files

Some more small cleanup for metaclasses

  • Loading branch information...
1 parent fb4352d commit 41746b9246e7e17044a3ed8e6e240ada9699ea74 @mitsuhiko mitsuhiko committed May 20, 2013
Showing with 2 additions and 5 deletions.
  1. +2 −1 jinja2/compiler.py
  2. +0 −1 jinja2/ext.py
  3. +0 −1 jinja2/nodes.py
  4. +0 −2 jinja2/utils.py
View
@@ -10,11 +10,12 @@
"""
from itertools import chain
from copy import deepcopy
+from keyword import iskeyword as is_python_keyword
from jinja2 import nodes
from jinja2.nodes import EvalContext
from jinja2.visitor import NodeVisitor
from jinja2.exceptions import TemplateAssertionError
-from jinja2.utils import Markup, concat, escape, is_python_keyword
+from jinja2.utils import Markup, concat, escape
from jinja2._compat import range_type, next, text_type, string_types, \
iteritems, NativeStringIO, imap
View
@@ -56,7 +56,6 @@ class Extension(with_metaclass(ExtensionRegistry, object)):
is a terrible name, ``fragment_cache_prefix`` on the other hand is a good
name as includes the name of the extension (fragment cache).
"""
- __metaclass__ = ExtensionRegistry
#: if this extension parses this is the list of tags it's listening to.
tags = set()
View
@@ -120,7 +120,6 @@ class Node(with_metaclass(NodeType, object)):
The `environment` attribute is set at the end of the parsing process for
all nodes automatically.
"""
- __metaclass__ = NodeType
fields = ()
attributes = ('lineno', 'environment')
abstract = True
View
@@ -64,8 +64,6 @@ def _encode_filename(filename):
'filenames must be strings'
return filename
-from keyword import iskeyword as is_python_keyword
-
def contextfunction(f):
"""This decorator can be used to mark a function or method context callable.

0 comments on commit 41746b9

Please sign in to comment.