aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-01-08 13:30:51 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2015-01-08 13:30:51 -0800
commitf8da8e20f0d0265a4f4465eef1294ee59f3edb0e (patch)
treed05e533c5489fa570d4ddad89b294717d92a444e
parentd334e2f4c7507bb01369e5fc834163aabf1d46d6 (diff)
downloadcryptography-f8da8e20f0d0265a4f4465eef1294ee59f3edb0e.tar.gz
cryptography-f8da8e20f0d0265a4f4465eef1294ee59f3edb0e.tar.bz2
cryptography-f8da8e20f0d0265a4f4465eef1294ee59f3edb0e.zip
Line length and typo
-rw-r--r--src/cryptography/hazmat/backends/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptography/hazmat/backends/__init__.py b/src/cryptography/hazmat/backends/__init__.py
index d8438248..256fee39 100644
--- a/src/cryptography/hazmat/backends/__init__.py
+++ b/src/cryptography/hazmat/backends/__init__.py
@@ -20,8 +20,8 @@ def _available_backends():
# setuptools 11.3 deprecated support for the require parameter to
# load(), and introduced the new resolve() method instead.
# This can be removed if/when we can assume setuptools>=11.3. At
- # some point we may wish to add a warning, to push people along, but
- # at present this would result it too many warnings.
+ # some point we may wish to add a warning, to push people along,
+ # but at present this would result in too many warnings.
ep.resolve() if hasattr(ep, "resolve") else ep.load(require=False)
for ep in pkg_resources.iter_entry_points(
"cryptography.backends"