summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-25 18:58:25 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-25 18:58:25 -0700
commitfdfbdbb6cc64927fe1e41592728d35eddecc08de (patch)
treef2505ab248f262df47d3935d64c1500da81b52c0
parent820a2c720f0a6b39df2657b83a169b7e68f85fc7 (diff)
Formatting tweaks re #731
-rw-r--r--paramiko/ecdsakey.py9
-rw-r--r--paramiko/transport.py2
-rw-r--r--tests/test_pkey.py2
3 files changed, 7 insertions, 6 deletions
diff --git a/paramiko/ecdsakey.py b/paramiko/ecdsakey.py
index 6663baa2..0af60a15 100644
--- a/paramiko/ecdsakey.py
+++ b/paramiko/ecdsakey.py
@@ -39,10 +39,11 @@ from paramiko.util import deflate_long, inflate_long
class _ECDSACurve(object):
"""
- Object for representing a specific ECDSA Curve (i.e. nistp256, nistp384,
- etc.). Handles the generation of the key format identifier and the
- selection of the proper hash function. Also grabs the proper curve from the
- ecdsa package.
+ Represents a specific ECDSA Curve (nistp256, nistp384, etc).
+
+ Handles the generation of the key format identifier and the selection of
+ the proper hash function. Also grabs the proper curve from the 'ecdsa'
+ package.
"""
def __init__(self, curve_class, nist_name):
self.nist_name = nist_name
diff --git a/paramiko/transport.py b/paramiko/transport.py
index a314847e..d362ea64 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -121,7 +121,7 @@ class Transport (threading.Thread, ClosingContextManager):
_preferred_keys = (
'ssh-rsa',
'ssh-dss',
- )+tuple(ECDSAKey.supported_key_format_identifiers())
+ ) + tuple(ECDSAKey.supported_key_format_identifiers())
_preferred_kex = (
'diffie-hellman-group1-sha1',
'diffie-hellman-group14-sha1',
diff --git a/tests/test_pkey.py b/tests/test_pkey.py
index 59b3bb43..2181dd91 100644
--- a/tests/test_pkey.py
+++ b/tests/test_pkey.py
@@ -145,7 +145,7 @@ class KeyTest (unittest.TestCase):
self.assertEqual(exp_rsa, my_rsa)
self.assertEqual(PUB_RSA.split()[1], key.get_base64())
self.assertEqual(1024, key.get_bits())
-
+
def test_4_load_dss(self):
key = DSSKey.from_private_key_file(test_path('test_dss.key'))
self.assertEqual('ssh-dss', key.get_name())