diff options
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/0001-Upstream-GitHub-Pull-Request-352-to-fix-buffer-objec.patch | 62 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 0 insertions, 65 deletions
diff --git a/debian/control b/debian/control index b9a7aaf..93d22ec 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,6 @@ Depends: python-crypto (>= 2.1.0-2), ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} -Conflict: python-bzrlib (<< 2.6.0) Description: Make ssh v2 connections with Python (Python 2) This is a library for making SSH2 connections (client or server). Emphasis is on using SSH2 as an alternative to SSL for making secure @@ -59,7 +58,6 @@ Depends: python3-crypto (>= 2.1.0-2), ${misc:Depends}, ${python3:Depends} Provides: ${python3:Provides} -Conflict: python-bzrlib (<< 2.6.0) Description: Make ssh v2 connections with Python (Python 3) This is a library for making SSH2 connections (client or server). Emphasis is on using SSH2 as an alternative to SSL for making secure diff --git a/debian/patches/0001-Upstream-GitHub-Pull-Request-352-to-fix-buffer-objec.patch b/debian/patches/0001-Upstream-GitHub-Pull-Request-352-to-fix-buffer-objec.patch deleted file mode 100644 index 123f7c9..0000000 --- a/debian/patches/0001-Upstream-GitHub-Pull-Request-352-to-fix-buffer-objec.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: "Jeremy T. Bouse" <Jeremy.Bouse@coxinc.com> -Date: Sun, 24 Aug 2014 20:47:42 -0400 -Subject: Upstream GitHub Pull Request #352 to fix "buffer" objects - -Include https://github.com/paramiko/paramiko/pull/352 patch to -resolve issue with support passing in "buffer" objects again -where bytestrings are expected. ---- - paramiko/py3compat.py | 4 ++++ - tests/test_file.py | 10 ++++++++++ - 2 files changed, 14 insertions(+) - -diff --git a/paramiko/py3compat.py b/paramiko/py3compat.py -index 8842b98..57c096b 100644 ---- a/paramiko/py3compat.py -+++ b/paramiko/py3compat.py -@@ -39,6 +39,8 @@ if PY2: - return s - elif isinstance(s, unicode): - return s.encode(encoding) -+ elif isinstance(s, buffer): -+ return s - else: - raise TypeError("Expected unicode or bytes, got %r" % s) - -@@ -49,6 +51,8 @@ if PY2: - return s.decode(encoding) - elif isinstance(s, unicode): - return s -+ elif isinstance(s, buffer): -+ return s.decode(encoding) - else: - raise TypeError("Expected unicode or bytes, got %r" % s) - -diff --git a/tests/test_file.py b/tests/test_file.py -index c6edd7a..22a34ac 100755 ---- a/tests/test_file.py -+++ b/tests/test_file.py -@@ -23,6 +23,7 @@ Some unit tests for the BufferedFile abstraction. - import unittest - from paramiko.file import BufferedFile - from paramiko.common import linefeed_byte, crlf, cr_byte -+import sys - - - class LoopbackFile (BufferedFile): -@@ -151,6 +152,15 @@ class BufferedFileTest (unittest.TestCase): - b'need to close them again.\n') - f.close() - -+ def test_8_buffering(self): -+ """ -+ verify that buffered objects can be written -+ """ -+ if sys.version_info[0] == 2: -+ f = LoopbackFile('r+', 16) -+ f.write(buffer(b'Too small.')) -+ f.close() -+ - if __name__ == '__main__': - from unittest import main - main() diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 14d6d51..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Upstream-GitHub-Pull-Request-352-to-fix-buffer-objec.patch |