Permalink
Browse files

Paramiko now has re-merged changes from the ssh fork: accommodate par…

…amiko or ssh for ssh-agent integration
  • Loading branch information...
1 parent 3e0076a commit ca846d8e0d27d687285e20ba53f67882762aad9e @atl committed Oct 3, 2012
Showing with 11 additions and 2 deletions.
  1. +5 −0 CHANGES.rst
  2. +1 −1 README.rst
  3. +4 −1 http_signature/sign.py
  4. +1 −0 requirements.txt
View
@@ -1,6 +1,11 @@
Changes
-------
+0.1.4 ()
+~~~~~~~~~~~~~~~~~~
+
+* Account for ssh now being re-merged into paramiko: either package is acceptable (but paramiko should ideally be >= 1.8.0)
+
0.1.3 (2012-10-02)
~~~~~~~~~~~~~~~~~~
View
@@ -10,7 +10,7 @@ Requirements
Optional:
-* ssh (for ssh-agent integration)
+* ssh or paramiko >= 1.8.0 (for ssh-agent integration)
* requests
Usage
View
@@ -24,7 +24,10 @@ def __init__(self, secret='~/.ssh/id_rsa', algorithm='rsa-sha256', allow_agent=F
self._hash = None
self.sign_algorithm, self.hash_algorithm = algorithm.split('-')
if allow_agent:
- import ssh
+ try:
+ import paramiko as ssh
+ except ImportError:
+ import ssh
keys = ssh.Agent().get_keys()
self._keys = filter(is_rsa, keys)
if self._keys:
View
@@ -1 +1,2 @@
PyCrypto
+# ssh or paramiko>=1.8.0 if ssh-agent desired

0 comments on commit ca846d8

Please sign in to comment.