Skip to content

Commit

Permalink
Fix incorrect Usage of Optional[str] & Optional[int] (#11141)
Browse files Browse the repository at this point in the history 
From https://docs.python.org/3/library/typing.html#typing.Optional

```
Optional[X] is equivalent to Union[X, None].
```

>Note that this is not the same concept as an optional argument, which is one that has a default. An optional argument with a default does not require the Optional qualifier on its type annotation just because it is optional.

There were incorrect usages where the default was already set to
a string or int value but still Optional was used
  • Loading branch information
@kaxil
kaxil committed Sep 25, 2020
1 parent ce6b257 commit 99accec
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion airflow/providers/apache/kylin/hooks/kylin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class KylinHook(BaseHook):

def __init__(
self,
kylin_conn_id: Optional[str] = 'kylin_default',
kylin_conn_id: str = 'kylin_default',
project: Optional[str] = None,
dsn: Optional[str] = None,
):
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/apache/kylin/operators/kylin_cube.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class KylinCubeOperator(BaseOperator):
def __init__(
self,
*,
kylin_conn_id: Optional[str] = 'kylin_default',
kylin_conn_id: str = 'kylin_default',
project: Optional[str] = None,
cube: Optional[str] = None,
dsn: Optional[str] = None,
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/hooks/datacatalog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ def list_tags(
entry_group: str,
entry: str,
project_id: str,
page_size: Optional[int] = 100,
page_size: int = 100,
retry: Optional[Retry] = None,
timeout: Optional[float] = None,
metadata: Optional[Sequence[Tuple[str, str]]] = None,
Expand Down
12 changes: 6 additions & 6 deletions airflow/providers/google/cloud/operators/bigquery.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,21 +620,21 @@ def __init__(
*,
sql: Union[str, Iterable],
destination_dataset_table: Optional[str] = None,
write_disposition: Optional[str] = 'WRITE_EMPTY',
allow_large_results: bool = False,
write_disposition: str = 'WRITE_EMPTY',
allow_large_results: Optional[bool] = False,
flatten_results: Optional[bool] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
bigquery_conn_id: Optional[str] = None,
delegate_to: Optional[str] = None,
udf_config: Optional[list] = None,
use_legacy_sql: bool = True,
maximum_billing_tier: Optional[int] = None,
maximum_bytes_billed: Optional[float] = None,
create_disposition: Optional[str] = 'CREATE_IF_NEEDED',
create_disposition: str = 'CREATE_IF_NEEDED',
schema_update_options: Optional[Union[list, tuple, set]] = None,
query_params: Optional[list] = None,
labels: Optional[dict] = None,
priority: Optional[str] = 'INTERACTIVE',
priority: str = 'INTERACTIVE',
time_partitioning: Optional[dict] = None,
api_resource_configs: Optional[dict] = None,
cluster_fields: Optional[List[str]] = None,
Expand Down Expand Up @@ -1553,7 +1553,7 @@ def __init__(
dataset_id: str,
project_id: Optional[str] = None,
max_results: Optional[int] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
**kwargs,
Expand Down
3 changes: 2 additions & 1 deletion airflow/providers/google/cloud/operators/datacatalog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,7 @@ class CloudDataCatalogListTagsOperator(BaseOperator):
:param page_size: The maximum number of resources contained in the underlying API response. If page
streaming is performed per- resource, this parameter does not affect the return value. If page
streaming is performed per-page, this determines the maximum number of resources in a page.
(Default: 100)
:type page_size: int
:param project_id: The ID of the Google Cloud project that owns the entry group.
If set to ``None`` or missing, the default project_id from the Google Cloud connection is used.
Expand Down Expand Up @@ -1465,7 +1466,7 @@ def __init__(
location: str,
entry_group: str,
entry: str,
page_size: Optional[int] = None,
page_size: int = 100,
project_id: Optional[str] = None,
retry: Optional[Retry] = None,
timeout: Optional[float] = None,
Expand Down
20 changes: 10 additions & 10 deletions airflow/providers/google/cloud/operators/stackdriver.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[float] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down Expand Up @@ -207,7 +207,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[float] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down Expand Up @@ -298,7 +298,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[float] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down Expand Up @@ -391,7 +391,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[float] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down Expand Up @@ -480,7 +480,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[float] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down Expand Up @@ -592,7 +592,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[float] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down Expand Up @@ -696,7 +696,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[float] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down Expand Up @@ -789,7 +789,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[float] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down Expand Up @@ -884,7 +884,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[str] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down Expand Up @@ -975,7 +975,7 @@ def __init__(
retry: Optional[str] = DEFAULT,
timeout: Optional[float] = DEFAULT,
metadata: Optional[str] = None,
gcp_conn_id: Optional[str] = 'google_cloud_default',
gcp_conn_id: str = 'google_cloud_default',
project_id: Optional[str] = None,
delegate_to: Optional[str] = None,
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
Expand Down

0 comments on commit 99accec

Please sign in to comment.