Commit f31b49f1 authored by Bram Schoenmakers's avatar Bram Schoenmakers

Merge pull request #40 from mruwek/use-unittest_mock

Use unittest.mock wherever it's available
parents 496e0339 0fbec7b2
......@@ -15,7 +15,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import unittest
import mock
# We're searching for 'mock'
# pylint: disable=no-name-in-module
try:
from unittest import mock
except ImportError:
import mock
from six import u
import os
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment