Fix the linting issues

Author: SimonRichardson

juju/bundle.py

@@ -196,7 +196,7 @@ async def _download_bundle(self, charm_url, origin):
             }])
             if len(resp.results) != 1:
                 raise JujuError("expected one result, received {}".format(resp.results))
-            
+
             result = resp.results[0]
             if not result.url:
                 raise JujuError("no url found for bundle {}".format(charm_url.name))
@@ -208,13 +208,13 @@ async def _download_bundle(self, charm_url, origin):
                 return self._get_bundle_yaml(archive)
 
         raise JujuError('charm facade not supported')
-    
+
     def _get_bundle_yaml(self, archive):
         for member in archive.infolist():
             if member.filename == "bundle.yaml":
                 return archive.read(member)
         raise JujuError("bundle.yaml not found")
-    
+
     async def _resolve_charms(self):
         deployed = dict()
 
@@ -243,7 +243,7 @@ async def _resolve_charms(self):
                 charm_url = URL.parse(spec['charm'])
                 channel = None
                 track, risk = '', ''
-                if 'channel' in spec: 
+                if 'channel' in spec:
                     channel = Channel.parse(spec['channel'])
                     track, risk = channel.track, channel.risk
 
@@ -252,10 +252,10 @@ async def _resolve_charms(self):
                 else:
                     architecture = await self.model._resolve_architecture(charm_url)
 
-                origin = client.CharmOrigin(source="charm-hub", 
-                                        architecture=architecture,
-                                        risk=risk,
-                                        track=track)
+                origin = client.CharmOrigin(source="charm-hub",
+                                            architecture=architecture,
+                                            risk=risk,
+                                            track=track)
                 charm_url, charm_origin = await self.model._resolve_charm(charm_url, origin)
 
                 spec['charm'] = str(charm_url)
@@ -264,10 +264,9 @@ async def _resolve_charms(self):
                     self.origins[str(charm_url)] = {}
                 self.origins[str(charm_url)][str(channel)] = charm_origin
             else:
-                results = await self.client_facade.ResolveCharms(references=[spec['charm']])
+                await self.client_facade.ResolveCharms(references=[spec['charm']])
                 # TODO (stickupkid): Ensure that this works as expected.
 
-
     async def execute_plan(self):
         await self._resolve_charms()
 
@@ -285,11 +284,11 @@ def applications(self):
         apps_dict = self.bundle.get('applications',
                                     self.bundle.get('services', {}))
         return list(apps_dict.keys())
-    
+
     @property
     def applications_specs(self):
         return self.bundle.get('applications',
-                                self.bundle.get('services', {}))
+                               self.bundle.get('services', {}))
 
     def resolve_relation(self, reference):
         parts = reference.split(":", maxsplit=1)
@@ -307,7 +306,7 @@ def resolve(self, reference):
 
 
 def is_local_charm(charm_url):
-    return charm_url.startswith('.') or charm_url.startswith('local:') 
+    return charm_url.startswith('.') or charm_url.startswith('local:')
 
 
 def get_charm_series(path):
@@ -584,7 +583,7 @@ async def run(self, context):
             arch = self.architecture
             if not arch:
                 arch = await context.model._resolve_architecture(url)
-            origin = client.CharmOrigin(source="charm-hub", 
+            origin = client.CharmOrigin(source="charm-hub",
                                         architecture=arch,
                                         risk=ch.risk,
                                         track=ch.track)

juju/model.py

@@ -35,7 +35,7 @@
 from .names import is_valid_application
 from .offerendpoints import ParseError as OfferParseError
 from .offerendpoints import parse_local_endpoint, parse_offer_url
-from .origin import Channel, Risk
+from .origin import Channel
 from .placement import parse as parse_placement
 from .tag import application as application_tag
 from .url import URL, Schema
@@ -1418,7 +1418,6 @@ async def deploy(
         if trust and (self.info.agent_version < client.Number.from_json('2.4.0')):
             raise NotImplementedError("trusted is not supported on model version {}".format(self.info.agent_version))
 
-
         # Attempt to resolve a charm or bundle based on the URL.
         # In an ideal world this should be moved to the controller, and we
         # wouldn't have to deal with this at all.
@@ -1440,18 +1439,18 @@ async def deploy(
             origin = client.CharmOrigin(source="local", architecture=architecture)
             if not (entity_path.is_dir() or entity_path.is_file()):
                 raise JujuError('{} path not found'.format(entity_url))
-            
+
             is_bundle = (
-                (entity_url.endswith(".yaml") and entity_path.exists()) or 
+                (entity_url.endswith(".yaml") and entity_path.exists()) or
                 bundle_path.exists()
             )
 
         elif Schema.CHARM_STORE.matches(url.schema):
-            result = await self.charmstore.entity(str(url), 
+            result = await self.charmstore.entity(str(url),
                                                   channel=channel,
                                                   include_stats=False)
             identifier = result['Id']
-            origin = client.CharmOrigin(source="charm-store", 
+            origin = client.CharmOrigin(source="charm-store",
                                         architecture=architecture,
                                         risk=channel)
             is_bundle = url.series == "bundle"
@@ -1462,7 +1461,7 @@ async def deploy(
             ch = Channel('latest', 'stable')
             if channel:
                 ch = Channel.parse(channel).normalize()
-            origin = client.CharmOrigin(source="charm-hub", 
+            origin = client.CharmOrigin(source="charm-hub",
                                         architecture=architecture,
                                         risk=ch.risk,
                                         track=ch.track)
@@ -1598,11 +1597,11 @@ async def _resolve_charm(self, url, origin):
     async def _resolve_architecture(self, url):
         if url.architecture:
             return url.architecture
-        
+
         constraints = await self.get_constraints()
         if 'arch' in constraints:
             return constraints['arch']
-        
+
         return "amd64"
 
     async def _add_store_resources(self, application, entity_url,