From 7c12862b55224faea75758ceef78135fa9119df2 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 15 Oct 2012 12:57:39 -0700 Subject: [PATCH] Only override unittest assertions when absolutely necessary. Fixes #85 --- NEWS | 5 +++++ tests/test_transport.py | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index de83fb2..adcc1b9 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,11 @@ v1.8.1 (DD MM YYYY) * #90: Ensure that callbacks handed to `SFTPClient.get()` always fire at least once, even for zero-length files downloaded. Thanks to Github user `@enB` for the catch. +* #85: Paramiko's test suite overrides + `unittest.TestCase.assertTrue/assertFalse` to provide these modern assertions + to Python 2.2/2.3, which lacked them. However on newer Pythons such as 2.7, + this now causes deprecation warnings. The overrides have been patched to only + execute when necessary. Thanks to `@Arfrever` for catch & patch. v1.8.0 (3rd Oct 2012) diff --git a/tests/test_transport.py b/tests/test_transport.py index cea4a1d..67926d1 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -107,8 +107,10 @@ class NullServer (ServerInterface): class TransportTest (unittest.TestCase): - assertTrue = unittest.TestCase.failUnless # for Python 2.3 and below - assertFalse = unittest.TestCase.failIf # for Python 2.3 and below + if not hasattr(unittest.TestCase, 'assertTrue'): + assertTrue = unittest.TestCase.failUnless # for Python 2.3 and below + if not hasattr(unittest.TestCase, 'assertFalse'): + assertFalse = unittest.TestCase.failIf # for Python 2.3 and below def setUp(self): self.socks = LoopSocket()