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
f2466a3d46
Update version for 1.10.4
2013-09-27 21:59:48 -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
05abcc40f5
Fix #179 - missing host variable in fqdn evaluation
2013-09-27 16:08:59 -07:00
Jeff Forcier
02387fc88c
Merge branch '1.10' into 168-int
...
Conflicts:
NEWS
setup.py
2013-09-20 14:39:55 -07:00
Jeff Forcier
565eff8274
Apply slightly modified version of patch from #162
2013-09-20 13:19:01 -07:00
Jeff Forcier
965d00dee9
Version bump
2013-07-26 15:05:35 -07:00
Emre Yılmaz
3399d519e0
updated config to be compatible with multiple localforward and remoteforward options.
2013-05-21 00:40:28 +03:00
Jeff Forcier
d77a4d6421
Merge branch '1.10'
2013-05-05 13:59:41 -07:00
Jeff Forcier
3c2f01c91f
Flip bad known_hosts line to INFO from WARN re #153
2013-05-05 13:59:34 -07:00
Ethan Glasser-Camp
8c7f120c2c
Warn on parse failure when reading known_hosts
2013-04-28 18:10:02 -07:00
Jeff Forcier
675d79d743
Merge pull request #153 from glasserc/log_bad_hostkeys
...
Warn on parse failure when reading known_hosts
2013-04-28 18:08:55 -07:00
Ethan Glasser-Camp
aee2355d24
Warn on parse failure when reading known_hosts
2013-04-28 14:21:05 -04:00
Jeff Forcier
a1fa1ba9cc
Merge branch '1.10'
...
Conflicts:
NEWS
2013-04-27 22:15:07 -07:00
Abhinav Upadhyay
e6c23f23f4
Fix indentation at few places.
2013-04-27 22:08:50 -07:00
Jeff Forcier
f861c2ff48
Back out broken but non-required hostname hash change
2013-04-27 20:55:50 -07:00
Mike Gabriel
1b928df15e
do not write ,,garbage'' to known_hosts file(s)
2013-04-27 20:36:45 -07:00
Mike Gabriel
81f87f1d5e
Load host entries from the known_hosts file(s) before writing the file from RAM to disk. Avoids loss of host entries in case other SSH clients have written to the known_hosts file(s) meanwhile.
2013-04-27 20:36:45 -07:00
Mike Gabriel
080bece258
Assure that host entries in known_hosts files do not duplicate endlessly if keys from known_hosts are loaded via HostKeys.load() more than once (e.g. for refreshing the list of known hosts during runtime).
2013-04-27 20:36:45 -07:00
Mike Gabriel
4f481a57a2
Store hostname hashes in memory rathen than the non-hashed host entries. Also assures that the host entries in known_hosts get saved in hashed format as it is currently standard in OpenSSH.
2013-04-27 20:36:45 -07:00
Jeff Forcier
b329512636
Merge branch '1.10'
...
Conflicts:
NEWS
2013-04-05 13:02:11 -07:00
Jeff Forcier
02d071be07
Bump version to 1.10.1
2013-04-05 13:00:19 -07:00
Kevin Tegtmeier
2e2a915807
Fix bug that leaves fds in select after EOF received
2013-04-05 11:54:48 -07:00
Jeff Forcier
73a0d03bdc
Merge branch '1.10'
...
Conflicts:
NEWS
2013-04-05 11:51:47 -07:00
Jeff Forcier
a7ee2509e4
Merge branch 'master' into 112-int
...
Conflicts:
paramiko/win_pageant.py
2013-03-19 13:36:52 -07:00
Jason R. Coombs
c305691492
Remove dependency on pywin32. Just use ctypes for simplicity.
2013-03-19 13:24:31 -07:00
Jason R. Coombs
9858ccf207
Remove test for presence of ctypes (assumed present in global imports).
2013-03-19 13:24:31 -07:00
Jason R. Coombs
3cd7f585d0
Remove 'file_size' check from tests. The docstring indicates this parameter is to be passed to the callback, and there's no reason to think this parameter is relevant in affecting whether a useful stat object has been passed (especially when the 'confirm' parameter is explicitly supplied for that decision. This fixes #142 .
2013-03-04 08:46:39 -05:00
Olle Lundberg
bd1a97a045
Speed up the write operation by bulk calling read.
...
Bulk check the ACKs from the server every 32MB
(or every write request). This way you gain speed
but also making sure not to get the error too late
in a large transfer.
This works for smaller files too, since there is a
cleanup routine being called when the file has been transfered.
2013-03-01 11:39:13 -08:00
Phillip Heller
edc9eaf4f2
Added width_pixel and height_pixel parameters to Channel.get_pty() and
...
resize_pty(), and Client.invoke_shell(). Perhaps useless, but more RFC
compliant. Updated methods to include these parameters in server messages.
Adjusted Channel.resize_pty() to neither request nor wait for a response, as
per RFC 4254 6.7 (A response SHOULD NOT be sent to this message.) This is
necessary as certain hosts have been observed to not acknowledge this type of
channel request (Cisco IOS XR), which causes paramiko to end the session.
2013-03-01 10:33:03 -08:00
Olle Lundberg
1903ee1432
Pep8 fixes
2013-02-28 12:52:01 +01:00
Olle Lundberg
732417bf98
Merge branch 'openssh-compatibility' of github.com:lndbrg/paramiko into openssh-compatibility
...
Conflicts:
paramiko/config.py
tests/test_util.py
2013-02-28 12:51:00 +01:00
Olle Lundberg
06f9704820
Pep8 fixes
2013-02-28 12:45:07 +01:00
Olle Lundberg
93dce43e86
Fix argument passed to LazyFqdn
2013-02-28 12:36:21 +01:00
Olle Lundberg
f41fc8fd28
Create a copy of the identityfile list.
...
The copy is needed else the original
identityfile list is in the internal
config list is updated when we modify
the return dictionary.
2013-02-28 12:31:59 +01:00
Olle Lundberg
ea3c3f53b6
DRY up the code for populating the return list
2013-02-28 12:14:59 +01:00
Olle Lundberg
c79e6a3f92
Whitespace fixes.
2013-02-28 12:14:59 +01:00
Olle Lundberg
32424ba109
Be more pythonic.
2013-02-28 12:11:41 +01:00
Olle Lundberg
ac1310c4a1
Implement support for parsing proxycommand.
2013-02-28 12:11:41 +01:00
Olle Lundberg
42d77483e8
Pep8 fixes
2013-02-28 12:10:55 +01:00
Olle Lundberg
85551dffd6
Spelling
2013-02-28 12:08:59 +01:00
Olle Lundberg
57d776b318
Add host negation support to paramiko config.
...
This is a rewrite of the SSHConfig class to
conform with the rules specified by the
manpage for ssh_config.
This change also adds support for negation
according to the rules introduced by
OpenSSH 5.9. Reference:
http://www.openssh.com/txt/release-5.9
2013-02-28 12:08:59 +01:00
Jeff Forcier
3563fca994
Refactor duplicative code re #110
2013-02-27 19:54:22 -08:00
John Hensley
9d2fb82284
Document SSHConfig FQDN logic.
...
Merged with pre-picked changes re #128 .
Conflicts:
paramiko/config.py
2013-02-27 19:48:50 -08:00
Parantapa Bhattacharya
2f1daad1b9
Compute host's FQDN on demand only
2013-02-27 19:03:49 -08:00
Jeff Forcier
7e5911a1ff
Give sdctr a default value for backwards+test compat
...
Re #102
2013-02-27 18:50:37 -08:00