jobqueue.py: move the check for job.interval types into Job.__init__

jh0ker · jh0ker · commit c7cd3790168d · 2016-12-14T06:30:18.000+01:00
diff --git a/telegram/ext/jobqueue.py b/telegram/ext/jobqueue.py
@@ -79,17 +79,9 @@ def put(self, job, next_t=None):
         job.job_queue = self
 
         if next_t is None:
-            interval = job.interval
+            next_t = job.interval
 
-            if isinstance(interval, Number):
-                next_t = interval
-            elif isinstance(interval, datetime.timedelta):
-                next_t = interval.total_seconds()
-            else:
-                raise ValueError("The interval argument should be of type datetime.timedelta,"
-                                 " int or float")
-
-        elif isinstance(next_t, datetime.datetime):
+        if isinstance(next_t, datetime.datetime):
             next_t = next_t - datetime.datetime.now()
 
         elif isinstance(next_t, datetime.time):
@@ -274,6 +266,10 @@ def __init__(self, callback, interval=None, repeat=True, context=None, days=Days
         if interval is None and repeat:
             raise ValueError("You must either set an interval or set 'repeat' to 'False'")
 
+        if not (isinstance(interval, Number) or isinstance(interval, datetime.timedelta)):
+            raise ValueError("The 'interval' argument must be of type 'datetime.timedelta',"
+                             " 'int' or 'float'")
+
         self.days = days
         self.name = callback.__name__
         self._remove = Event()
