Merged in bendavis78/six/issues/66 (pull request #35)

Fixed #66: Replace the implementation of `six.with_metaclass` with the Flask one.

2 files changed, 16 insertions, 1 deletions

diff --git a/six.py b/six.py
index 1554288..fcfab5a 100644
--- a/six.py
+++ b/six.py
@@ -637,7 +637,21 @@ _add_doc(reraise, """Reraise an exception.""")
 
 def with_metaclass(meta, *bases):
     """Create a base class with a metaclass."""
-    return meta("NewBase", bases, {})
+    # This requires a bit of explanation: the basic idea is to make a
+    # dummy metaclass for one level of class instantiation that replaces
+    # itself with the actual metaclass.  Because of internal type checks
+    # we also need to make sure that we downgrade the custom metaclass
+    # for one level to something closer to type (that's why __call__ and
+    # __init__ comes back from type etc.).
+    class metaclass(meta):
+        __call__ = type.__call__
+        __init__ = type.__init__
+        def __new__(cls, name, this_bases, d):
+            if this_bases is None:
+                return type.__new__(cls, name, (), d)
+            return meta(name, bases, d)
+    return metaclass('temporary_class', None, {})
+
 
 def add_metaclass(metaclass):
     """Class decorator for creating a class with a metaclass."""
diff --git a/test_six.py b/test_six.py
index 9e39444..766da9e 100644
--- a/test_six.py
+++ b/test_six.py
@@ -634,6 +634,7 @@ def test_with_metaclass():
     assert type(X) is Meta
     assert issubclass(X, Base)
     assert issubclass(X, Base2)
+    assert X.__mro__ == (X, Base, Base2, object)
 
 
 def test_add_metaclass():