Commit Graph

932 Commits

Author SHA1 Message Date
Scott Maxwell 951e8cfd3a Fix demos 2013-10-31 16:18:31 -07:00
Scott Maxwell bc683ac365 Fix demo_server 2013-10-31 15:35:35 -07:00
Scott Maxwell 8bda3ab2bb Fix demo_keygen 2013-10-31 15:25:57 -07:00
Scott Maxwell 7a45d3c70f More type conversion 2013-10-31 15:25:45 -07:00
Scott Maxwell 09a4ffb282 Salt needs to be 16 bytes instead of 8 2013-10-31 15:24:09 -07:00
Scott Maxwell 04097cbb26 Switch feed from text to binary 2013-10-31 11:37:37 -07:00
Scott Maxwell 85ade33ae3 More type fixups 2013-10-31 11:36:47 -07:00
Scott Maxwell 488d85f981 Setup so we can run test_sftp_big independently 2013-10-31 10:03:38 -07:00
Scott Maxwell fcf56ff9f8 Fix bytes/str type in more places 2013-10-31 10:01:21 -07:00
Scott Maxwell e4e1dc2002 Fix next 2013-10-30 17:15:40 -07:00
Scott Maxwell 7cdbbf4bdc Fix input 2013-10-30 17:15:25 -07:00
Scott Maxwell 0b7d0cf0a2 Convert and detect types properly, use helper constants, use StringIO and range 2013-10-30 17:14:52 -07:00
Scott Maxwell 2d738fa08b Fix winapi 2013-10-30 17:09:50 -07:00
Scott Maxwell 0e4ce3762a Fix message sending
Create constants for byte messages, implement asbytes so many methods can take Message and key objects directly and split get_string into get_text and get_binary. Also, change int handling to use mpint with a flag whenever the int is greater than 32 bits.
2013-10-30 17:09:34 -07:00
Scott Maxwell 339d73cc13 Fix imports 2013-10-30 16:49:33 -07:00
Scott Maxwell 2ea352b8ba Fix dict iters, sorts, exceptions, bytes renames and tuple args 2013-10-30 16:46:33 -07:00
Scott Maxwell 6bd1e42b43 Fix imports 2013-10-30 16:23:36 -07:00
Scott Maxwell 644c52266c Use test_path to avoid relative path issues 2013-10-30 16:22:52 -07:00
Scott Maxwell 66cfa97cce Fix imports 2013-10-30 16:19:30 -07:00
Scott Maxwell 3afc76a6b4 Write to locals instead of globals 2013-10-30 16:10:17 -07:00
Scott Maxwell 3301473ae7 Uncap the requirements 2013-10-30 16:07:30 -07:00
Scott Maxwell cd918d0dc6 Add Py3 helpers to common.py 2013-10-30 16:07:03 -07:00
Scott Maxwell 8edd2cc75e Add Py3.2 and Py3.3 to tox 2013-10-30 16:06:09 -07:00
Scott Maxwell f73d5f73e5 Fix print statements 2013-10-30 16:05:47 -07:00
Scott Maxwell e5822c9fa1 Add Py3.2 and Py3.3 to travis 2013-10-30 16:02:01 -07:00
Scott Maxwell 7aaf42a7b1 Add Py3 compatibility support helpers 2013-10-30 15:59:58 -07:00
Jeff Forcier a9a5f69c1a Merge branch '1.11' into 1.12
Conflicts:
	paramiko/__init__.py
2013-10-16 17:01:01 -07:00
Jeff Forcier 75c4304fe2 Merge branch '1.10' into 1.11
Conflicts:
	paramiko/__init__.py
2013-10-16 17:00:46 -07:00
Jeff Forcier 3232ce84ed Merge branch '1.9' into 1.10
Conflicts:
	paramiko/__init__.py
2013-10-16 17:00:33 -07:00
Jeff Forcier 858d3fd07f Merge branch '1.8' into 1.9
Conflicts:
	paramiko/__init__.py
2013-10-16 17:00:13 -07:00
Mike Gabriel 6b222528f3 Reintroduce __version_info__ variable
At least one application (mysql-workbench) (used to) use(s) the __version_info__
that got removed by commit 99859b8b02.

Breaking existing software with new versions of paramiko should be avoided.
This pull-request reintroduces the __version_info__ var, but fills it
from the __version__ var. No need to maintain multiple version strings.

Conflicts:
	paramiko/__init__.py
2013-10-16 16:59:35 -07:00
Jeff Forcier c73764a947 Merge branch '1.11'
Conflicts:
	paramiko/__init__.py
	setup.py
2013-09-27 22:01:17 -07:00
Jeff Forcier 96fdefbcb9 Merge branch '1.10' into 1.11
Updated versions for 1.11.2.

Conflicts:
	paramiko/__init__.py
	setup.py
2013-09-27 22:00:32 -07:00
Jeff Forcier f2466a3d46 Update version for 1.10.4 2013-09-27 21:59:48 -07:00
Jeff Forcier 48c67e24e0 Merge branch '1.11' 2013-09-27 21:57:42 -07:00
Jeff Forcier ceb39683dc Clone 1.10.4 items to 1.11.2 2013-09-27 21:57:37 -07:00
Jeff Forcier f88875da3f Merge branch '1.10' into 1.11 2013-09-27 21:57:16 -07:00
Jeff Forcier 8fcccce3d5 Changelog re #199, fixes #199 2013-09-27 21:56:57 -07:00
Jeff Forcier 28d78e4e6a Merge branch '1.11' 2013-09-27 21:29:59 -07:00
Jeff Forcier 07e61c3552 Merge branch '1.10' into 1.11 2013-09-27 21:29:56 -07:00
Jeff Forcier e25c7c4bdf Merge branch '1.9' into 1.10 2013-09-27 21:29:51 -07:00
Jeff Forcier 2de9c72720 Merge branch '1.8' into 1.9 2013-09-27 21:29:41 -07:00
Jeff Forcier 83f44878ea Fixed a typo in the license header of most files
Conflicts:
	paramiko/proxy.py
2013-09-27 21:29:18 -07:00
Jeff Forcier d4e18e1d1c Fix demo re #200 2013-09-27 21:20:28 -07:00
Jeff Forcier c3befd18a4 Merge branch '1.11' 2013-09-27 21:16:18 -07:00
Jeff Forcier 65271c65d2 Merge branch '1.10' into 1.11 2013-09-27 21:16:10 -07:00
Jeff Forcier 57046f44cb Changelog re #200 2013-09-27 21:16:06 -07:00
Jeff Forcier 1627ea6603 Merge branch '1.9' into 1.10 2013-09-27 21:14:35 -07:00
Jeff Forcier 8cdbcfa1ff Merge branch '1.8' into 1.9 2013-09-27 21:13:25 -07:00
Jeff Forcier e0d4fdbc5d Fix demo re #200 2013-09-27 21:13:21 -07:00