pre-commit: run pyupgrade

Author: consideRatio

binderhub/binderspawner_mixin.py

@@ -35,7 +35,7 @@ def __init__(self, *args, **kwargs):
         # classes using traitlets?
         # https://stackoverflow.com/questions/9575409/calling-parent-class-init-with-multiple-inheritance-whats-the-right-way
         # https://github.com/ipython/traitlets/pull/175
-        super(BinderSpawnerMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     auth_enabled = Bool(
         False,

binderhub/build.py

@@ -436,7 +436,7 @@ def submit(self):
                 for f in w.stream(
                     self.api.list_namespaced_pod,
                     self.namespace,
-                    label_selector="name={}".format(self.name),
+                    label_selector=f"name={self.name}",
                     timeout_seconds=30,
                     _request_timeout=KUBE_REQUEST_TIMEOUT,
                 ):

binderhub/build_local.py

@@ -26,7 +26,7 @@ def __init__(self, message=None):
         self.message = message
 
     def __str__(self):
-        s = "ProcessTerminated: {}".format(self.message)
+        s = f"ProcessTerminated: {self.message}"
         return s
 
 

binderhub/builder.py

@@ -149,7 +149,7 @@ async def emit(self, data):
         else:
             serialized_data = data
         try:
-            self.write('data: {}\n\n'.format(serialized_data))
+            self.write(f'data: {serialized_data}\n\n')
             await self.flush()
         except StreamClosedError:
             app_log.warning("Stream closed while handling %s", self.request.uri)
@@ -196,7 +196,7 @@ def send_error(self, status_code, **kwargs):
             'status_code': status_code,
             'message': message + '\n',
         })
-        self.write('data: {}\n\n'.format(evt))
+        self.write(f'data: {evt}\n\n')
         self.finish()
 
     def initialize(self):
@@ -255,7 +255,7 @@ async def get(self, provider_prefix, _unescaped_spec):
         IOLoop.current().spawn_callback(self.keep_alive)
 
         spec = spec.rstrip("/")
-        key = '%s:%s' % (provider_prefix, spec)
+        key = f'{provider_prefix}:{spec}'
 
         # get a provider object that encapsulates the provider and the spec
         try:
@@ -268,7 +268,7 @@ async def get(self, provider_prefix, _unescaped_spec):
         if provider.is_banned():
             await self.emit({
                 'phase': 'failed',
-                'message': 'Sorry, {} has been temporarily disabled from launching. Please contact admins for more info!'.format(spec)
+                'message': f'Sorry, {spec} has been temporarily disabled from launching. Please contact admins for more info!'
             })
             return
 
@@ -283,7 +283,7 @@ async def get(self, provider_prefix, _unescaped_spec):
         try:
             ref = await provider.get_resolved_ref()
         except Exception as e:
-            await self.fail("Error resolving ref for %s: %s" % (key, e))
+            await self.fail(f"Error resolving ref for {key}: {e}")
             return
 
         if ref is None:

binderhub/launcher.py

@@ -154,7 +154,7 @@ def unique_name_from_repo(self, repo_url):
 
         if len(prefix) > 32:
             # if it's long, truncate
-            prefix = '{}-{}'.format(prefix[:15], prefix[-15:])
+            prefix = f'{prefix[:15]}-{prefix[-15:]}'
 
         # add a random suffix to avoid collisions for users on the same image
         return '{}-{}'.format(prefix, ''.join(random.choices(SUFFIX_CHARS, k=SUFFIX_LENGTH)))
@@ -230,7 +230,7 @@ async def launch(
             data.update(extra_args)
 
         # server name to be used in logs
-        _server_name = " {}".format(server_name) if server_name else ''
+        _server_name = f" {server_name}" if server_name else ''
 
         # start server
         app_log.info(f"Starting server{_server_name} for user {username} with image {image}")
@@ -244,7 +244,7 @@ def _cancel_ready_event(f=None):
                     ready_event_future.cancel()
         try:
             await self.api_request(
-                'users/{}/servers/{}'.format(escaped_username, server_name),
+                f'users/{escaped_username}/servers/{server_name}',
                 method='POST',
                 body=json.dumps(data).encode('utf8'),
             )

binderhub/log.py

@@ -53,12 +53,12 @@ def _scrub_headers(headers):
         else:
             # no space, hide the whole thing in case there was a mistake
             auth_type = ""
-        headers["Authorization"] = "{} [secret]".format(auth_type)
+        headers["Authorization"] = f"{auth_type} [secret]"
     if "Cookie" in headers:
         c = SimpleCookie(headers["Cookie"])
         redacted = []
         for name in c.keys():
-            redacted.append("{}=[secret]".format(name))
+            redacted.append(f"{name}=[secret]")
         headers["Cookie"] = "; ".join(redacted)
     return headers
 
@@ -134,5 +134,5 @@ def log_request(handler):
         # to get headers from tornado
         location = handler._headers.get("Location")
         if location:
-            ns["location"] = " -> {}".format(_scrub_uri(location))
+            ns["location"] = f" -> {_scrub_uri(location)}"
     access_log.log(log_level, msg.format(**ns))

binderhub/main.py

@@ -128,7 +128,7 @@ class LegacyRedirectHandler(BaseHandler):
 
     @authenticated
     def get(self, user, repo, urlpath=None):
-        url = '/v2/gh/{user}/{repo}/master'.format(user=user, repo=repo)
+        url = f'/v2/gh/{user}/{repo}/master'
         if urlpath is not None and urlpath.strip('/'):
             url = url_concat(url, dict(urlpath=urlpath))
         self.redirect(url)

binderhub/registry.py

@@ -187,12 +187,12 @@ def _default_password(self):
 
     async def get_image_manifest(self, image, tag):
         client = httpclient.AsyncHTTPClient()
-        url = "{}/v2/{}/manifests/{}".format(self.url, image, tag)
+        url = f"{self.url}/v2/{image}/manifests/{tag}"
         # first, get a token to perform the manifest request
         if self.token_url:
             auth_req = httpclient.HTTPRequest(
                 url_concat(self.token_url, {
-                    "scope": "repository:{}:pull".format(image),
+                    "scope": f"repository:{image}:pull",
                     "service": "container_registry"
                 }),
                 auth_username=self.username,
@@ -207,7 +207,7 @@ async def get_image_manifest(self, image, tag):
                 token = response_body["access_token"]
 
             req = httpclient.HTTPRequest(url,
-                headers={"Authorization": "Bearer {}".format(token)},
+                headers={"Authorization": f"Bearer {token}"},
             )
         else:
             # Use basic HTTP auth (htpasswd)

binderhub/repoproviders.py

@@ -37,9 +37,9 @@ def tokenize_spec(spec):
 
     spec_parts = spec.split('/', 2)  # allow ref to contain "/"
     if len(spec_parts) != 3:
-        msg = 'Spec is not of the form "user/repo/ref", provided: "{spec}".'.format(spec=spec)
+        msg = f'Spec is not of the form "user/repo/ref", provided: "{spec}".'
         if len(spec_parts) == 2 and spec_parts[-1] != 'master':
-            msg += ' Did you mean "{spec}/master"?'.format(spec=spec)
+            msg += f' Did you mean "{spec}/master"?'
         raise ValueError(msg)
 
     return spec_parts
@@ -230,7 +230,7 @@ class ZenodoProvider(RepoProvider):
 
     async def get_resolved_ref(self):
         client = AsyncHTTPClient()
-        req = HTTPRequest("https://doi.org/{}".format(self.spec),
+        req = HTTPRequest(f"https://doi.org/{self.spec}",
                           user_agent="BinderHub")
         r = await client.fetch(req)
         self.record_id = r.effective_url.rsplit("/", maxsplit=1)[1]
@@ -256,7 +256,7 @@ async def get_resolved_ref_url(self):
         return f"https://doi.org/{resolved_spec}"
 
     def get_build_slug(self):
-        return "zenodo-{}".format(self.record_id)
+        return f"zenodo-{self.record_id}"
 
 
 class FigshareProvider(RepoProvider):
@@ -279,7 +279,7 @@ class FigshareProvider(RepoProvider):
 
     async def get_resolved_ref(self):
         client = AsyncHTTPClient()
-        req = HTTPRequest("https://doi.org/{}".format(self.spec),
+        req = HTTPRequest(f"https://doi.org/{self.spec}",
                           user_agent="BinderHub")
         r = await client.fetch(req)
 
@@ -288,7 +288,7 @@ async def get_resolved_ref(self):
         article_version = match.groups()[5]
         if not article_version:
             article_version = "1"
-        self.record_id = "{}.v{}".format(article_id, article_version)
+        self.record_id = f"{article_id}.v{article_version}"
 
         return self.record_id
 
@@ -312,7 +312,7 @@ async def get_resolved_ref_url(self):
         return f"https://doi.org/{resolved_spec}"
 
     def get_build_slug(self):
-        return "figshare-{}".format(self.record_id)
+        return f"figshare-{self.record_id}"
 
 
 class DataverseProvider(RepoProvider):
@@ -329,7 +329,7 @@ class DataverseProvider(RepoProvider):
 
     async def get_resolved_ref(self):
         client = AsyncHTTPClient()
-        req = HTTPRequest("https://doi.org/{}".format(self.spec),
+        req = HTTPRequest(f"https://doi.org/{self.spec}",
                           user_agent="BinderHub")
         r = await client.fetch(req)
 
@@ -406,7 +406,7 @@ def _parse_resource_id(self, spec):
     async def get_resolved_ref(self):
         client = AsyncHTTPClient()
         self.resource_id = self._parse_resource_id(self.spec)
-        req = HTTPRequest("https://www.hydroshare.org/hsapi/resource/{}/scimeta/elements".format(self.resource_id),
+        req = HTTPRequest(f"https://www.hydroshare.org/hsapi/resource/{self.resource_id}/scimeta/elements",
                           user_agent="BinderHub")
         r = await client.fetch(req)
 
@@ -422,7 +422,7 @@ def parse_date(json_body):
             # truncate the timestamp
             return str(int(epoch))
         # date last updated is only good for the day... probably need something finer eventually
-        self.record_id = "{}.v{}".format(self.resource_id, parse_date(r.body))
+        self.record_id = f"{self.resource_id}.v{parse_date(r.body)}"
         return self.record_id
 
     async def get_resolved_spec(self):
@@ -435,10 +435,10 @@ async def get_resolved_ref_url(self):
 
     def get_repo_url(self):
         self.resource_id = self._parse_resource_id(self.spec)
-        return "https://www.hydroshare.org/resource/{}".format(self.resource_id)
+        return f"https://www.hydroshare.org/resource/{self.resource_id}"
 
     def get_build_slug(self):
-        return "hydroshare-{}".format(self.record_id)
+        return f"hydroshare-{self.record_id}"
 
 
 class GitRepoProvider(RepoProvider):
@@ -519,7 +519,7 @@ async def get_resolved_ref(self):
             stdout, stderr = await proc.communicate()
             retcode = await proc.wait()
             if retcode:
-                raise RuntimeError("Unable to run git ls-remote to get the `resolved_ref`: {}".format(stderr.decode()))
+                raise RuntimeError(f"Unable to run git ls-remote to get the `resolved_ref`: {stderr.decode()}")
             if not stdout:
                 return None
             resolved_ref = stdout.decode().split(None, 1)[0]
@@ -607,7 +607,7 @@ def _default_auth(self):
     @default('git_credentials')
     def _default_git_credentials(self):
         if self.private_token:
-            return r'username=binderhub\npassword={token}'.format(token=self.private_token)
+            return fr'username=binderhub\npassword={self.private_token}'
         return ""
 
     labels = {
@@ -748,7 +748,7 @@ def _default_git_credentials(self):
                 return r'username={client_id}\npassword={token}'.format(
                     client_id=self.client_id, token=self.access_token)
             else:
-                return r'username={token}\npassword=x-oauth-basic'.format(token=self.access_token)
+                return fr'username={self.access_token}\npassword=x-oauth-basic'
         return ""
 
     labels = {
@@ -783,7 +783,7 @@ async def github_api_request(self, api_url, etag=None):
         headers = {}
         # based on: https://developer.github.com/v3/#oauth2-token-sent-in-a-header
         if self.access_token:
-            headers['Authorization'] = "token {token}".format(token=self.access_token)
+            headers['Authorization'] = f"token {self.access_token}"
 
         if etag:
             headers['If-None-Match'] = etag
@@ -905,7 +905,7 @@ async def get_resolved_spec(self):
         return f"{self.user}/{self.repo}/{self.resolved_ref}"
 
     def get_build_slug(self):
-        return '{user}-{repo}'.format(user=self.user, repo=self.repo)
+        return f'{self.user}-{self.repo}'
 
 
 class GistRepoProvider(GitHubRepoProvider):

binderhub/tests/conftest.py

@@ -69,8 +69,8 @@ def pytest_terminal_summary(terminalreporter, exitstatus):
         hosts[host][url] = response
     # save records to files
     for host, records in hosts.items():
-        fname = 'http-record.{}.json'.format(host)
-        print("Recorded http responses for {} in {}".format(host, fname))
+        fname = f'http-record.{host}.json'
+        print(f"Recorded http responses for {host} in {fname}")
         print("To update the recordings used by the tests you will have"
               " to move or merge the newly created recordings with existing"
               f" recordings in {here}.")
@@ -83,7 +83,7 @@ def pytest_terminal_summary(terminalreporter, exitstatus):
 
 
 def load_mock_responses(host):
-    fname = os.path.join(here, 'http-record.{}.json'.format(host))
+    fname = os.path.join(here, f'http-record.{host}.json')
     if not os.path.exists(fname):
         return {}
     with open(fname) as f:
@@ -166,7 +166,7 @@ def _binderhub_config():
     return cfg
 
 
-class RemoteBinderHub(object):
+class RemoteBinderHub:
     """Mock class for the app fixture when Binder is remote
 
     Has a URL for the binder location and a configured BinderHub instance