# HG changeset patch
# User Laurent Peuch <cortex@worlddomination.be>
# Date 1687887050 -7200
# Tue Jun 27 19:30:50 2023 +0200
# Node ID 2d5ec172c6bd94ef9e2c738f1b6335a35ea7683f
# Parent 73bf0954b1c79dd718ca718fc201241644e55232
feat: run flynt on the code base to convert everything into f-strings
diff --git a/cubicweb_squareui/__pkginfo__.py b/cubicweb_squareui/__pkginfo__.py
--- a/cubicweb_squareui/__pkginfo__.py
+++ b/cubicweb_squareui/__pkginfo__.py
@@ -11,7 +11,7 @@
author = "LOGILAB S.A. (Paris, FRANCE)"
author_email = "contact@logilab.fr"
description = "data-centric user interface for cubicweb based on bootstrap"
-web = "https://forge.extranet.logilab.fr/cubicweb/cubes/%s" % distname
+web = f"https://forge.extranet.logilab.fr/cubicweb/cubes/{distname}"
__depends__ = {
"cubicweb": ">= 3.38.0, < 3.39.0",
diff --git a/cubicweb_squareui/views/basetemplates.py b/cubicweb_squareui/views/basetemplates.py
--- a/cubicweb_squareui/views/basetemplates.py
+++ b/cubicweb_squareui/views/basetemplates.py
@@ -64,7 +64,7 @@
w("\n".join(additional_headers) + "\n")
self.wview("htmlheader", rset=self.cw_rset)
if page_title:
- w("<title>%s</title>\n" % xml_escape(page_title))
+ w(f"<title>{xml_escape(page_title)}</title>\n")
@monkeypatch(basetemplates.TheMainTemplate)
@@ -72,7 +72,7 @@
w = self.w
self.w("<body>\n")
self.wview("header", rset=self.cw_rset, view=view)
- w('<div id="page" class="%s">\n' % self.twbs_container_cls)
+ w(f'<div id="page" class="{self.twbs_container_cls}">\n')
w('<div class="row">\n')
left_boxes = list(
self._cw.vreg["ctxcomponents"].poss_visible_objects(
@@ -121,15 +121,15 @@
msg = " ".join(
(
_("searching for"),
- '<strong>"%s"</strong>' % display_name(self._cw, state[1][3]),
+ f'<strong>"{display_name(self._cw, state[1][3])}"</strong>',
_("to associate with"),
value,
_("by relation"),
- '<strong>"%s"</strong>' % display_name(self._cw, state[1][2], state[1][0]),
+ f'<strong>"{display_name(self._cw, state[1][2], state[1][0])}"</strong>',
cancel_link,
)
)
- return self.w('<div class="alert alert-info">%s</div>' % msg)
+ return self.w(f'<div class="alert alert-info">{msg}</div>')
@monkeypatch(basetemplates.TheMainTemplate)
@@ -153,17 +153,14 @@
@monkeypatch(basetemplates.TheMainTemplate)
def content_column(self, view, content_cols):
w = self.w
- w(
- '<div id="main-center" class="%(prefix)s%(col)s" role="main">'
- % {"prefix": self.twbs_col_cls, "col": content_cols}
- )
+ w(f'<div id="main-center" class="{self.twbs_col_cls}{content_cols}" role="main">')
components = self._cw.vreg["components"]
self.content_components(view, components)
w('<div id="pageContent">')
self.content_header(view)
vtitle = self._cw.form.get("vtitle")
if vtitle:
- w('<div class="vtitle">%s</div>\n' % xml_escape(vtitle))
+ w(f'<div class="vtitle">{xml_escape(vtitle)}</div>\n')
self.state_header()
self.content_navrestriction_components(view, components)
nav_html = UStringIO()
@@ -245,8 +242,8 @@
@monkeypatch(basetemplates.HTMLPageHeader)
def main_header(self, view):
w = self.w
- w('<nav class="navbar %s" role="banner">' % self.css["navbar-extra"])
- w('<div class="%s">' % self.css["container-cls"])
+ w(f"<nav class=\"navbar {self.css['navbar-extra']}\" role=\"banner\">")
+ w(f"<div class=\"{self.css['container-cls']}\">")
self.display_navbar_header(w, view)
w('<div id="tools-group" class="collapse navbar-collapse">')
self.display_header_components(w, view, "header-left")
@@ -278,7 +275,7 @@
def display_header_components(self, w, view, context):
components = self.get_components(view, context=context)
if components:
- w('<ul class="nav navbar-nav %s">' % self.css[context])
+ w(f'<ul class="nav navbar-nav {self.css[context]}">')
for component in components:
w("<li>")
component.render(w=w)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -57,9 +57,7 @@
requires = {}
for entry in ("__depends__",): # "__recommends__"):
requires.update(__pkginfo__.get(entry, {}))
-install_requires = [
- "{} {}".format(d, v and v or "").strip() for d, v in requires.items()
-]
+install_requires = [f"{d} {v and v or ''}".strip() for d, v in requires.items()]
setup(