summaryrefslogtreecommitdiff
path: root/git/test/lib/asserts.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-04 19:14:33 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-04 19:14:33 +0100
commitf6aa8d116eb33293c0a9d6d600eb7c32832758b9 (patch)
treeee07288965cfd4e8326c57735e94c347ee7dd829 /git/test/lib/asserts.py
parent3936084cdd336ce7db7d693950e345eeceab93a5 (diff)
downloadgitpython-f6aa8d116eb33293c0a9d6d600eb7c32832758b9.tar.gz
initial set of adjustments to make (most) imports work.
More to come, especially when it's about strings
Diffstat (limited to 'git/test/lib/asserts.py')
-rw-r--r--git/test/lib/asserts.py18
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):