Add Changelog entry regarding `metaclass`, add a new test for py3k.

--HG--
branch : metaclass

3 files changed, 17 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4df1b16f..8a56ba8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ Change log for the astroid package (used to be astng)
 =====================================================
 
 --
+    * Add `metaclass` function to `Class` nodes,
+      for retrieving the metaclass of a class node, working
+      for py3k as well. 
+ 
     * Add support for inferring arguments to namedtuple invocations.
 
     * Make sure that objects returned for namedtuple
diff --git a/scoped_nodes.py b/scoped_nodes.py
index b6ec0a8a..4ac1bd44 100644
--- a/scoped_nodes.py
+++ b/scoped_nodes.py
@@ -997,7 +997,7 @@ class Class(Statement, LocalsDictNodeNG, FilterStmtsMixin):
         if self._metaclass:
             # Expects this from Py3k TreeRebuilder
             try:
-                return self._metaclass.infered()[0]
+                return next(self._metaclass.infer())
             except InferenceError:
                 return 
 
diff --git a/test/unittest_python3.py b/test/unittest_python3.py
index 0102c323..d17b1432 100644
--- a/test/unittest_python3.py
+++ b/test/unittest_python3.py
@@ -79,7 +79,18 @@ class Python3TC(TestCase):
 
         self.assertEqual(klass.as_string(), 
                          '\n\nclass Test(metaclass=ABCMeta):\n    pass\n')
-                         
 
+    @require_version('3.0')
+    def test_old_syntax_works(self):
+        astroid = self.builder.string_build(dedent("""
+        class Test:
+            __metaclass__ = type
+        class SubTest(Test): pass
+        """))
+        klass = astroid['SubTest']
+        metaclass = klass.metaclass()
+        self.assertIsInstance(metaclass, Class)
+        self.assertEqual(metaclass.name, 'type')
+                         
 if __name__ == '__main__':
     unittest_main()