From 44933712987c51fc32ded9a4072c0d78cdb54796 Mon Sep 17 00:00:00 2001 From: Nikolay Novik Date: Thu, 16 Mar 2023 00:49:43 -0400 Subject: [PATCH] Apply pyupgrade --py37-plus (#398) --- docs/conf.py | 1 - tests/conftest.py | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index d3dfe7e..de9aa0f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # # aiomysql documentation build configuration file, created by # sphinx-quickstart on Sun Jan 18 22:02:31 2015. diff --git a/tests/conftest.py b/tests/conftest.py index 1082199..aa624d2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -74,7 +74,7 @@ async def pg_params(loop, pg_server): async def _pg_server_helper(host, docker, session_id): pg_tag = "9.5" - await docker.pull("postgres:{}".format(pg_tag)) + await docker.pull(f"postgres:{pg_tag}") container = await docker.containers.create_or_replace( name=f"aioodbc-test-server-{pg_tag}-{session_id}", config={ @@ -119,7 +119,7 @@ async def _pg_server_helper(host, docker, session_id): last_error = e await asyncio.sleep(random.uniform(0.1, 1)) else: - pytest.fail("Cannot start postgres server: {}".format(last_error)) + pytest.fail(f"Cannot start postgres server: {last_error}") yield container_info finally: @@ -150,11 +150,11 @@ async def mysql_params(loop, mysql_server): @pytest.fixture(scope="session") async def mysql_server(loop, host, docker, session_id): mysql_tag = "5.7" - await docker.pull("mysql:{}".format(mysql_tag)) + await docker.pull(f"mysql:{mysql_tag}") container = await docker.containers.create_or_replace( name=f"aioodbc-test-server-{mysql_tag}-{session_id}", config={ - "Image": "mysql:{}".format(mysql_tag), + "Image": f"mysql:{mysql_tag}", "AttachStdout": False, "AttachStderr": False, "Env": [ @@ -192,7 +192,7 @@ async def mysql_server(loop, host, docker, session_id): last_error = e await asyncio.sleep(random.uniform(0.1, 1)) else: - pytest.fail("Cannot start mysql server: {}".format(last_error)) + pytest.fail(f"Cannot start mysql server: {last_error}") container_info = { "port": port,