Commit Graph

672 Commits

Author SHA1 Message Date
Laurent Peuch 400ea089d5 add the url to github in the setup.py for pypi
(cherry picked from commit abfefc2f95c377cc134d9b0b71c8cdd692f321c8)

Conflicts:
	setup.py
2012-09-24 18:56:20 -07:00
Jeff Forcier 45c1212949 Changelog re #36
(cherry picked from commit 5b8cdd990fea9269f8b5297ad1e3e52de08f2ee6)
2012-09-24 18:54:33 -07:00
Andrew 38dec6fc5b - make sure we honor 2-factor for all auth_pkey blocks
- explicit check for ['password'] as remaining auth type
(cherry picked from commit 53a3421da6d74333c4679fd6289d418917833b44)
2012-09-24 18:54:30 -07:00
Andrew b592eb1074 make sure to break out of key auth loop on success when doing 2-factor
(cherry picked from commit 0a4aa8a9d119022adef3b8d89f129ea26110fc1a)
2012-09-23 16:46:07 -07:00
Andrew 33176b90f7 add support for 2 factor authentication (key+password)
(cherry picked from commit be19c273bbe77d58fd67edeabf344ff253997b23)
2012-09-23 16:46:06 -07:00
Jeff Forcier 25942dbd90 Attribution re: #33
(cherry picked from commit 8793771f3804b3f9bb4bf63d0b36ca105de78979)
2012-09-23 16:46:03 -07:00
Jeff Forcier 7f3124dcd9 Attribution re #32
(cherry picked from commit 2f4303df3e7477dca28badee2f1cc14573befab6)
2012-09-23 16:45:54 -07:00
Thomas Vander Stichele 01aaf70fc2 show us the offending host key
(cherry picked from commit a753df8ea43c26114942147fde2f10f82da5ca29)
2012-09-23 16:45:53 -07:00
Jan Brauer 7f526044e0 re #33 - fix typo, be more pythonic
(cherry picked from commit 803820c3c8b1aaf2a11588431582916dbb23ea1e)
2012-09-23 16:45:51 -07:00
Jan Brauer d18b8cf1e9 Fix #33 - parse config as described by manpage
(cherry picked from commit 011805eae07ee7be6140b95f6d8669763c55b3d9)
2012-09-23 16:45:49 -07:00
Jeff Forcier d3dc9fcb19 Attribution for Paramiko 63
(cherry picked from commit 00518b5044344adcc9a7b2363676165d9c80b80f)
2012-09-23 16:45:47 -07:00
Jeff Forcier 627f05e116 Changelog for previous commit
(cherry picked from commit c9c7d36ce1139f3186e8494162d4fc918a38a052)
2012-09-23 16:45:44 -07:00
Jeff Forcier 898a4041a6 Fix SSHException when re-keying over a fast connection
Port of https://github.com/paramiko/paramiko/pull/63
(cherry picked from commit a7fcb4def4d43f69a00861c5e6a28dcd4d1aae6f)
2012-09-23 16:45:36 -07:00
Jeff Forcier f04ddd420d Fix broken tests
(cherry picked from commit 00e1072ee5abbc92b5df57e10cadb638d583d971)

Conflicts:
	tests/test_util.py
2012-09-23 16:45:28 -07:00
Jeff Forcier 01735419f3 Bump to 1.7.14
(cherry picked from commit c3a7e9d587)

Conflicts:
	setup.py
2012-09-23 16:20:01 -07:00
Jeff Forcier 077fdae801 Reorganize forwarded agent cxns to avoid errors
Fixes [Fabric #562](https://github.com/fabric/fabric/issues/562).
(cherry picked from commit 58aa52085b)
2012-09-23 16:19:42 -07:00
Jeff Forcier 1a033dc596 safe type checking (isinstance instead of type-is)
Maintainer note: added changelog entry.
(cherry picked from commit 8917d83221)
2012-09-23 16:19:40 -07:00
Jeff Forcier ef9b251885 Changelog re #15
(cherry picked from commit ccb9d75177)
2012-09-23 16:19:38 -07:00
Olle Lundberg 6b8284640e Add support for variable expansion in SSHConfig
(cherry picked from commit 31482a46d6)
2012-09-23 16:19:31 -07:00
Olle Lundberg 697524a79f Add basic support for parameter substitution in SSHConfig.
(cherry picked from commit fb24d79695)
2012-09-23 16:19:29 -07:00
Jeff Forcier 76e7dc0335 Ignore test log
(cherry picked from commit 9fd47b5501)

Conflicts:
	.gitignore
2012-09-23 16:19:25 -07:00
Bobby Impollonia ae3ecbe548 Remove comparison between int and str
The code had been doing 'n < self.__in_buffer' when it
wanted to be doing 'n < len(self.__in_buffer)'

In Python 2.x, this comparison (int < str) is always True.
I found this while porting to Python 3 where it raises
an error.

The code has been working without complaints because always
taking the true branch of this conditional is actually fine.
We don't need the false branch, so drop the check entirely.
(cherry picked from commit 0a013f829e)
2012-09-23 16:18:57 -07:00
Bobby Impollonia bd5c843040 Replace hard tabs with spaces
(cherry picked from commit c07eddb9e1)
2012-09-23 16:18:56 -07:00
Jeff Forcier a05b770c03 Also as well? Y U NO ENGLISH GOOD
(cherry picked from commit ece1a825e8)
2012-09-23 16:18:55 -07:00
Jeff Forcier d804a303a7 Language tweak
(cherry picked from commit 94ea149145)
2012-09-23 16:18:52 -07:00
Jeff Forcier e41ab9194a First draft of modern explanatory README
(cherry picked from commit 4f7338bbfc)
2012-09-23 16:18:26 -07:00
Silas Sewell e375d671a4 Fix FSF address
(cherry picked from commit 4db2ca594b)

CHANGED: only applied the address change to LICENSE and setup.py.

Rest left untouched. :effort:
2012-09-23 16:16:57 -07:00
Jeff Forcier 11ca8134a2 Cut 1.7.13
(cherry picked from commit 998377f353)

Conflicts:
	setup.py
2012-09-23 16:11:18 -07:00
Jeff Forcier 9c5791edb8 Fixes #4, thanks again to @jaraco
(cherry picked from commit b59430efef)
2012-09-23 16:10:52 -07:00
Jeff Forcier 9b2f36fc1f Whitespace tweaks, thanks @jaraco
(cherry picked from commit 3b20efcc14)
2012-09-23 16:10:50 -07:00
Jeff Forcier 1882f3470b Move fcntl import to avoid high level ImportErrors on Windows
Fixes #5.
(cherry picked from commit ec2aedac71)
2012-09-23 16:10:42 -07:00
Jeff Forcier c3e9b76d51 Clean up Makefile, ensure release is useful again
(cherry picked from commit 3e4632979f)

Conflicts:
	Makefile
2012-09-23 16:10:26 -07:00
Jeff Forcier ac7f513ee8 Release 1.7.12
(cherry picked from commit c630917d0d)

Conflicts:
	paramiko/__init__.py
	setup.py
2012-09-23 16:09:44 -07:00
Jeff Forcier 2519e541b1 Changelog entry for io_sleep change
(cherry picked from commit cbd9c4a76e)
2012-09-23 16:09:06 -07:00
Jeff Forcier 8208812ae6 Changelog entry for 1.7.11 (internal only though)
(cherry picked from commit 5ce70f3cb0)
2012-09-23 16:09:03 -07:00
Jeff Forcier 0916fbe292 Forgot to re-add import, derp
(cherry picked from commit 474ace1ca4)
2012-09-23 16:08:39 -07:00
Jeff Forcier 3d598a64b4 Add IO sleep to agent forward communications.
Without this, use of agent forwarding causes
high CPU usage on some clients.
(cherry picked from commit 3030589aaa)

Conflicts:
	paramiko/agent.py
2012-09-23 16:08:35 -07:00
Jeff Forcier c903245ed9 Trying something stupid re: ==dev
(cherry picked from commit 543651bfd2)

Conflicts:
	setup.py
2012-09-23 16:07:40 -07:00
Jeff Forcier d3b48e9b44 Bump to 1.7.11
(cherry picked from commit 9234baed01)

Conflicts:
	paramiko/__init__.py
	setup.py
2012-09-23 16:07:03 -07:00
Jeff Forcier 10beb86e9e Partially revert centralized version stuff
(cherry picked from commit d9ba7a644c)

Conflicts:
	setup.py
2012-09-23 16:05:00 -07:00
Jeff Forcier 013d459487 Goofed up the RST
(cherry picked from commit 175075e045)
2012-09-23 16:04:10 -07:00
Jeff Forcier 253a22a770 add ==dev install URL to setup.py
(cherry picked from commit 48c21beac9)
2012-09-23 16:04:06 -07:00
Jeff Forcier 903646677b Bump dev version
(cherry picked from commit 59cae8560b)
2012-09-23 16:03:58 -07:00
Jeff Forcier 7b7b23572b Let's not have 5 different freakin version strings
Also bumps to 1.7.10
(cherry picked from commit 01eea3326a)

Conflicts:
	README
	paramiko/__init__.py
	paramiko/transport.py
	setup.py
2012-09-23 16:03:38 -07:00
Jeff Forcier 4d4780abaa Going to release 1.7.10 for ==dev
(cherry picked from commit bd3a64fac2)
2012-09-23 15:58:38 -07:00
Jeff Forcier 3cf76a85c4 Add post-Paramiko changelog file for now
(cherry picked from commit 08ff651d0f)

Conflicts:
	CHANGES
2012-09-23 15:58:27 -07:00
Jeff Forcier 8510adcc96 Going to release 1.7.10 for ==dev
(cherry picked from commit 95e464b238)
2012-09-23 15:56:43 -07:00
Jeff Forcier 096d73e567 Add post-Paramiko changelog file for now
(cherry picked from commit 3e41abb6be)
2012-09-23 15:56:33 -07:00
Jeff Forcier 5f839942c7 add ==dev install URL to setup.py
(cherry picked from commit e72b53788d)
2012-09-23 15:56:08 -07:00
Jeff Forcier ba4dc2a26b Don't mix tabs and spaces
(cherry picked from commit 8c8d0a81ad)
2012-09-23 15:56:06 -07:00