Fix for Python 4: do not compare sys.version_info.minor to integer

Author: hugovk

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_api/__init__.py

@@ -8,7 +8,7 @@
 import sys
 
 # import from mock
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import patch
 else:
     from mock import patch

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_plotly/test_credentials.py

@@ -9,7 +9,7 @@
 import sys
 
 # import from mock
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import patch
 else:
     from mock import patch

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_plotly/test_plot.py

@@ -25,7 +25,7 @@
 
 
 # import from mock
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import patch
 else:
     from mock import patch

packages/python/plotly/_plotly_utils/utils.py

@@ -7,9 +7,6 @@
 from _plotly_utils.basevalidators import ImageUriValidator
 
 
-PY36_OR_LATER = sys.version_info.major == 3 and sys.version_info.minor >= 6
-
-
 class PlotlyJSONEncoder(_json.JSONEncoder):
     """
     Meant to be passed as the `cls` kwarg to json.dumps(obj, cls=..)

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_add_traces.py

@@ -3,7 +3,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_batch_animate.py

@@ -3,7 +3,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_move_delete_traces.py

@@ -4,7 +4,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_on_change.py

@@ -4,7 +4,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_plotly_relayout.py

@@ -3,7 +3,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_plotly_restyle.py

@@ -3,7 +3,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock