From aeabd498a0a7826111911b979ed7453541ce250c Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 8 May 2017 11:33:11 -0700 Subject: [PATCH] Remove the now defunct version detection and imports --- tests/functional/__init__.py | 7 +------ tests/interfaces/__init__.py | 9 +++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py index e9d536412..bb8d97f15 100644 --- a/tests/functional/__init__.py +++ b/tests/functional/__init__.py @@ -25,13 +25,8 @@ Base directory for tests import sys from PyQt5 import QtWidgets -if sys.version_info[1] >= 3: - from unittest.mock import ANY, MagicMock, patch, mock_open, call, PropertyMock -else: - from mock import ANY, MagicMock, patch, mock_open, call, PropertyMock - # Only one QApplication can be created. Use QtWidgets.QApplication.instance() when you need to "create" a QApplication. application = QtWidgets.QApplication([]) application.setApplicationName('OpenLP') -__all__ = ['ANY', 'MagicMock', 'patch', 'mock_open', 'call', 'application', 'PropertyMock'] +__all__ = ['application'] diff --git a/tests/interfaces/__init__.py b/tests/interfaces/__init__.py index 1b5acc94c..14e1634ea 100644 --- a/tests/interfaces/__init__.py +++ b/tests/interfaces/__init__.py @@ -19,9 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., 59 # # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### -import sys - -if sys.version_info[1] >= 3: - from unittest.mock import patch, MagicMock -else: - from mock import patch, MagicMock +""" +Interface tests +"""