chore: fix model; restore jasyncio re-export

Author: dimaqq

juju/client/facade.py

@@ -713,6 +713,12 @@ def serialize(self):
     def to_json(self):
         return json.dumps(self.serialize(), cls=TypeEncoder, sort_keys=True)
 
+    def __contains__(self, key):
+        return key in self._toPy
+
+    def get(self, key, default=None):
+        return self[key] if key in self else default
+
     # treat subscript gets as JSON representation
     def __getitem__(self, key):
         attr = self._toPy[key]

juju/controller.py

@@ -565,10 +565,10 @@ async def get_cloud(self):
         cloud_facade = client.CloudFacade.from_connection(self.connection())
 
         result = await cloud_facade.Clouds()
-        cloud = list(result.clouds.keys())[0]  # only lives on one cloud
+        cloud = next(iter(result.clouds))
         return tag.untag("cloud-", cloud)
 
-    async def get_models(self, all=False, username=None):
+    async def get_models(self, all=False, username=None):  # noqa: A002
         """.. deprecated:: 0.7.0
         Use :meth:`.list_models` instead.
         """
@@ -630,10 +630,7 @@ async def get_model(self, model):
         :returns Model: Connected Model instance.
         """
         uuids = await self.model_uuids()
-        if model in uuids:
-            uuid = uuids[model]
-        else:
-            uuid = model
+        uuid = uuids.get(model) or model
 
         from juju.model import Model
 

juju/delta.py

@@ -17,13 +17,13 @@ def get_id(self):
         return self.data["id"]
 
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         return None
 
 
 class ActionDelta(EntityDelta):
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .action import Action
 
         return Action
@@ -34,7 +34,7 @@ def get_id(self):
         return self.data["name"]
 
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .application import Application
 
         return Application
@@ -45,7 +45,7 @@ def get_id(self):
         return self.data["tag"]
 
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .annotation import Annotation
 
         return Annotation
@@ -56,15 +56,15 @@ def get_id(self):
         return self.data["model-uuid"]
 
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .model import ModelInfo
 
         return ModelInfo
 
 
 class MachineDelta(EntityDelta):
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .machine import Machine
 
         return Machine
@@ -75,15 +75,15 @@ def get_id(self):
         return self.data["name"]
 
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .unit import Unit
 
         return Unit
 
 
 class RelationDelta(EntityDelta):
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .relation import Relation
 
         return Relation
@@ -94,7 +94,7 @@ def get_id(self):
         return self.data["name"]
 
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .remoteapplication import RemoteApplication
 
         return RemoteApplication
@@ -105,7 +105,7 @@ def get_id(self):
         return self.data["charm-url"]
 
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .charm import Charm
 
         return Charm
@@ -116,7 +116,7 @@ def get_id(self):
         return self.data["application-name"]
 
     @classmethod
-    def get_entity_class(self):
+    def get_entity_class(cls):
         from .remoteapplication import ApplicationOffer
 
         return ApplicationOffer

juju/errors.py

@@ -24,7 +24,7 @@ def __init__(self, result):
         self.error_code = result.get("error-code")
         self.response = result["response"]
         self.request_id = result["request-id"]
-        self.error_info = result["error-info"] if "error-info" in result else None
+        self.error_info = result.get("error-info")
         super().__init__(self.message)
 
 

juju/jasyncio.py

@@ -13,17 +13,38 @@
 import functools
 import logging
 import signal
-
-import websockets
-
-ROOT_LOGGER = logging.getLogger()
-
 from asyncio import (
     CancelledError,
     create_task,
     wait,
+    Event as Event, TimeoutError as TimeoutError, Queue as Queue, ensure_future as ensure_future,
+    gather as gather,
+    sleep as sleep,
+    wait_for as wait_for,
+    create_subprocess_exec as create_subprocess_exec,
+    subprocess as subprocess,
+
+     FIRST_COMPLETED as FIRST_COMPLETED,
+     Lock as Lock,
+     as_completed as as_completed,
+     new_event_loop as new_event_loop,
+
+    get_event_loop_policy as get_event_loop_policy,
+    get_running_loop as
+    get_running_loop,
+    ALL_COMPLETED as
+    ALL_COMPLETED,
+    all_tasks as
+    all_tasks,
+    current_task as
+    current_task,
+    shield as shield,
 )
 
+import websockets
+
+ROOT_LOGGER = logging.getLogger()
+
 
 def create_task_with_handler(coro, task_name, logger=ROOT_LOGGER):
     """Wrapper around "asyncio.create_task" to make sure the task
@@ -68,7 +89,7 @@ class SingletonEventLoop:
 
     def __new__(cls):
         if not hasattr(cls, "instance"):
-            cls.instance = super(SingletonEventLoop, cls).__new__(cls)
+            cls.instance = super().__new__(cls)
             cls.instance.loop = asyncio.new_event_loop()
 
         return cls.instance

juju/loop.py

@@ -5,4 +5,8 @@
 
 import warnings
 
-warnings.warn("juju.loop module is being deprecated by 3.0, use juju.jasyncio instead")
+warnings.warn(
+    "juju.loop module is being deprecated by 3.0, use juju.jasyncio instead",
+    DeprecationWarning,
+    stacklevel=1,
+)

juju/machine.py

@@ -274,12 +274,14 @@ def dns_name(self):
 
         May return None if no suitable address is found.
         """
-        ordered_addresses = []
         ordered_scopes = ["public", "local-cloud", "local-fan"]
-        for scope in ordered_scopes:
-            for address in self.addresses:
-                if scope == address["scope"]:
-                    ordered_addresses.append(address)
+        ordered_addresses = [
+            address
+            for scope in ordered_scopes
+            for address in self.addresses
+            if scope == address["scope"]
+        ]
+
         for address in ordered_addresses:
             scope = address["scope"]
             for check_scope in ordered_scopes: