polishing

Author: chillaq

splitio/api/client.py

@@ -4,7 +4,7 @@
 import urllib
 import abc
 
-import splitio.util.load_asyncio
+from splitio.optional.loaders import aiohttp
 
 SDK_URL = 'https://sdk.split.io/api'
 EVENTS_URL = 'https://events.split.io/api'
@@ -183,7 +183,7 @@ def __init__(self, timeout=None, sdk_url=None, events_url=None, auth_url=None, t
         """
         self._timeout = timeout/1000 if timeout else None  # Convert ms to seconds.
         self._urls = _construct_urls(sdk_url, events_url, auth_url, telemetry_url)
-        self._session = splitio.util.load_asyncio.aiohttp.ClientSession()
+        self._session = aiohttp.ClientSession()
 
     async def get(self, server, path, apikey, query=None, extra_headers=None):  # pylint: disable=too-many-arguments
         """
@@ -213,7 +213,7 @@ async def get(self, server, path, apikey, query=None, extra_headers=None):  # py
             ) as response:
                 body = await response.text()
                 return HttpResponse(response.status, body, response.headers)
-        except splitio.util.aiohttp.ClientError as exc:  # pylint: disable=broad-except
+        except aiohttp.ClientError as exc:  # pylint: disable=broad-except
             raise HttpClientException('aiohttp library is throwing exceptions') from exc
 
     async def post(self, server, path, apikey, body, query=None, extra_headers=None):  # pylint: disable=too-many-arguments
@@ -247,5 +247,5 @@ async def post(self, server, path, apikey, body, query=None, extra_headers=None)
             ) as response:
                 body = await response.text()
                 return HttpResponse(response.status, body, response.headers)
-        except Exception as exc:  # pylint: disable=broad-except
+        except aiohttp.ClientError as exc:  # pylint: disable=broad-except
             raise HttpClientException('aiohttp library is throwing exceptions') from exc

splitio/optional/__init__.py

@@ -3,7 +3,7 @@
 import threading
 import abc
 
-import splitio.util.load_asyncio
+from splitio.optional.loaders import asyncio
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -99,7 +99,6 @@ def __init__(self, synchronize_split, split_queue):
         self._split_queue = split_queue
         self._handler = synchronize_split
         self._running = False
-        self._worker = None
 
     def is_running(self):
         """Return whether the working is running."""
@@ -130,7 +129,7 @@ def start(self):
         self._running = True
 
         _LOGGER.debug('Starting Split Worker')
-        splitio.util.load_asyncio.asyncio.gather(self._run())
+        asyncio.gather(self._run())
 
     async def stop(self):
         """Stop worker."""

splitio/util/load_asyncio.py splitio/optional/loaders.pysplitio/util/load_asyncio.py renamed to splitio/optional/loaders.py

@@ -6,7 +6,7 @@
 from splitio.api import APIException
 from splitio.push.splitworker import SplitWorker, SplitWorkerAsync
 from splitio.models.notification import SplitChangeNotification
-import splitio.util.load_asyncio
+from splitio.optional.loaders import asyncio
 
 change_number_received = None
 
@@ -65,7 +65,7 @@ def test_handler(self):
 class SplitWorkerAsyncTests(object):
 
     async def test_on_error(self):
-        q = splitio.util.load_asyncio.asyncio.Queue()
+        q = asyncio.Queue()
 
         def handler_sync(change_number):
             raise APIException('some')
@@ -82,21 +82,21 @@ def handler_sync(change_number):
         assert(self._worker_running())
 
         await split_worker.stop()
-        await splitio.util.load_asyncio.asyncio.sleep(.1)
+        await asyncio.sleep(.1)
 
         assert not split_worker.is_running()
         assert(not self._worker_running())
 
     def _worker_running(self):
         worker_running = False
-        for task in splitio.util.load_asyncio.asyncio.Task.all_tasks():
+        for task in asyncio.Task.all_tasks():
             if task._coro.cr_code.co_name == '_run' and not task.done():
                 worker_running = True
                 break
         return worker_running
 
     async def test_handler(self):
-        q = splitio.util.load_asyncio.asyncio.Queue()
+        q = asyncio.Queue()
         split_worker = SplitWorkerAsync(handler_async, q)
 
         assert not split_worker.is_running()
@@ -106,12 +106,12 @@ async def test_handler(self):
 
         global change_number_received
         await q.put(SplitChangeNotification('some', 'SPLIT_UPDATE', 123456789))
-        await splitio.util.load_asyncio.asyncio.sleep(1)
+        await asyncio.sleep(1)
 
         assert change_number_received == 123456789
 
         await split_worker.stop()
-        await splitio.util.load_asyncio.asyncio.sleep(.1)
+        await asyncio.sleep(.1)
 
         assert not split_worker.is_running()
         assert(not self._worker_running())