Remove the now defunct version detection and imports

This commit is contained in:
Raoul Snyman 2017-05-08 11:33:11 -07:00
parent baa09a7dd6
commit aeabd498a0
2 changed files with 4 additions and 12 deletions

View File

@ -25,13 +25,8 @@ Base directory for tests
import sys import sys
from PyQt5 import QtWidgets 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. # Only one QApplication can be created. Use QtWidgets.QApplication.instance() when you need to "create" a QApplication.
application = QtWidgets.QApplication([]) application = QtWidgets.QApplication([])
application.setApplicationName('OpenLP') application.setApplicationName('OpenLP')
__all__ = ['ANY', 'MagicMock', 'patch', 'mock_open', 'call', 'application', 'PropertyMock'] __all__ = ['application']

View File

@ -19,9 +19,6 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
import sys """
Interface tests
if sys.version_info[1] >= 3: """
from unittest.mock import patch, MagicMock
else:
from mock import patch, MagicMock