Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

s/paramiko/ssh/g

Re #275, re #19
  • Loading branch information...
commit b7788f5055f9d5e53bb01f21b8ae27690b7a57aa 1 parent 9e6564a
@bitprophet bitprophet authored
View
2  fabric/network.py
@@ -18,7 +18,7 @@
try:
import warnings
warnings.simplefilter('ignore', DeprecationWarning)
- import paramiko as ssh
+ import ssh
except ImportError, e:
print >> sys.stderr, """There was a problem importing our SSH library. Specifically:
View
2  setup.py
@@ -38,7 +38,7 @@
packages=find_packages(),
test_suite='nose.collector',
tests_require=['nose', 'fudge<1.0'],
- install_requires=['paramiko>=1.7.7.1'],
+ install_requires=['ssh>=1.7.8'],
entry_points={
'console_scripts': [
'fab = fabric.main:main',
View
2  tests/fake_filesystem.py
@@ -3,7 +3,7 @@
from StringIO import StringIO
from types import StringTypes
-import paramiko as ssh
+import ssh
class FakeFile(StringIO):
View
2  tests/server.py
@@ -14,7 +14,7 @@
from functools import wraps
from Python26SocketServer import BaseRequestHandler, ThreadingMixIn, TCPServer
-import paramiko as ssh
+import ssh
from fabric.operations import _sudo_prefix
from fabric.api import env, hide
View
4 tests/test_network.py
@@ -5,7 +5,7 @@
import getpass
import sys
-import paramiko
+import ssh
from nose.tools import with_setup, ok_
from fudge import (Fake, clear_calls, clear_expectations, patch_object, verify,
with_patched_object, patched_context, with_fakes)
@@ -159,7 +159,7 @@ def test_connection_cache_deletion(self):
@server()
def test_saved_authentication_returns_client_object(self):
cache = HostConnectionCache()
- assert isinstance(cache[env.host_string], paramiko.SSHClient)
+ assert isinstance(cache[env.host_string], ssh.SSHClient)
@server()
@with_fakes
View
2  tests/test_server.py
@@ -9,7 +9,7 @@
__test__ = False
from nose.tools import eq_, ok_
-import paramiko as ssh
+import ssh
from server import FakeSFTPServer

4 comments on commit b7788f5

@fesplugas

Does this fixes the agent forwarding issue?

@bitprophet
Owner

Not sure if you saw the comment on #275 but no, it does not, it only adds a tiny tweak required for #19. However it gives us the ability to try and implement some of those additional patches now, on our own schedule. Depending how things go I will make new tickets under the ssh repository for the various things mentioned in #275.

@fesplugas

To have ssh agent forward support would be awesome. Let me know if there's any way I can help.

@bitprophet
Owner

@fesplugas - The specific issue for agent forwarding is #72. If you check the third-from-last comment there are some notes about a patch in the Paramiko issue tracker and some patch to apply to Fabric. Testing those out in tandem, if you're able, would be the best way to help.

It would require checking out the new ssh project and Fabric's master branch, pip install -e-ing them in a virtualenv, and then hacking + testing. Easy if you're used to this sort of workflow, a bit complicated if you're not. No pressure :)

Please sign in to comment.
Something went wrong with that request. Please try again.