diff options
| author | jordo1ken <github@holeintheground.us> | 2015-01-30 17:57:40 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-02-04 15:53:32 -0800 |
| commit | 394e269a081e6cf07d38fa5a375f0a03374c0d2b (patch) | |
| tree | 44cbb22850e567b9547c66c3dc11f5dbb804f7b0 | |
| parent | b26dbc3f719e9844721d38d6264c5cb5e0ed4c2f (diff) | |
Update agent.py
Updated logic for error checking.
| -rw-r--r-- | paramiko/agent.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/agent.py b/paramiko/agent.py index 01bd0252..f928881e 100644 --- a/paramiko/agent.py +++ b/paramiko/agent.py @@ -113,7 +113,7 @@ class AgentProxyThread(threading.Thread): self.__inr = r self.__addr = addr # This should be an IP address as a string? or None self._agent.connect() - if self._agent._conn is None or not (hasattr(self._agent._conn, 'fileno') or isinstance(self._agent, int)): + 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: |