diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2016-10-01 20:42:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-01 20:42:27 +0200 |
| commit | 9d6b417ea3a4507ea78714f0cb7add75b13032d5 (patch) | |
| tree | 77365cb808a255eb53889725bfce775b5090330e /git/test/lib/asserts.py | |
| parent | 4592785004ad1a4869d650dc35a1e9099245dad9 (diff) | |
| parent | 9a521681ff8614beb8e2c566cf3c475baca22169 (diff) | |
| download | gitpython-9d6b417ea3a4507ea78714f0cb7add75b13032d5.tar.gz | |
Merge pull request #519 from ankostis/appveyor
Test project on Windows with MINGW/Cygwin git (conda2.7&3.4/cpy-3.5)
Diffstat (limited to 'git/test/lib/asserts.py')
| -rw-r--r-- | git/test/lib/asserts.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git/test/lib/asserts.py b/git/test/lib/asserts.py index 60a888b3..9edc49e0 100644 --- a/git/test/lib/asserts.py +++ b/git/test/lib/asserts.py @@ -16,7 +16,10 @@ from nose.tools import ( assert_false ) -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch __all__ = ['assert_instance_of', 'assert_not_instance_of', 'assert_none', 'assert_not_none', |