Added Python 3.7 compatibility

2 files changed, 13 insertions, 3 deletions

diff --git a/tests/test_schedulers.py b/tests/test_schedulers.py
index 198745a..73baef4 100644
--- a/tests/test_schedulers.py
+++ b/tests/test_schedulers.py
@@ -1,4 +1,5 @@
 import logging
+import sys
 from datetime import datetime, timedelta
 from threading import Thread
 
@@ -728,8 +729,10 @@ Jobstore other:
         assert str(exc.value) == 'Expected a trigger instance or string, got int instead'
 
     def test_create_trigger_bad_plugin_type(self, scheduler):
+        mock_plugin = MagicMock()
+        mock_plugin.load.configure_mock(return_value=object)
         scheduler._trigger_classes = {}
-        scheduler._trigger_plugins = {'dummy': MagicMock(return_value=object)}
+        scheduler._trigger_plugins = {'dummy': mock_plugin}
         exc = pytest.raises(TypeError, scheduler._create_trigger, 'dummy', {})
         assert str(exc.value) == 'The trigger entry point does not point to a trigger class'
 
@@ -968,6 +971,7 @@ class TestAsyncIOScheduler(SchedulerImplementationTestBase):
         thread.join()
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 7), reason='Gevent does not yet work on Python 3.7+')
 class TestGeventScheduler(SchedulerImplementationTestBase):
     @pytest.fixture
     def scheduler(self):
diff --git a/tests/test_triggers.py b/tests/test_triggers.py
index dffc71d..299e9f6 100644
--- a/tests/test_triggers.py
+++ b/tests/test_triggers.py
@@ -1,5 +1,6 @@
 import pickle
 import random
+import sys
 from datetime import datetime, timedelta, date
 
 import pytest
@@ -538,9 +539,14 @@ class TestIntervalTrigger(object):
         assert repr(trigger) == "<CronTrigger (day='1-2,4-7', timezone='Europe/Berlin')>"
 
     def test_repr(self, trigger):
-        assert repr(trigger) == ("<IntervalTrigger (interval=datetime.timedelta(0, 1), "
+        if sys.version_info[:2] < (3, 7):
+            timedelta_args = '0, 1'
+        else:
+            timedelta_args = 'seconds=1'
+
+        assert repr(trigger) == ("<IntervalTrigger (interval=datetime.timedelta({}), "
                                  "start_date='2009-08-04 00:00:02 CEST', "
-                                 "timezone='Europe/Berlin')>")
+                                 "timezone='Europe/Berlin')>".format(timedelta_args))
 
     def test_str(self, trigger):
         assert str(trigger) == "interval[0:00:01]"