hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-15 05:53:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

pyupgrade: run pyupgrade --py36-plus and black on all but tests

Browse Source
This commit is contained in:
Erik Sundell
2021-08-26 16:03:28 +02:00
parent 580d8fd9e2
commit d6c48b15fe
27 changed files with 82 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jupyterhub/apihandlers/users.py
View File

@@ -210,9 +210,7 @@ class UserListAPIHandler(APIHandler):
except Exception as e:
self.log.error("Failed to create user: %s" % name, exc_info=True)
self.users.delete(user)
raise web.HTTPError(
400, "Failed to create user %s: %s" % (name, str(e))
)
raise web.HTTPError(400, f"Failed to create user {name}: {str(e)}")
else:
created.append(user)
@@ -394,7 +392,7 @@ class UserTokenListAPIHandler(APIHandler):
if not note:
note = "Requested via api"
if requester is not user:
note += " by %s %s" % (kind, requester.name)
note += f" by {kind} {requester.name}"
token_roles = body.get('roles')
try:
@@ -434,7 +432,7 @@ class UserTokenAPIHandler(APIHandler):
Raises 404 if not found for any reason
(e.g. wrong owner, invalid key format, etc.)
"""
not_found = "No such token %s for user %s" % (token_id, user.name)
not_found = f"No such token {token_id} for user {user.name}"
prefix, id_ = token_id[:1], token_id[1:]
if prefix != 'a':
raise web.HTTPError(404, not_found)
@@ -508,7 +506,7 @@ class UserServerAPIHandler(APIHandler):
self.set_status(202)
return
elif pending:
raise web.HTTPError(400, "%s is pending %s" % (spawner._log_name, pending))
raise web.HTTPError(400, f"{spawner._log_name} is pending {pending}")
if spawner.ready:
# include notify, so that a server that died is noticed immediately
@@ -554,7 +552,7 @@ class UserServerAPIHandler(APIHandler):
raise web.HTTPError(400, "Named servers are not enabled.")
if server_name not in user.orm_spawners:
raise web.HTTPError(
404, "%s has no server named '%s'" % (user_name, server_name)
404, f"{user_name} has no server named '{server_name}'"
)
elif remove:
raise web.HTTPError(400, "Cannot delete the default server")
@@ -572,7 +570,7 @@ class UserServerAPIHandler(APIHandler):
if spawner.pending:
raise web.HTTPError(
400,
"%s is pending %s, please wait" % (spawner._log_name, spawner.pending),
f"{spawner._log_name} is pending {spawner.pending}, please wait",
)
stop_future = None
@@ -627,7 +625,7 @@ class SpawnProgressAPIHandler(APIHandler):
async def send_event(self, event):
try:
self.write('data: {}\n\n'.format(json.dumps(event)))
self.write(f'data: {json.dumps(event)}\n\n')
await self.flush()
except StreamClosedError:
self.log.warning("Stream closed while handling %s", self.request.uri)
@@ -681,7 +679,7 @@ class SpawnProgressAPIHandler(APIHandler):
ready_event = {
'progress': 100,
'ready': True,
'message': "Server ready at {}".format(url),
'message': f"Server ready at {url}",
'html_message': 'Server ready at <a href="{0}">{0}</a>'.format(url),
'url': url,
}
@@ -784,7 +782,7 @@ class ActivityAPIHandler(APIHandler):
if server_name not in spawners:
raise web.HTTPError(
400,
"No such server '{}' for user {}".format(server_name, user.name),
f"No such server '{server_name}' for user {user.name}",
)
# check that each per-server field is a dict
if not isinstance(server_info, dict):