summaryrefslogtreecommitdiff
path: root/paramiko/agent.py
diff options
context:
space:
mode:
authorDorian Pula <dorian.pula@amber-penguin-software.ca>2017-05-30 09:10:55 -0400
committerJeff Forcier <jeff@bitprophet.org>2017-05-31 17:14:40 -0700
commit98f682815cdd33a2f1999b931582e2467bb59754 (patch)
treed95a4e58465686580609d80e6ca50660f7fbe2ca /paramiko/agent.py
parentbda557429547f4d5a4e81492c9754b3b4e1ae622 (diff)
downloadparamiko-98f682815cdd33a2f1999b931582e2467bb59754.tar.gz
Additional PEP8 fixes.
Diffstat (limited to 'paramiko/agent.py')
-rw-r--r--paramiko/agent.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/paramiko/agent.py b/paramiko/agent.py
index c13810bb..c950ba5e 100644
--- a/paramiko/agent.py
+++ b/paramiko/agent.py
@@ -109,15 +109,19 @@ class AgentProxyThread(threading.Thread):
def run(self):
try:
(r, addr) = self.get_connection()
- # Found that r should be either a socket from the socket library or None
+ # Found that r should be either
+ # a socket from the socket library or None
self.__inr = r
- self.__addr = addr # This should be an IP address as a string? or None
+ # The address should be an IP address as a string? or None
+ self.__addr = addr
self._agent.connect()
- if not isinstance(self._agent, int) and (self._agent._conn is None or not hasattr(self._agent._conn, 'fileno')):
+ if not isinstance(self._agent, int) and \
+ (self._agent._conn is None or
+ not hasattr(self._agent._conn, 'fileno')):
raise AuthenticationException("Unable to connect to SSH agent")
self._communicate()
except:
- #XXX Not sure what to do here ... raise or pass ?
+ # XXX Not sure what to do here ... raise or pass ?
raise
def _communicate(self):
@@ -213,7 +217,8 @@ class AgentClientProxy(object):
if ('SSH_AUTH_SOCK' in os.environ) and (sys.platform != 'win32'):
conn = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
try:
- retry_on_signal(lambda: conn.connect(os.environ['SSH_AUTH_SOCK']))
+ retry_on_signal(
+ lambda: conn.connect(os.environ['SSH_AUTH_SOCK']))
except:
# probably a dangling env var: the ssh agent is gone
return