Only override unittest assertions when absolutely necessary.

Fixes #85
This commit is contained in:
Jeff Forcier 2012-10-15 12:57:39 -07:00
parent 1341e28882
commit 7c12862b55
2 changed files with 9 additions and 2 deletions

5
NEWS
View File

@ -18,6 +18,11 @@ v1.8.1 (DD MM YYYY)
* #90: Ensure that callbacks handed to `SFTPClient.get()` always fire at least * #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 once, even for zero-length files downloaded. Thanks to Github user `@enB` for
the catch. 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) v1.8.0 (3rd Oct 2012)

View File

@ -107,7 +107,9 @@ class NullServer (ServerInterface):
class TransportTest (unittest.TestCase): class TransportTest (unittest.TestCase):
if not hasattr(unittest.TestCase, 'assertTrue'):
assertTrue = unittest.TestCase.failUnless # for Python 2.3 and below 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 assertFalse = unittest.TestCase.failIf # for Python 2.3 and below
def setUp(self): def setUp(self):