Skip to content

prefer newer unittest.mock when available #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prefer newer unittest.mock when available #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tests/test_progressbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,14 @@
Test the progressbar 'FileTransferSpeed' integration
"""

try:
import unittest.mock
except ImportError:
import mock

from . import TestCase
import bitmath
from bitmath.integrations.bmprogressbar import BitmathFileTransferSpeed
import mock
import progressbar


Expand Down
6 changes: 5 additions & 1 deletion tests/test_query_device_capacity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@

from . import TestCase
import bitmath
import mock
import struct

try:
import unittest.mock
except ImportError:
import mock

try:
# Python 3.3+
from contextlib import ExitStack, contextmanager
Expand Down