diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 13:15:15 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 13:15:15 -0800 |
commit | 07ff30537a225f9b9c2c31eaf9b376d412907c37 (patch) | |
tree | 70ad9c5bca7144d93120818b85d2b2723115b441 /paramiko/util.py | |
parent | 985df357ec039bcb28f6f260e64e9838204506f6 (diff) | |
parent | a1b160c1ff4ee1576b82f98990285ccddadd9b61 (diff) | |
download | paramiko-07ff30537a225f9b9c2c31eaf9b376d412907c37.tar.gz |
Merge branch '1.14' into 1.15
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 d9a29d74..855e5757 100644 --- a/paramiko/util.py +++ b/paramiko/util.py @@ -118,7 +118,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]) |