diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-10 12:58:02 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-10 12:58:02 -0700 |
commit | bade24d2d5b76c3f38bf0310ea8072184ab95b2a (patch) | |
tree | 160c9e52fc9911696247c1fe9e4bfec3c15ab662 /tests/util.py | |
parent | 0063e64046c732e8c50fc5f54234942feaa313d9 (diff) | |
parent | e71f4e59878a636268475f642ed4e98a1b3e375d (diff) |
Merge branch 'master' into 216-int
Conflicts:
paramiko/transport.py
paramiko/util.py
tests/test_client.py
Diffstat (limited to 'tests/util.py')
-rw-r--r-- | tests/util.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/util.py b/tests/util.py index 66d2696c..b546a7e1 100644 --- a/tests/util.py +++ b/tests/util.py @@ -1,17 +1,7 @@ import os -import unittest root_path = os.path.dirname(os.path.realpath(__file__)) - -class ParamikoTest(unittest.TestCase): - # for Python 2.3 and below - if not hasattr(unittest.TestCase, 'assertTrue'): - assertTrue = unittest.TestCase.failUnless - if not hasattr(unittest.TestCase, 'assertFalse'): - assertFalse = unittest.TestCase.failIf - - def test_path(filename): return os.path.join(root_path, filename) |