Merge branch 'V9_2_2_BR'

[tools/yacsgen.git] / module_generator / compat.py

diff --git a/module_generator/compat.py b/module_generator/compat.py
index 672b33dde2d5475b32b0cc5fb9b36464669d7023..fd01532afab9471127bf48f14e0c057c014579d4 100644 (file)
--- a/module_generator/compat.py
+++ b/module_generator/compat.py
@@ -38,10 +38,10 @@ def sorted(iterable, cmp=None, key=None, reverse=False) :
                d = {}
                for v in iterable :
                        k = key(v)
-                       if not d.has_key(k) :
+                       if k not in d :
                                d[k] = []
                        d[k].append(v)
-               keys = d.keys()
+               keys = list(d.keys())
                keys.sort(cmp)
                i = []
                for k in keys :
@@ -78,9 +78,8 @@ class _TemplateMetaclass(type):
                cls.pattern = re.compile(pattern, re.IGNORECASE | re.VERBOSE)
 
 
-class Template:
+class Template(metaclass=_TemplateMetaclass):
        """A string class for supporting $-substitutions."""
-       __metaclass__ = _TemplateMetaclass
        
        delimiter = '$'
        idpattern = r'[_a-z][_a-z0-9]*'