Skip to content

Commit 7e7c543

Browse files
committed
make mock import PyVer dependant
1 parent dbbc6f6 commit 7e7c543

File tree

7 files changed

+35
-7
lines changed

7 files changed

+35
-7
lines changed

plotly/tests/test_core/test_figure_messages/test_add_traces.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
from unittest import TestCase
2-
from mock import MagicMock
32
import plotly.graph_objs as go
43

4+
if sys.version_info.major == 3 and sys.version_info.minor >= 3:
5+
from unittest.mock import MagicMock
6+
else:
7+
from mock import MagicMock
58

69
class TestAddTracesMessage(TestCase):
710
def setUp(self):

plotly/tests/test_core/test_figure_messages/test_batch_animate.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
from unittest import TestCase
2-
from mock import MagicMock
32
import plotly.graph_objs as go
43

4+
if sys.version_info.major == 3 and sys.version_info.minor >= 3:
5+
from unittest.mock import MagicMock
6+
else:
7+
from mock import MagicMock
8+
59

610
class TestBatchAnimateMessage(TestCase):
711
def setUp(self):

plotly/tests/test_core/test_figure_messages/test_move_delete_traces.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
from unittest import TestCase
2-
from mock import MagicMock
32
import plotly.graph_objs as go
43
from nose.tools import raises
54

5+
if sys.version_info.major == 3 and sys.version_info.minor >= 3:
6+
from unittest.mock import MagicMock
7+
else:
8+
from mock import MagicMock
9+
10+
611
class TestMoveDeleteTracesMessages(TestCase):
712
def setUp(self):
813
# Construct initial scatter object

plotly/tests/test_core/test_figure_messages/test_on_change.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
from unittest import TestCase
2-
from mock import MagicMock
32
import plotly.graph_objs as go
43
from nose.tools import raises
54

5+
if sys.version_info.major == 3 and sys.version_info.minor >= 3:
6+
from unittest.mock import MagicMock
7+
else:
8+
from mock import MagicMock
9+
610

711
class TestOnChangeCallbacks(TestCase):
812
def setUp(self):

plotly/tests/test_core/test_figure_messages/test_plotly_relayout.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
from unittest import TestCase
2-
from mock import MagicMock
32
from nose.tools import raises
43
import plotly.graph_objs as go
54

5+
if sys.version_info.major == 3 and sys.version_info.minor >= 3:
6+
from unittest.mock import MagicMock
7+
else:
8+
from mock import MagicMock
9+
610

711
class TestRelayoutMessage(TestCase):
812

plotly/tests/test_core/test_figure_messages/test_plotly_restyle.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
from unittest import TestCase
2-
from mock import MagicMock
32
from nose.tools import raises
43

54
import plotly.graph_objs as go
65

6+
if sys.version_info.major == 3 and sys.version_info.minor >= 3:
7+
from unittest.mock import MagicMock
8+
else:
9+
from mock import MagicMock
10+
711

812
class TestRestyleMessage(TestCase):
913

plotly/tests/test_core/test_figure_messages/test_plotly_update.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
from unittest import TestCase
2-
from mock import MagicMock
32
from nose.tools import raises
43

54
import plotly.graph_objs as go
65
from plotly.basedatatypes import Undefined
76

7+
if sys.version_info.major == 3 and sys.version_info.minor >= 3:
8+
from unittest.mock import MagicMock
9+
else:
10+
from mock import MagicMock
11+
812

913
class TestBatchUpdateMessage(TestCase):
1014
def setUp(self):

0 commit comments

Comments
 (0)