diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-06 16:11:34 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-06 16:11:34 +0100 |
| commit | 56e942318f3c493c8dcd4759f806034331ebeda5 (patch) | |
| tree | 82cdca65cd197f36ea3680171186e0ddcf234266 /git/test/lib/asserts.py | |
| parent | d46e3fe9cb0dea2617cd9231d29bf6919b0f1e91 (diff) | |
| parent | 68f8a43d1b643318732f30ee1cd75e1d315a4537 (diff) | |
| download | gitpython-56e942318f3c493c8dcd4759f806034331ebeda5.tar.gz | |
Merge branch 'py3' into 0.3
Conflicts:
git/refs/log.py
Diffstat (limited to 'git/test/lib/asserts.py')
| -rw-r--r-- | git/test/lib/asserts.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/git/test/lib/asserts.py b/git/test/lib/asserts.py index 0f2fd99a..60a888b3 100644 --- a/git/test/lib/asserts.py +++ b/git/test/lib/asserts.py @@ -7,13 +7,6 @@ import re import stat -__all__ = ['assert_instance_of', 'assert_not_instance_of', - 'assert_none', 'assert_not_none', - 'assert_match', 'assert_not_match', 'assert_mode_644', - 'assert_mode_755', - 'assert_equal', 'assert_not_equal', 'assert_raises', 'patch', 'raises', - 'assert_true', 'assert_false'] - from nose.tools import ( assert_equal, assert_not_equal, @@ -23,9 +16,14 @@ from nose.tools import ( assert_false ) -from mock import ( - patch -) +from mock import patch + +__all__ = ['assert_instance_of', 'assert_not_instance_of', + 'assert_none', 'assert_not_none', + 'assert_match', 'assert_not_match', 'assert_mode_644', + 'assert_mode_755', + 'assert_equal', 'assert_not_equal', 'assert_raises', 'patch', 'raises', + 'assert_true', 'assert_false'] def assert_instance_of(expected, actual, msg=None): |