diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-11-04 10:10:16 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-11-04 10:10:16 -0500 |
| commit | 30a7afcdc74443c74f2ebb344a1fbf235c23bf57 (patch) | |
| tree | 8d4acdf8a79ae564cfe16e9336ea8455a86f73af /paramiko/util.py | |
| parent | 9e67e71377cea9adaaeab6dbb024f2af94ba7999 (diff) | |
| parent | 4565fb517ceb54aa994ff96380b2c8f24df43968 (diff) | |
| download | paramiko-30a7afcdc74443c74f2ebb344a1fbf235c23bf57.tar.gz | |
Merge branch 'master' into switch-to-cryptography
Conflicts:
.travis.yml
paramiko/ecdsakey.py
paramiko/transport.py
Diffstat (limited to 'paramiko/util.py')
| -rw-r--r-- | paramiko/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/util.py b/paramiko/util.py index db5bd36e..5ad1e3fd 100644 --- a/paramiko/util.py +++ b/paramiko/util.py @@ -117,7 +117,7 @@ def safe_string(s): def bit_length(n): try: - return n.bitlength() + return n.bit_length() except AttributeError: norm = deflate_long(n, False) hbyte = byte_ord(norm[0]) |