Skip to content

Commit aa88377

Browse files
Gayathri Srividya RajavarapuGayathri Srividya Rajavarapu
authored andcommitted
Fix mypy call sites after iterator catalog APIs
1 parent c0a32a5 commit aa88377

4 files changed

Lines changed: 12 additions & 10 deletions

File tree

pyiceberg/cli/console.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# pylint: disable=broad-except,redefined-builtin,redefined-outer-name
1818
import itertools
1919
import logging
20-
from collections.abc import Callable
20+
from collections.abc import Callable, Iterator
2121
from functools import wraps
2222
from typing import (
2323
Any,
@@ -34,6 +34,7 @@
3434
from pyiceberg.io import WAREHOUSE
3535
from pyiceberg.table import TableProperties
3636
from pyiceberg.table.refs import SnapshotRef, SnapshotRefType
37+
from pyiceberg.typedef import Identifier
3738
from pyiceberg.utils.properties import property_as_int
3839

3940

@@ -131,6 +132,7 @@ def _catalog_and_output(ctx: Context) -> tuple[Catalog, Output]:
131132
def list(ctx: Context, parent: str | None) -> None: # pylint: disable=redefined-builtin
132133
"""List tables or namespaces."""
133134
catalog, output = _catalog_and_output(ctx)
135+
identifiers: Iterator[Identifier]
134136

135137
if parent:
136138
# Do we have tables under parent namespace? Peek at first element.

tests/catalog/integration_test_dynamodb.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def test_list_tables(test_catalog: Catalog, table_schema_nested: Schema, databas
119119
test_catalog.create_namespace(database_name)
120120
for table_name in table_list:
121121
test_catalog.create_table((database_name, table_name), table_schema_nested)
122-
identifier_list = test_catalog.list_tables(database_name)
122+
identifier_list = list(test_catalog.list_tables(database_name))
123123
assert len(identifier_list) == LIST_TEST_NUMBER
124124
for table_name in table_list:
125125
assert (database_name, table_name) in identifier_list
@@ -207,10 +207,10 @@ def test_create_namespace_with_comment_and_location(test_catalog: Catalog, datab
207207
def test_list_namespaces(test_catalog: Catalog, database_list: list[str]) -> None:
208208
for database_name in database_list:
209209
test_catalog.create_namespace(database_name)
210-
db_list = test_catalog.list_namespaces()
210+
db_list = list(test_catalog.list_namespaces())
211211
for database_name in database_list:
212212
assert (database_name,) in db_list
213-
assert len(test_catalog.list_namespaces(list(database_list)[0])) == 0
213+
assert len(list(test_catalog.list_namespaces(list(database_list)[0]))) == 0
214214

215215

216216
def test_drop_namespace(test_catalog: Catalog, table_schema_nested: Schema, table_name: str, database_name: str) -> None:

tests/catalog/integration_test_glue.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def test_list_tables(test_catalog: Catalog, table_schema_nested: Schema, databas
227227
test_catalog.create_namespace(database_name)
228228
for table_name in table_list:
229229
test_catalog.create_table((database_name, table_name), table_schema_nested)
230-
identifier_list = test_catalog.list_tables(database_name)
230+
identifier_list = list(test_catalog.list_tables(database_name))
231231
assert len(identifier_list) == LIST_TEST_NUMBER
232232
for table_name in table_list:
233233
assert (database_name, table_name) in identifier_list
@@ -316,10 +316,10 @@ def test_create_namespace_with_comment_and_location(test_catalog: Catalog, datab
316316
def test_list_namespaces(test_catalog: Catalog, database_list: list[str]) -> None:
317317
for database_name in database_list:
318318
test_catalog.create_namespace(database_name)
319-
db_list = test_catalog.list_namespaces()
319+
db_list = list(test_catalog.list_namespaces())
320320
for database_name in database_list:
321321
assert (database_name,) in db_list
322-
assert len(test_catalog.list_namespaces(list(database_list)[0])) == 0
322+
assert len(list(test_catalog.list_namespaces(list(database_list)[0]))) == 0
323323

324324

325325
def test_drop_namespace(test_catalog: Catalog, table_schema_nested: Schema, database_name: str, table_name: str) -> None:

tests/integration/test_catalog.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def test_list_tables(test_catalog: Catalog, table_schema_nested: Schema, databas
189189
test_catalog.create_namespace(database_name)
190190
for table_name in table_list:
191191
test_catalog.create_table((database_name, table_name), table_schema_nested)
192-
identifier_list = test_catalog.list_tables(database_name)
192+
identifier_list = list(test_catalog.list_tables(database_name))
193193
assert len(identifier_list) == len(table_list)
194194
for table_name in table_list:
195195
assert (database_name, table_name) in identifier_list
@@ -463,10 +463,10 @@ def test_create_namespace_with_comment(test_catalog: Catalog, database_name: str
463463
def test_list_namespaces(test_catalog: Catalog, database_list: list[str]) -> None:
464464
for database_name in database_list:
465465
test_catalog.create_namespace(database_name)
466-
db_list = test_catalog.list_namespaces()
466+
db_list = list(test_catalog.list_namespaces())
467467
for database_name in database_list:
468468
assert (database_name,) in db_list
469-
assert len(test_catalog.list_namespaces(list(database_list)[0])) == 0
469+
assert len(list(test_catalog.list_namespaces(list(database_list)[0]))) == 0
470470

471471

472472
@pytest.mark.integration

0 commit comments

Comments
 (0)