Fix some issues with six dependency #241
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add a fallback for `six.raise_from`, which isn't available in
six 1.4.0. It isn't available until six 1.9.0. We could also
have raised the lower bound for the six requirement, but this is
an easy way to allow clients to keep using their existing
versions of six.
Fix support for the latest version of six, 1.11.0. That release
changed the temporary metaclass returned from
`with_metaclass()`, such that it directly inherits from `type`,
instead of inheriting from the target metaclass [1]. We depended
on this detail, and the change caused
.. code-block:: python
TypeError('metaclass conflict: ...')
to be raised when defining a class with `with_metaclass()`. We
fix this by manually selecting the most derived metaclass, and
including it in our temporary metaclass.
Also, `__prepare__` is now defined on the temporary metaclass,
in six 1.11.0 [2]. This allows us to skip our own definition of that
method, when using six>=1.11.0.
Fixes #228.
Fixes #239.
[1] <benjaminp/six#191>
[2] <benjaminp/six#178>
|
Verified that @jmoldow has signed the CLA. Thanks for the pull request! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a fallback for
six.raise_from, which isn't available insix 1.4.0. It isn't available until six 1.9.0. We could also
have raised the lower bound for the six requirement, but this is
an easy way to allow clients to keep using their existing
versions of six.
Fix support for the latest version of six, 1.11.0. That release
changed the temporary metaclass returned from
with_metaclass(), such that it directly inherits fromtype,instead of inheriting from the target metaclass [1]. We depended
on this detail, and the change caused
.. code-block:: python
to be raised when defining a class with
with_metaclass(). Wefix this by manually selecting the most derived metaclass, and
including it in our temporary metaclass.
Also,
__prepare__is now defined on the temporary metaclass,in six 1.11.0 [2]. This allows us to skip our own definition of that
method, when using six>=1.11.0.
Fixes #228.
Fixes #239.
[1] benjaminp/six#191
[2] benjaminp/six#178