Remove some comments.

Author: Juan Tirado

juju/client/connection.py

@@ -836,9 +836,6 @@ async def _connect_with_login(self, endpoints):
                 macaroonJSON = result.get('discharge-required')
                 if macaroonJSON is None:
                     self.info = result
-                    # Whenever a connection is established, set
-                    # the new_client flag in the Client module
-                    # client.set_new_client(self.info['server-version'])
                     success = True
                     return result
                 macaroon = bakery.Macaroon.from_dict(macaroonJSON)

juju/jasyncio.py

@@ -34,22 +34,6 @@
     get_event_loop_policy, CancelledError, get_running_loop, \
     create_task     # noqa
 
-# No more workaround for these imports
-# try:
-#     from asyncio import get_running_loop
-# except ImportError:
-#     def get_running_loop():
-#         loop = asyncio.get_event_loop()
-#         if not loop.is_running():
-#             raise RuntimeError("no running event loop")
-#         return loop
-
-# try:
-#     from asyncio import create_task
-# except ImportError:
-#     def create_task(coro):
-#         return asyncio.ensure_future(coro)
-
 
 def create_task_with_handler(coro, task_name, logger=ROOT_LOGGER):
     """Wrapper around "asyncio.create_task" to make sure the task

juju/model.py

@@ -1747,10 +1747,6 @@ async def deploy(
 
         charm_series = series
 
-        # if self.connection().is_using_old_client and charm_series is None:
-        #     # Also try
-        #     charm_series = res.origin.series
-
         if res.is_bundle:
             handler = BundleHandler(self, trusted=trust, forced=force)
             await handler.fetch_plan(url, res.origin, overlays=overlays)
@@ -1809,11 +1805,7 @@ async def deploy(
 
                 if not application_name:
                     application_name = metadata['name']
-                # if self.connection().is_using_old_client and not charm_series:
-                #     raise JujuError(
-                #         "Couldn't determine series for charm at {}. "
-                #         "Pass a 'series' kwarg to Model.deploy().".format(
-                #             charm_dir))
+
                 identifier = await self.add_local_charm_dir(charm_dir,
                                                             charm_series)
                 resources = await self.add_local_resources(application_name,
@@ -1888,7 +1880,6 @@ async def _resolve_charm(self, url, origin):
             'track': origin.track,
             'risk': origin.risk,
         }
-        # if not self.connection().is_using_old_client:
         resolve_origin['base'] = origin.base
 
         resp = await charms_facade.ResolveCharms(resolve=[{
@@ -2185,8 +2176,6 @@ async def get_constraints(self):
         """
         constraints = {}
         facade_cls = client.ModelConfigFacade
-        # if self.connection().is_using_old_client:
-        #     facade_cls = client.ClientFacade
 
         facade = facade_cls.from_connection(self.connection())
         result = await facade.GetModelConstraints()
@@ -2307,8 +2296,7 @@ async def set_constraints(self, constraints):
         :param dict config: Mapping of model constraints
         """
         facade_cls = client.ModelConfigFacade
-        # if self.connection().is_using_old_client:
-        #     facade_cls = client.ClientFacade
+        
         facade = facade_cls.from_connection(self.connection())
 
         await facade.SetModelConstraints(