Commit Graph

1295 Commits

Author SHA1 Message Date
Scott Maxwell ae078f51d6 Fix new test for Py3 and start server in tests instead of in setUp so we can skip starting server for test 5 2014-01-16 20:15:16 -08:00
Scott Maxwell b9e62182e5 Merge remote-tracking branch 'master/master' into py3-support-without-py25
Conflicts:
	paramiko/__init__.py
	setup.py
	tests/test_client.py
2014-01-16 19:50:53 -08:00
Scott Maxwell aa8ea3c4d4 Add getcwd test 2014-01-16 19:36:04 -08:00
Scott Maxwell ab8d874064 Fix getcwd when _cwd is None 2014-01-16 19:09:13 -08:00
Jeff Forcier a08ac06083 Merge branch '1.12' 2014-01-08 16:41:52 -08:00
Jeff Forcier 6ecde066fc Cut 1.12.1 2014-01-08 16:41:44 -08:00
Jeff Forcier 69ec7455ee Merge branch '1.11' into 1.12
Conflicts:
	paramiko/__init__.py
	setup.py
2014-01-08 16:41:29 -08:00
Jeff Forcier 1ff3db96f6 Cut 1.11.3 2014-01-08 16:41:04 -08:00
Jeff Forcier 9bf65daebe Merge branch '1.10' into 1.11
Conflicts:
	paramiko/__init__.py
	setup.py
2014-01-08 16:40:49 -08:00
Jeff Forcier 698adf10fb Cut 1.10.5 2014-01-08 16:40:11 -08:00
Jeff Forcier 6393175f65 Merge branch '1.12' 2014-01-08 16:30:00 -08:00
Jeff Forcier 566f37c0f2 ecdsa in README; fixes #225 2014-01-08 16:29:56 -08:00
Jeff Forcier 19fedd261e Merge branch '1.12' 2014-01-08 13:43:46 -08:00
Jeff Forcier 96ca8d49c1 Merge branch '1.11' into 1.12
Conflicts:
	NEWS
2014-01-08 13:43:42 -08:00
Jeff Forcier b352357efb Merge branch '1.10' into 1.11
Conflicts:
	NEWS
2014-01-08 13:43:03 -08:00
Jeff Forcier b57e825f77 Changelog, fixes #176 2014-01-08 12:49:27 -08:00
Nathan Scowcroft 0fea895cdb ditto 2014-01-08 12:45:22 -08:00
Nathan Scowcroft a1c1f8f29f Check correct stored hosts filename. 2014-01-08 12:45:14 -08:00
Jeff Forcier 6d326fcde2 Saner (to me) positive assertion 2014-01-08 12:44:12 -08:00
Jeff Forcier 74e06aff9e Small refactor 2014-01-08 12:39:26 -08:00
Jeff Forcier 78d9e4834c No need for 'self.tc' within a single test :) 2014-01-08 12:35:46 -08:00
Martin Blumenstingl bfc3953be0 Add a testcase for client.save_host_keys. 2014-01-08 12:27:24 -08:00
Jeff Forcier dd3e203e00 Merge branch '1.12' 2013-12-31 19:24:39 -08:00
Jeff Forcier b3e53df8b9 Merge branch '1.11' into 1.12 2013-12-31 19:24:39 -08:00
Jeff Forcier ec95e8d943 Merge branch '1.10' into 1.11 2013-12-31 19:24:39 -08:00
Jeff Forcier 302e3bde38 Merge branch '1.9' into 1.10 2013-12-31 19:24:39 -08:00
Jeff Forcier bbcc6c7d8d Merge branch '1.8' into 1.9 2013-12-31 19:24:39 -08:00
Jeff Forcier c695a931ff Update travis settings to be similar to fab's 2013-12-31 19:24:10 -08:00
Jeff Forcier 4a5e10e15c Merge branch '1.12' 2013-12-31 19:14:53 -08:00
Jeff Forcier 7985d08138 Merge branch '1.11' into 1.12 2013-12-31 19:14:50 -08:00
Jeff Forcier b22de7d61b Merge branch '1.10' into 1.11 2013-12-31 19:14:46 -08:00
Jeff Forcier f253612e93 Merge branch '1.9' into 1.10 2013-12-31 19:14:44 -08:00
Jeff Forcier 89e2592ead Merge branch '1.8' into 1.9 2013-12-31 19:14:39 -08:00
Jeff Forcier 91a8066686 No more Python 2.5 on Travis :( 2013-12-31 19:14:36 -08:00
Jeff Forcier effdcd741a New year 2013-12-31 19:10:08 -08:00
Scott Maxwell 676a30c298 Fix import of win_pageant 2013-12-05 11:05:47 -05:00
Scott Maxwell a15d5ba25d Fix deprecation warning in array conversion 2013-12-04 00:43:03 -05:00
Scott Maxwell aa301506f4 Bump version to 1.13.0 in init 2013-11-19 12:08:33 -08:00
Scott Maxwell 103d056a77 Remove Python 2.5 from travis and fix minimum required version in init and README 2013-11-19 12:08:13 -08:00
Scott Maxwell 6d75c75e64 Remove byte conversions and unhexlify calls that we only needed for Py2.5 support and use the `b` byte string marker instead 2013-11-19 10:09:08 -08:00
Scott Maxwell 981f768a62 Remove `from __future__ import with_statement` 2013-11-19 09:38:05 -08:00
Scott Maxwell dcc78768bf Remove unnecessary vars for open 2013-11-19 09:38:05 -08:00
Scott Maxwell 106f9ea444 Use 'with' for opening most file and SFTPFIle objects 2013-11-19 09:38:05 -08:00
Scott Maxwell 2da5f1fb45 Use 'with' for opening most file and SFTPFIle objects 2013-11-19 08:56:53 -08:00
Scott Maxwell 7471515fff Remove eval that was required for Py25 support 2013-11-19 08:07:46 -08:00
Scott Maxwell 25dd096da0 Change all exceptions to modern format (not Py2.5 compatible) 2013-11-19 08:06:35 -08:00
Scott Maxwell 3ce336c88b Change conditional from PY3 to PY2 to be better prepared for a possible Py4. 2013-11-19 07:30:45 -08:00
Scott Maxwell 01731fa2c3 Bump version to 1.13.0 2013-11-02 20:28:02 -07:00
Scott Maxwell 7d5fa50ca4 More type conversions 2013-11-02 20:20:09 -07:00
Scott Maxwell dc58b7bcb2 Fix message to handle long properly, even on Py3 2013-11-02 20:19:52 -07:00