diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-12-15 15:39:24 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-12-15 15:39:24 -0600 |
| commit | 9305287078bf1c15c469284c0a993c5c38e23bf5 (patch) | |
| tree | c05086440021977aff39f8f147ab040567f1beb0 /src/cryptography/utils.py | |
| parent | e59804ea35c24835562de885e39d9d3f3cf5237c (diff) | |
| parent | 0c9e8af1f43a1d37ccf46640250186e0fb42fb06 (diff) | |
| download | cryptography-9305287078bf1c15c469284c0a993c5c38e23bf5.tar.gz cryptography-9305287078bf1c15c469284c0a993c5c38e23bf5.tar.bz2 cryptography-9305287078bf1c15c469284c0a993c5c38e23bf5.zip | |
Merge pull request #1527 from alex/pr/1517
Added SSH public key loading
Diffstat (limited to 'src/cryptography/utils.py')
| -rw-r--r-- | src/cryptography/utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py index 63464dfa..78f73464 100644 --- a/src/cryptography/utils.py +++ b/src/cryptography/utils.py @@ -48,8 +48,9 @@ def verify_interface(iface, klass): ) -def bit_length(x): - if sys.version_info >= (2, 7): +if sys.version_info >= (2, 7): + def bit_length(x): return x.bit_length() - else: +else: + def bit_length(x): return len(bin(x)) - (2 + (x <= 0)) |