clearing out some DeprecationWarnings

Author: cderici

juju/client/connection.py

@@ -163,8 +163,8 @@ class Monitor:
 
     def __init__(self, connection):
         self.connection = weakref.ref(connection)
-        self.reconnecting = asyncio.Lock(loop=connection.loop)
-        self.close_called = asyncio.Event(loop=connection.loop)
+        self.reconnecting = asyncio.Lock()
+        self.close_called = asyncio.Event()
 
     @property
     def status(self):
@@ -434,7 +434,7 @@ async def _pinger(self):
         async def _do_ping():
             try:
                 await pinger_facade.Ping()
-                await asyncio.sleep(10, loop=self.loop)
+                await asyncio.sleep(10)
             except CancelledError:
                 pass
 
@@ -636,7 +636,7 @@ async def _try_endpoint(endpoint, cacert, delay):
                                                      0.1 * i))
                  for i, (endpoint, cacert) in enumerate(endpoints)]
         for attempt in range(self._retries + 1):
-            for task in asyncio.as_completed(tasks, loop=self.loop):
+            for task in asyncio.as_completed(tasks):
                 try:
                     result = await task
                     break
@@ -805,7 +805,7 @@ async def login(self):
 
 class _Task:
     def __init__(self, task, loop):
-        self.stopped = asyncio.Event(loop=loop)
+        self.stopped = asyncio.Event()
         self.stopped.set()
         self.task = task
         self.loop = loop

juju/model.py

@@ -594,9 +594,9 @@ def __init__(
         self.state = ModelState(self)
         self._info = None
         self._mode = None
-        self._watch_stopping = asyncio.Event(loop=self._connector.loop)
-        self._watch_stopped = asyncio.Event(loop=self._connector.loop)
-        self._watch_received = asyncio.Event(loop=self._connector.loop)
+        self._watch_stopping = asyncio.Event()
+        self._watch_stopped = asyncio.Event()
+        self._watch_received = asyncio.Event()
         self._watch_stopped.set()
 
         self._charmhub = CharmHub(self)
@@ -1145,7 +1145,7 @@ async def _wait(self, entity_type, entity_id, action, predicate=None):
             has a 'completed' status. See the _Observer class for details.
 
         """
-        q = asyncio.Queue(loop=self._connector.loop)
+        q = asyncio.Queue()
 
         async def callback(delta, old, new, model):
             await q.put(delta.get_id())

juju/utils.py

@@ -123,10 +123,9 @@ async def run_with_interrupt(task, *events, loop=None):
     :param loop: Optional event loop to use other than the default.
     """
     loop = loop or asyncio.get_event_loop()
-    task = asyncio.ensure_future(task, loop=loop)
+    task = asyncio.ensure_future(task)
     event_tasks = [loop.create_task(event.wait()) for event in events]
     done, pending = await asyncio.wait([task] + event_tasks,
-                                       loop=loop,
                                        return_when=asyncio.FIRST_COMPLETED)
     for f in pending:
         f.cancel()  # cancel unfinished tasks