From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Mon, 13 Sep 2021 15:56:50 +0000 (+0200)
Subject: Small adjustments suggested by pyupgrade
X-Git-Tag: 3.0~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b70e9da3bedc408e4e4f88ab68b892f5d4d0fd25;p=thirdparty%2Fpsycopg.git

Small adjustments suggested by pyupgrade
---

diff --git a/psycopg/psycopg/conninfo.py b/psycopg/psycopg/conninfo.py
index 1007fca54..0a61a508b 100644
--- 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 7f674dbca..4faefe4b0 100644
--- 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 61eafcf0b..b3b6e5e38 100644
--- 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 bcbfd2abe..6c353b5e5 100644
--- 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: