diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-16 09:56:43 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-16 09:56:43 -0700 |
| commit | a46ea81491b23af642247559da9e72fab472767d (patch) | |
| tree | dbda2ad1c8ddcd839ca95ca51466fa3221169f5f | |
| parent | 56a4739923a356ff5670b4620139ca55a2f30148 (diff) | |
Added a comment; used a keyword argument, added pypy to travis
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | paramiko/rsakey.py | 2 | ||||
| -rw-r--r-- | tests/test_client.py | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 3f6f7331..7171dbe0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ python: - "3.2" - "3.3" - "3.4" + - "pypy" install: # Self-install for setup.py-driven deps - pip install -e . diff --git a/paramiko/rsakey.py b/paramiko/rsakey.py index 026fde39..ef39c41f 100644 --- a/paramiko/rsakey.py +++ b/paramiko/rsakey.py @@ -165,7 +165,7 @@ class RSAKey(PKey): :return: new `.RSAKey` private key """ numbers = rsa.generate_private_key( - 65537, bits, backend=default_backend() + public_exponent=65537, key_size=bits, backend=default_backend() ).private_numbers() key = RSAKey(vals=(numbers.public_numbers.e, numbers.public_numbers.n)) key.d = numbers.d diff --git a/tests/test_client.py b/tests/test_client.py index b585fa0f..49f2a64a 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -290,7 +290,8 @@ class SSHClientTest (unittest.TestCase): del self.tc # force a collection to see whether the SSHClient object is deallocated - # correctly + # correctly; 3 GCs are needed to make sure it's really collected on + # PyPy gc.collect() gc.collect() gc.collect() |