Use Id from charmstore entity

When supporting older facades we need to get and use the charm Id from
the entity get.

As a driveby I've sorted out the lint issues

Author: SimonRichardson

examples/deploy_bundle.py

@@ -16,7 +16,7 @@ async def main():
     await controller.connect()
 
     bundles = [('cs:~juju-qa/bundle/basic-0', 'beta'), ('juju-qa-bundle-test', None)]
-    for i in range(len(bundles)): 
+    for i in range(len(bundles)):
         deployment = bundles[i]
         model = await controller.add_model('model{}'.format(i))
 

juju/bundle.py

@@ -16,7 +16,6 @@
 from .errors import JujuError
 from .origin import Channel
 from .url import Schema, URL
-from .version import LTS_RELEASES
 
 log = logging.getLogger(__name__)
 
@@ -260,6 +259,7 @@ async def _resolve_charms(self):
                 spec['charm'] = str(charm_url)
             else:
                 results = await self.model.charmstore.entity(str(charm_url))
+                charm_url = results.get('Id', charm_url)
                 charm_origin = client.CharmOrigin(source="charm-store",
                                                   risk=risk,
                                                   track=track)

juju/model.py

@@ -1432,7 +1432,6 @@ async def deploy(
         entity_url = str(entity_url)
         if is_local_charm(entity_url) and not entity_url.startswith("local:"):
             entity_url = "local:{}".format(entity_url)
-        print("!!!", entity_url)
         url = URL.parse(str(entity_url))
         architecture = await self._resolve_architecture(url)
 

juju/version.py

@@ -1,4 +1,4 @@
 
 LTS_RELEASES = ["focal", "bionic", "xenial", "trusty", "precise"]
 
-DEFAULT_ARCHITECTURE = 'amd64'
+DEFAULT_ARCHITECTURE = 'amd64'

tests/integration/test_application.py

@@ -110,7 +110,7 @@ async def test_deploy_charmhub_charm(event_loop):
         app = await model.deploy('hello-juju')
         await model.block_until(lambda: (len(app.units) > 0 and
                                          app.units[0].machine))
-        assert 'hello-juju' in app.data['charm-url'] 
+        assert 'hello-juju' in app.data['charm-url']
 
 
 @base.bootstrapped

tests/unit/test_bundle.py

@@ -199,7 +199,6 @@ async def test_run_with_charmstore_charm(self, event_loop):
                                          devices="devices",
                                          num_units="num_units")
 
-
     @pytest.mark.asyncio
     async def test_run_with_charmhub_charm(self, event_loop):
         change = AddApplicationChange(1, [], params={"charm": "charm",