summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNejc Habjan <nejc.habjan@siemens.com>2022-01-23 10:20:22 +0100
committerJohn Villalovos <john@sodarock.com>2022-01-23 07:14:49 -0800
commitcfed62242e93490b8548c79f4ad16bd87de18e3e (patch)
tree61461fd752e85c5715a491de325a3b4ea7a393f2
parentdc32d54c49ccc58c01cd436346a3fbfd4a538778 (diff)
downloadgitlab-cfed62242e93490b8548c79f4ad16bd87de18e3e.tar.gz
style: use f-strings where applicable
-rw-r--r--docs/ext/docstrings.py4
-rw-r--r--tests/functional/api/test_projects.py11
-rw-r--r--tests/unit/objects/test_packages.py6
3 files changed, 8 insertions, 13 deletions
diff --git a/docs/ext/docstrings.py b/docs/ext/docstrings.py
index 7fb24f8..4d8d02d 100644
--- a/docs/ext/docstrings.py
+++ b/docs/ext/docstrings.py
@@ -11,9 +11,9 @@ def classref(value, short=True):
return value
if not inspect.isclass(value):
- return ":class:%s" % value
+ return f":class:{value}"
tilde = "~" if short else ""
- return ":class:`%sgitlab.objects.%s`" % (tilde, value.__name__)
+ return f":class:`{tilde}gitlab.objects.{value.__name__}`"
def setup(app):
diff --git a/tests/functional/api/test_projects.py b/tests/functional/api/test_projects.py
index d1ace2a..44241d4 100644
--- a/tests/functional/api/test_projects.py
+++ b/tests/functional/api/test_projects.py
@@ -106,12 +106,11 @@ def test_project_file_uploads(project):
file_contents = "testing contents"
uploaded_file = project.upload(filename, file_contents)
- assert uploaded_file["alt"] == filename
- assert uploaded_file["url"].startswith("/uploads/")
- assert uploaded_file["url"].endswith(f"/{filename}")
- assert uploaded_file["markdown"] == "[{}]({})".format(
- uploaded_file["alt"], uploaded_file["url"]
- )
+ alt, url = uploaded_file["alt"], uploaded_file["url"]
+ assert alt == filename
+ assert url.startswith("/uploads/")
+ assert url.endswith(f"/{filename}")
+ assert uploaded_file["markdown"] == f"[{alt}]({url})"
def test_project_forks(gl, project, user):
diff --git a/tests/unit/objects/test_packages.py b/tests/unit/objects/test_packages.py
index e57aea6..79f1d1b 100644
--- a/tests/unit/objects/test_packages.py
+++ b/tests/unit/objects/test_packages.py
@@ -107,11 +107,7 @@ package_name = "hello-world"
package_version = "v1.0.0"
file_name = "hello.tar.gz"
file_content = "package content"
-package_url = "http://localhost/api/v4/projects/1/packages/generic/{}/{}/{}".format(
- package_name,
- package_version,
- file_name,
-)
+package_url = f"http://localhost/api/v4/projects/1/packages/generic/{package_name}/{package_version}/{file_name}"
@pytest.fixture