Merge pull request #1549 from reaperhulk/no-enum34-on-34-plus
make enum34 installation conditional on python < 3.4
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cf2d568..b777d45 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,7 +14,7 @@
2.0, or the BSD license.
* Added key-rotation support to :doc:`Fernet </fernet>` with
:class:`~cryptography.fernet.MultiFernet`.
-* More bit-lengths are now support for ``p`` and ``q`` when loading DSA keys
+* More bit-lengths are now supported for ``p`` and ``q`` when loading DSA keys
from numbers.
* Added :class:`~cryptography.hazmat.primitives.interfaces.MACContext` as a
common interface for CMAC and HMAC and deprecated
diff --git a/tests/conftest.py b/tests/conftest.py
index 778ee85..c4d6b9c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -17,11 +17,11 @@
if "backend" in metafunc.fixturenames:
filtered_backends = []
+ required = metafunc.function.requires_backend_interface
+ required_interfaces = tuple(
+ mark.kwargs["interface"] for mark in required
+ )
for backend in selected_backends:
- required = metafunc.function.requires_backend_interface
- required_interfaces = tuple(
- mark.kwargs["interface"] for mark in required
- )
if isinstance(backend, required_interfaces):
filtered_backends.append(backend)