wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore the python3-compat import __future__ and Exception as update.

Browse source
This commit is contained in:
Toshio Kuratomi 2015-04-27 08:33:29 -07:00
parent 3aede800c5
commit af2dff9cfb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
v2/ansible/plugins/connections/paramiko_ssh.py
View file

@ -14,7 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
# ---
# The paramiko transport is provided because many distributions, in particular EL6 and before
@ -173,7 +174,7 @@ class Connection(ConnectionBase):
timeout=self._connection_info.timeout,
port=port,
)
except Exception, e:
except Exception as e:
msg = str(e)
if "PID check failed" in msg:
raise AnsibleError("paramiko version issue, please upgrade paramiko on the machine running ansible")
@ -197,7 +198,7 @@ class Connection(ConnectionBase):
try:
self.ssh.get_transport().set_keepalive(5)
chan = self.ssh.get_transport().open_session()
except Exception, e:
except Exception as e:
msg = "Failed to open session"
if len(str(e)) > 0:
msg += ": %s" % str(e)
@ -256,7 +257,7 @@ class Connection(ConnectionBase):
try:
self.sftp = self.ssh.open_sftp()
except Exception, e:
except Exception as e:
raise AnsibleError("failed to open a SFTP connection (%s)" % e)
try:
@ -280,7 +281,7 @@ class Connection(ConnectionBase):
try:
self.sftp = self._connect_sftp()
except Exception, e:
except Exception as e:
raise AnsibleError("failed to open a SFTP connection (%s)", e)
try: