diff options
| author | Anselm Kruis <a.kruis@science-computing.de> | 2014-05-28 00:14:51 +0200 |
|---|---|---|
| committer | Anselm Kruis <a.kruis@science-computing.de> | 2014-05-28 00:14:51 +0200 |
| commit | 8904c15316fbd4dc58f1903479ad559c7677dc2b (patch) | |
| tree | 5f457c09de34951af591fbfaddcff6260d063a27 /tests/test_sftp_big.py | |
| parent | ce87fc8d7a8a025671183fc78091e5d1f6760f5f (diff) | |
| parent | e811e715833373dd2f2ba898089695eee9c882ed (diff) | |
Merge branch 'master' into gssapi-py3-support
Conflicts:
dev-requirements.txt
sites/www/changelog.rst
Diffstat (limited to 'tests/test_sftp_big.py')
| -rw-r--r-- | tests/test_sftp_big.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_sftp_big.py b/tests/test_sftp_big.py index 521fbdc8..abed27b8 100644 --- a/tests/test_sftp_big.py +++ b/tests/test_sftp_big.py @@ -85,7 +85,7 @@ class BigSFTPTest (unittest.TestCase): write a 1MB file with no buffering. """ sftp = get_sftp() - kblob = (1024 * 'x') + kblob = (1024 * b'x') start = time.time() try: with sftp.open('%s/hongry.txt' % FOLDER, 'w') as f: @@ -231,7 +231,7 @@ class BigSFTPTest (unittest.TestCase): without using it, to verify that paramiko doesn't get confused. """ sftp = get_sftp() - kblob = (1024 * 'x') + kblob = (1024 * b'x') try: with sftp.open('%s/hongry.txt' % FOLDER, 'w') as f: f.set_pipelined(True) |