Small adjustments suggested by pyupgrade

diff --git a/psycopg/psycopg/conninfo.py b/psycopg/psycopg/conninfo.py
index 1007fca542810da961f31a59468e2c6b0f3b5867..0a61a508bb6060deb52be4e90211852ecfda8d34 100644 (file)
--- a/psycopg/psycopg/conninfo.py
+++ b/psycopg/psycopg/conninfo.py
@@ -49,7 +49,7 @@ def make_conninfo(conninfo: str = "", **kwargs: Any) -> str:
         kwargs = tmp
 
     conninfo = " ".join(
-        ["%s=%s" % (k, _param_escape(str(v))) for (k, v) in kwargs.items()]
+        f"{k}={_param_escape(str(v))}" for (k, v) in kwargs.items()
     )
 
     # Verify the result is valid

diff --git a/psycopg/psycopg/pq/_pq_ctypes.py b/psycopg/psycopg/pq/_pq_ctypes.py
index 7f674dbcabfafae3bebe41b2a9f47dbcd14659cc..4faefe4b0b5268ec52769de41c4f484f6b33fc7e 100644 (file)
--- a/psycopg/psycopg/pq/_pq_ctypes.py
+++ b/psycopg/psycopg/pq/_pq_ctypes.py
@@ -648,14 +648,14 @@ def generate_stub() -> None:
             assert False, f"can't deal with {t} in {fname}"
 
     fn = __file__ + "i"
-    with open(fn, "r") as f:
+    with open(fn) as f:
         lines = f.read().splitlines()
 
-    istart, iend = [
+    istart, iend = (
         i
         for i, line in enumerate(lines)
         if re.match(r"\s*#\s*autogenerated:\s+(start|end)", line)
-    ]
+    )
 
     known = {
         line[4:].split("(", 1)[0]

diff --git a/psycopg/psycopg/types/array.py b/psycopg/psycopg/types/array.py
index 61eafcf0b711608c05739089f21a203904e7e846..b3b6e5e387d726f36f0eedcf3077b8b620c26fd3 100644 (file)
--- a/psycopg/psycopg/types/array.py
+++ b/psycopg/psycopg/types/array.py
@@ -64,8 +64,7 @@ class BaseListDumper(RecursiveDumper):
 
         for item in L:
             if type(item) is list:
-                for subit in self._flatiter(item, seen):
-                    yield subit
+                yield from self._flatiter(item, seen)
             elif item is not None:
                 yield item
 

diff --git a/psycopg/psycopg/types/range.py b/psycopg/psycopg/types/range.py
index bcbfd2abe0355ac5d25b6c4326d2b34601248851..6c353b5e5e26b085004f7ba2b1632ad495f1b512 100644 (file)
--- a/psycopg/psycopg/types/range.py
+++ b/psycopg/psycopg/types/range.py
@@ -62,15 +62,12 @@ class Range(Generic[T]):
             self._bounds = ""
 
     def __repr__(self) -> str:
-        if not self._bounds:
-            return "%s(empty=True)" % self.__class__.__name__
+        if self._bounds:
+            args = f"{self._lower!r}, {self._upper!r}, {self._bounds!r}"
         else:
-            return "%s(%r, %r, %r)" % (
-                self.__class__.__name__,
-                self._lower,
-                self._upper,
-                self._bounds,
-            )
+            args = "empty=True"
+
+        return f"{self.__class__.__name__}({args})"
 
     def __str__(self) -> str:
         if not self._bounds: