fix: avoid type error for Python 3 (#214)

Author: oakbani

optimizely/event/event_processor.py

@@ -12,6 +12,7 @@
 # limitations under the License.
 
 import abc
+import numbers
 import threading
 import time
 
@@ -100,13 +101,14 @@ def __init__(self,
       self.logger.error(enums.Errors.INVALID_INPUT.format('notification_center'))
       self.notification_center = _notification_center.NotificationCenter()
 
+    self.executor = None
     if start_on_init is True:
       self.start()
 
   @property
   def is_running(self):
     """ Property to check if consumer thread is alive or not. """
-    return self.executor.isAlive()
+    return self.executor.isAlive() if self.executor else False
 
   def _validate_intantiation_props(self, prop, prop_name):
     """ Method to determine if instantiation properties like batch_size, flush_interval
@@ -121,12 +123,18 @@ def _validate_intantiation_props(self, prop, prop_name):
       False if property name is batch_size and value is a floating point number.
       True otherwise.
     """
-    if (prop_name == 'batch_size' and not isinstance(prop, int)) or prop is None or prop <= 0 or \
-      not validator.is_finite_number(prop):
+    is_valid = True
+
+    if prop is None or not validator.is_finite_number(prop) or prop <= 0:
+      is_valid = False
+
+    if prop_name == 'batch_size' and not isinstance(prop, numbers.Integral):
+      is_valid = False
+
+    if is_valid is False:
       self.logger.info('Using default value for {}.'.format(prop_name))
-      return False
 
-    return True
+    return is_valid
 
   def _get_time(self, _time=None):
     """ Method to return rounded off time as integer in seconds. If _time is None, uses current time.
@@ -279,7 +287,8 @@ def stop(self):
     self.event_queue.put(self._SHUTDOWN_SIGNAL)
     self.logger.warning('Stopping Scheduler.')
 
-    self.executor.join(self.timeout_interval.total_seconds())
+    if self.executor:
+      self.executor.join(self.timeout_interval.total_seconds())
 
     if self.is_running:
       self.logger.error('Timeout exceeded while attempting to close for ' + str(self.timeout_interval) + ' ms.')

tests/test_event_processor.py

@@ -326,7 +326,7 @@ def test_init__invalid_flush_interval(self):
     self.assertEqual(self._event_processor.flush_interval, timedelta(seconds=30))
     mock_config_logging.info.assert_called_with('Using default value for flush_interval.')
 
-  def test_init__NaN_flush_interval(self):
+  def test_init__bool_flush_interval(self):
     event_dispatcher = TestEventDispatcher()
 
     with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
@@ -343,6 +343,23 @@ def test_init__NaN_flush_interval(self):
     self.assertEqual(self._event_processor.flush_interval, timedelta(seconds=30))
     mock_config_logging.info.assert_called_with('Using default value for flush_interval.')
 
+  def test_init__string_flush_interval(self):
+    event_dispatcher = TestEventDispatcher()
+
+    with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
+      self._event_processor = BatchEventProcessor(event_dispatcher,
+                                                  self.optimizely.logger,
+                                                  True,
+                                                  self.event_queue,
+                                                  self.MAX_BATCH_SIZE,
+                                                  "True",
+                                                  self.MAX_TIMEOUT_INTERVAL_SEC
+                                                  )
+
+    # default flush interval is 30s.
+    self.assertEqual(self._event_processor.flush_interval, timedelta(seconds=30))
+    mock_config_logging.info.assert_called_with('Using default value for flush_interval.')
+
   def test_init__invalid_timeout_interval(self):
     event_dispatcher = TestEventDispatcher()