dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,404 Commits 8 Branches 20 Tags 3.3 MiB
Commit Graph

1404 Commits

Author SHA1 Message Date
Jeff Forcier ba55eea38d Merge remote-tracking branch 'scottkmaxwell/python3-with-import-fix' into python3 2014-03-13 11:19:04 -07:00
Jeff Forcier 120071283d Fix accidental Markdown formatting miss for an older entry 2014-03-13 11:15:34 -07:00
Jeff Forcier 8463053fa5 Add changelog re #16 2014-03-13 11:15:20 -07:00
Scott Maxwell 386384a498 Remove dead Py2.2 code and fix a bunch of PEP8 formatting 2014-03-08 08:59:25 -08:00
Scott Maxwell f0017b8330 Fix import * and a bunch of PEP8 formatting 2014-03-07 20:45:26 -08:00
Jeff Forcier 073c71a822 Attempt to fix docs for py3 2014-03-07 18:46:40 -08:00
Jeff Forcier 71e8ddef2b Remove race condition regression re #276 2014-03-07 16:24:32 -08:00
Jeff Forcier b4cd4bea1d Start in on star import eradication 2014-03-07 16:17:19 -08:00
Jeff Forcier b29d018e36 Remove an old Py2.5-ism 2014-03-07 15:10:35 -08:00
Jeff Forcier 1b5332ead1 Skip failing test on Py3 2014-03-07 14:31:52 -08:00
Jeff Forcier 85e9405f8a Make `byte_ord` gentler 2014-03-07 13:16:47 -08:00
Jeff Forcier c646e72832 Fix some Py2-isms in constant_time_bytes_eq 2014-03-07 12:55:46 -08:00
Jeff Forcier 3579f76dc7 Another fix that looked important but wasn't 2014-03-07 12:45:06 -08:00
Jeff Forcier 4c601eb95c This doesn't really matter, but whatever 2014-03-07 12:44:23 -08:00
Jeff Forcier 055c4a0fe1 One spot newer than scott's changes which prob needed a py3-ism 2014-03-07 12:36:25 -08:00
Jeff Forcier 7688c7aaaf More minor whitespacey bits 2014-03-07 12:32:53 -08:00
Jeff Forcier 8f8b0cde91 Tabs to spaces 2014-03-07 12:07:49 -08:00
Jeff Forcier 1b22497a46 Some whitespacey bits 2014-03-07 12:03:52 -08:00
Jeff Forcier e902bd4f80 One last obvious missing bit 2014-03-07 11:49:55 -08:00
Jeff Forcier 5eac8e8b87 Another indentation fix that isn't helping (tho in this case, obvious why) 2014-03-07 11:46:14 -08:00
Jeff Forcier 8f49c15258 I was really hoping this was causing a lot of the test errors :( 2014-03-07 11:36:49 -08:00
Jeff Forcier 0edffbb040 Some Epydoc->Sphinx stuff that came from the merge 2014-03-07 11:32:02 -08:00
Jeff Forcier 77f3b07f12 A missed line from the merge. 2014-03-07 11:31:46 -08:00
Jeff Forcier 8d08cc926a Found a dumb typo. 
Hooray for manually applied diffs =/
 2014-03-07 10:43:14 -08:00
Jeff Forcier a9434bc626 Missed a spot 2014-03-06 15:14:09 -08:00
Jeff Forcier 7e8623f06f Fix a bunch of indentation errors. 
Maybe that whitespace merge flag was not so great an idea.
 2014-03-05 17:12:09 -08:00
Jeff Forcier b2be63ec62 Merge remote-tracking branch 'scottkmaxwell/py3-support-without-py25' into python3 
Conflicts:
	dev-requirements.txt
	paramiko/__init__.py
	paramiko/file.py
	paramiko/hostkeys.py
	paramiko/message.py
	paramiko/proxy.py
	paramiko/server.py
	paramiko/transport.py
	paramiko/util.py
	paramiko/win_pageant.py
	setup.py
 2014-03-05 17:03:37 -08:00
Jeff Forcier bd61c7c0a9 Merge branch '1.12' 2014-03-05 09:56:37 -08:00
Jeff Forcier e694fa243c Merge branch '1.11' into 1.12 2014-03-05 09:56:32 -08:00
Jeff Forcier 148f3d2fd4 Merge branch '1.10' into 1.11 2014-03-05 09:56:28 -08:00
Jeff Forcier 6d00e03d75 Seriously, no more epydoc! 2014-03-05 09:56:25 -08:00
Jeff Forcier feb78d8a3f Merge branch '1.11' into 1.12 2014-03-05 09:55:19 -08:00
Jeff Forcier 48ab72508a No more epydoc, part 2 2014-03-05 09:55:16 -08:00
Jeff Forcier 7a776b1757 Testing out intersphinx in changelog 2014-03-04 17:43:30 -08:00
Jeff Forcier 32975af9a6 Merge branch '1.12' 2014-03-04 16:16:38 -08:00
Jeff Forcier 38785d9cd2 Merge branch '1.11' into 1.12 2014-03-04 16:16:36 -08:00
Jeff Forcier d5ed558c21 Merge branch '1.10' into 1.11 2014-03-04 16:16:33 -08:00
Jeff Forcier 798e3689dd Note Sphinx docs issue was backported 2014-03-04 16:16:29 -08:00
Jeff Forcier f9fef01e76 Merge branch '1.12' 2014-03-04 15:56:49 -08:00
Jeff Forcier 247ef7f6f7 Merge branch '1.11' into 1.12 2014-03-04 15:56:46 -08:00
Jeff Forcier 8f22672926 Merge branch '1.10' into 1.11 2014-03-04 15:54:16 -08:00
Jeff Forcier f295840191 Semi no-op fix to test RTD hooks 2014-03-04 15:45:01 -08:00
Jeff Forcier 7d2e068382 Merge branch '1.11' 2014-03-04 13:58:28 -08:00
Jeff Forcier 440faef033 Merge branch '1.11' into 1.12 2014-03-04 13:58:26 -08:00
Jeff Forcier 9b83214b1e Merge branch '1.10' into 1.11 2014-03-04 13:58:24 -08:00
Jeff Forcier 4747abd6a1 Newer invocations for release task 2014-03-04 13:58:21 -08:00
Jeff Forcier 2900b67b5e Merge branch '1.12' 2014-03-04 13:39:30 -08:00
Jeff Forcier 0c72e277df Merge branch '1.11' into 1.12 2014-03-04 13:39:28 -08:00
Jeff Forcier 873b6d4a95 Merge branch '1.10' into 1.11 2014-03-04 13:39:26 -08:00
Jeff Forcier be94ee690e No more Makefile 2014-03-04 13:38:44 -08:00