Ruff C408: rewrite dict() calls as literals

Author: evertlammerts

duckdb/experimental/spark/sql/types.py

@@ -650,12 +650,12 @@ def needConversion(self) -> bool:  # noqa: D102
     def toInternal(self, obj: dict[T, Optional[U]]) -> dict[T, Optional[U]]:  # noqa: D102
         if not self.needConversion():
             return obj
-        return obj and dict((self.keyType.toInternal(k), self.valueType.toInternal(v)) for k, v in obj.items())
+        return obj and {self.keyType.toInternal(k): self.valueType.toInternal(v) for k, v in obj.items()}
 
     def fromInternal(self, obj: dict[T, Optional[U]]) -> dict[T, Optional[U]]:  # noqa: D102
         if not self.needConversion():
             return obj
-        return obj and dict((self.keyType.fromInternal(k), self.valueType.fromInternal(v)) for k, v in obj.items())
+        return obj and {self.keyType.fromInternal(k): self.valueType.fromInternal(v) for k, v in obj.items()}
 
 
 class StructField(DataType):
@@ -1031,16 +1031,16 @@ def __eq__(self, other: object) -> bool:
     TimestampNTZType,
     NullType,
 ]
-_all_atomic_types: dict[str, type[DataType]] = dict((t.typeName(), t) for t in _atomic_types)
+_all_atomic_types: dict[str, type[DataType]] = {t.typeName(): t for t in _atomic_types}
 
 _complex_types: list[type[Union[ArrayType, MapType, StructType]]] = [
     ArrayType,
     MapType,
     StructType,
 ]
-_all_complex_types: dict[str, type[Union[ArrayType, MapType, StructType]]] = dict(
-    (v.typeName(), v) for v in _complex_types
-)
+_all_complex_types: dict[str, type[Union[ArrayType, MapType, StructType]]] = {
+    v.typeName(): v for v in _complex_types
+}
 
 
 _FIXED_DECIMAL = re.compile(r"decimal\(\s*(\d+)\s*,\s*(-?\d+)\s*\)")
@@ -1164,7 +1164,7 @@ def conv(obj: Union[Row, list, dict, object]) -> Union[list, dict, object]:
                 elif isinstance(obj, list):
                     return [conv(o) for o in obj]
                 elif isinstance(obj, dict):
-                    return dict((k, conv(v)) for k, v in obj.items())
+                    return {k: conv(v) for k, v in obj.items()}
                 else:
                     return obj
 

duckdb_packaging/build_backend.py

@@ -77,7 +77,7 @@ def _duckdb_submodule_path() -> Path:
         raise RuntimeError(msg)
     # search the duckdb submodule
     gitmodules_path = Path(".gitmodules")
-    modules = dict()
+    modules = {}
     with gitmodules_path.open("r") as f:
         cur_module_path = None
         cur_module_reponame = None

duckdb_packaging/pypi_cleanup.py

@@ -482,7 +482,7 @@ def _delete_versions(self, http_session: Session, versions_to_delete: set[str])
         """Delete the specified package versions."""
         logging.info(f"Starting deletion of {len(versions_to_delete)} development versions")
 
-        failed_deletions = list()
+        failed_deletions = []
         for version in sorted(versions_to_delete):
             try:
                 self._delete_single_version(http_session, version)

tests/extensions/json/test_read_json.py

@@ -113,7 +113,7 @@ def test_read_json_records(self):
         ],
     )
     def test_read_json_options(self, duckdb_cursor, option):
-        keyword_arguments = dict()
+        keyword_arguments = {}
         option_name, option_value = option
         keyword_arguments[option_name] = option_value
         if option_name == "hive_types":

tests/fast/api/test_to_parquet.py

@@ -38,7 +38,7 @@ def test_field_ids_auto(self):
     def test_field_ids(self):
         temp_file_name = os.path.join(tempfile.mkdtemp(), next(tempfile._get_candidate_names()))  # noqa: PTH118
         rel = duckdb.sql("""SELECT 1 as i, {j: 128} AS my_struct""")
-        rel.to_parquet(temp_file_name, field_ids=dict(i=42, my_struct={"__duckdb_field_id": 43, "j": 44}))
+        rel.to_parquet(temp_file_name, field_ids={"i": 42, "my_struct": {"__duckdb_field_id": 43, "j": 44}})
         parquet_rel = duckdb.read_parquet(temp_file_name)
         assert rel.execute().fetchall() == parquet_rel.execute().fetchall()
         assert duckdb.sql(

tests/fast/arrow/test_5547.py

@@ -13,12 +13,12 @@ def test_5547():
     tbl = pa.Table.from_pandas(
         pd.DataFrame.from_records(
             [
-                dict(
-                    id=i,
-                    nested=dict(
-                        a=i,
-                    ),
-                )
+                {
+                    "id": i,
+                    "nested": {
+                        "a": i,
+                    },
+                }
                 for i in range(num_rows)
             ]
         )

tests/fast/arrow/test_large_offsets.py

@@ -12,23 +12,23 @@ class TestArrowLargeOffsets:
     @pytest.mark.skip(reason="CI does not have enough memory to validate this")
     def test_large_lists(self, duckdb_cursor):
         ary = pa.array([np.arange(start=0, stop=3000, dtype=np.uint8) for i in range(1_000_000)])
-        tbl = pa.Table.from_pydict(dict(col=ary))  # noqa: F841
+        tbl = pa.Table.from_pydict({"col": ary})  # noqa: F841
         with pytest.raises(
             duckdb.InvalidInputException,
             match="Arrow Appender: The maximum combined list offset for regular list buffers is 2147483647 but "
             "the offset of 2147481000 exceeds this.",
         ):
             duckdb_cursor.sql("SELECT col FROM tbl").fetch_arrow_table()
 
-        tbl2 = pa.Table.from_pydict(dict(col=ary.cast(pa.large_list(pa.uint8()))))  # noqa: F841
+        tbl2 = pa.Table.from_pydict({"col": ary.cast(pa.large_list(pa.uint8()))})  # noqa: F841
         duckdb_cursor.sql("set arrow_large_buffer_size = true")
         res2 = duckdb_cursor.sql("SELECT col FROM tbl2").fetch_arrow_table()
         res2.validate()
 
     @pytest.mark.skip(reason="CI does not have enough memory to validate this")
     def test_large_maps(self, duckdb_cursor):
         ary = pa.array([np.arange(start=3000 * j, stop=3000 * (j + 1), dtype=np.uint64) for j in range(1_000_000)])
-        tbl = pa.Table.from_pydict(dict(col=ary))  # noqa: F841
+        tbl = pa.Table.from_pydict({"col": ary})  # noqa: F841
 
         with pytest.raises(
             duckdb.InvalidInputException,

tests/fast/pandas/test_pandas_object.py

@@ -30,8 +30,8 @@ def test_object_to_string(self, duckdb_cursor):
 
     def test_tuple_to_list(self, duckdb_cursor):
         tuple_df = pd.DataFrame.from_dict(  # noqa: F841
-            dict(
-                nums=[
+            {
+                "nums": [
                     (
                         1,
                         2,
@@ -43,7 +43,7 @@ def test_tuple_to_list(self, duckdb_cursor):
                         6,
                     ),
                 ]
-            )
+            }
         )
         duckdb_cursor.execute("CREATE TABLE test as SELECT * FROM tuple_df")
         res = duckdb_cursor.table("test").fetchall()

tests/fast/spark/test_spark_dataframe_sort.py

@@ -84,7 +84,7 @@ def test_sort_invalid_column(self, spark):
         df = spark.createDataFrame(self.data, ["age", "name"])
 
         with pytest.raises(PySparkTypeError):
-            df = df.sort(dict(a=1))
+            df = df.sort({"a": 1})
 
     def test_sort_with_desc(self, spark):
         df = spark.createDataFrame(self.data, ["age", "name"])

tests/fast/spark/test_spark_filter.py

@@ -184,4 +184,4 @@ def test_invalid_condition_type(self, spark):
         df = spark.createDataFrame([(1, "A")], ["A", "B"])
 
         with pytest.raises(PySparkTypeError):
-            df = df.filter(dict(a=1))
+            df = df.filter({"a": 1})