Skip to content

fix: use isinstance() per E721, unpin flake8 #1659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chalmerlowe merged 3 commits into from
Sep 18, 2023
Merged

fix: use isinstance() per E721, unpin flake8 #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa28477
fix: use isinstance() per E721, unpin flake8
Linchin Sep 16, 2023
dc8fb06
change type assertion
Linchin Sep 18, 2023
5e48449
Merge branch 'main' into lint-error
Linchin Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions google/cloud/bigquery/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,7 @@ def _get_query_results(
extra_params: Dict[str, Any] = {"maxResults": 0}

if timeout is not None:
if type(timeout) == object:
if not isinstance(timeout, (int, float)):
timeout = _MIN_GET_QUERY_RESULTS_TIMEOUT
else:
timeout = max(timeout, _MIN_GET_QUERY_RESULTS_TIMEOUT)
Expand Down Expand Up @@ -3927,7 +3927,7 @@ def _list_rows_from_query_results(
}

if timeout is not None:
if type(timeout) == object:
if not isinstance(timeout, (int, float)):
timeout = _MIN_GET_QUERY_RESULTS_TIMEOUT
else:
timeout = max(timeout, _MIN_GET_QUERY_RESULTS_TIMEOUT)
Expand Down
4 changes: 1 addition & 3 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,7 @@ def lint(session):
serious code quality issues.
"""

# Pin flake8 to 6.0.0
# See https://github.com/googleapis/python-bigquery/issues/1635
session.install("flake8==6.0.0", BLACK_VERSION)
session.install("flake8", BLACK_VERSION)
session.install("-e", ".")
session.run("flake8", os.path.join("google", "cloud", "bigquery"))
session.run("flake8", "tests")
Expand Down