Merge branch 'mnoman/AddBatchEP' of github.com:optimizely/python-sdk into mnoman/AddBatchEP

Author: mariamjamal94

optimizely/event/event_factory.py

@@ -14,9 +14,9 @@
 from optimizely.helpers import enums
 from optimizely.helpers import event_tag_utils
 from optimizely.helpers import validator
-from . import user_event
-from . import payload
 from . import log_event
+from . import payload
+from . import user_event
 
 CUSTOM_ATTRIBUTE_FEATURE_TYPE = 'custom'
 

tests/test_config_manager.py

@@ -278,7 +278,6 @@ def test_fetch_datafile(self, _):
 
     def test_is_running(self, _):
         """ Test that polling thread is running after instance of PollingConfigManager is created. """
-        with mock.patch('optimizely.config_manager.PollingConfigManager.fetch_datafile') as mock_fetch_datafile:
+        with mock.patch('optimizely.config_manager.PollingConfigManager.fetch_datafile'):
             project_config_manager = config_manager.PollingConfigManager(sdk_key='some_key')
             self.assertTrue(project_config_manager.is_running)
-        mock_fetch_datafile.assert_called_with()