[py3k] Use metaclasses using six.add_metaclass

2 files changed, 11 insertions, 6 deletions

diff --git a/registry.py b/registry.py
index 9b804f5..084bb4d 100644
--- a/registry.py
+++ b/registry.py
@@ -86,7 +86,7 @@ from os.path import join, isdir, exists
 from logging import getLogger
 from warnings import warn
 
-from six import string_types
+from six import string_types, add_metaclass
 
 from logilab.common.modutils import modpath_from_file
 from logilab.common.logging_ext import set_log_methods
@@ -945,6 +945,8 @@ class PredicateMetaClass(type):
         _PREDICATES[id(proxy)] = proxy
         return inst
 
+
+@add_metaclass(PredicateMetaClass)
 class Predicate(object):
     """base class for selector classes providing implementation
     for operators ``&``, ``|`` and  ``~``
@@ -960,7 +962,6 @@ class Predicate(object):
 
     0 score means that the class doesn't apply.
     """
-    __metaclass__ = PredicateMetaClass
 
     @property
     def func_name(self):
diff --git a/test/unittest_deprecation.py b/test/unittest_deprecation.py
index ad268e8..b0f8a1a 100644
--- a/test/unittest_deprecation.py
+++ b/test/unittest_deprecation.py
@@ -19,6 +19,8 @@
 
 import warnings
 
+from six import add_metaclass
+
 from logilab.common.testlib import TestCase, unittest_main
 from logilab.common import deprecation
 
@@ -45,8 +47,9 @@ class RawInputTC(TestCase):
         return any_func
 
     def test_class_deprecated(self):
-        class AnyClass:
-            __metaclass__ = deprecation.class_deprecated
+        @add_metaclass(deprecation.class_deprecated)
+        class AnyClass(object):
+            pass
         AnyClass()
         self.assertEqual(self.messages,
                          ['AnyClass is deprecated'])
@@ -104,8 +107,9 @@ class RawInputTC(TestCase):
     def test_class_deprecated_manager(self):
         deprecator = deprecation.DeprecationManager("module_name")
         deprecator.compatibility('1.3')
-        class AnyClass:
-            __metaclass__ = deprecator.class_deprecated('1.2')
+        @add_metaclass(deprecator.class_deprecated('1.2'))
+        class AnyClass(object):
+            pass
         AnyClass()
         self.assertEqual(self.messages,
                          ['[module_name 1.2] AnyClass is deprecated'])