Skip to content

Commit 89c15b5

Browse files
committed
address PR feedback
1 parent b5088af commit 89c15b5

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

google/api_core/client_logging.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import logging
22
import json
3-
import re
43
import os
54

5+
from typing import List, Optional
6+
67
_LOGGING_INITIALIZED = False
78
_BASE_LOGGER_NAME = "google"
89
# TODO(https://github.com/googleapis/python-api-core/issues/760): Update Request / Response messages.
@@ -19,9 +20,7 @@
1920

2021
def logger_configured(logger):
2122
return (
22-
logger.handlers != []
23-
or logger.level != logging.NOTSET
24-
or logger.propagate == False
23+
logger.handlers != [] or logger.level != logging.NOTSET or not logger.propagate
2524
)
2625

2726

@@ -34,7 +33,7 @@ def initialize_logging():
3433
_LOGGING_INITIALIZED = True
3534

3635

37-
def parse_logging_scopes(scopes):
36+
def parse_logging_scopes(scopes: Optional[str] = None) -> List[str]:
3837
if not scopes:
3938
return []
4039
# TODO(https://github.com/googleapis/python-api-core/issues/759): check if the namespace is a valid namespace.

tests/unit/test_client_logging.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import logging
2-
import pytest
3-
import mock
2+
from unittest import mock
43

54
from google.api_core.client_logging import (
65
setup_logging,
@@ -20,7 +19,7 @@ def test_setup_logging_w_no_scopes():
2019
setup_logging()
2120
base_logger = logging.getLogger("foo")
2221
assert base_logger.handlers == []
23-
assert base_logger.propagate == False
22+
assert not base_logger.propagate
2423
assert base_logger.level == logging.NOTSET
2524

2625
reset_logger("foo")
@@ -31,7 +30,7 @@ def test_setup_logging_w_base_scope():
3130
setup_logging("foo")
3231
base_logger = logging.getLogger("foo")
3332
assert isinstance(base_logger.handlers[0], logging.StreamHandler)
34-
assert base_logger.propagate == False
33+
assert not base_logger.propagate
3534
assert base_logger.level == logging.DEBUG
3635

3736
reset_logger("foo")
@@ -43,12 +42,12 @@ def test_setup_logging_w_module_scope():
4342

4443
base_logger = logging.getLogger("foo")
4544
assert base_logger.handlers == []
46-
assert base_logger.propagate == False
45+
assert not base_logger.propagate
4746
assert base_logger.level == logging.NOTSET
4847

4948
module_logger = logging.getLogger("foo.bar")
5049
assert isinstance(module_logger.handlers[0], logging.StreamHandler)
51-
assert module_logger.propagate == False
50+
assert not module_logger.propagate
5251
assert module_logger.level == logging.DEBUG
5352

5453
reset_logger("foo")
@@ -61,13 +60,13 @@ def test_setup_logging_w_incorrect_scope():
6160

6261
base_logger = logging.getLogger("foo")
6362
assert base_logger.handlers == []
64-
assert base_logger.propagate == False
63+
assert not base_logger.propagate
6564
assert base_logger.level == logging.NOTSET
6665

6766
# TODO(https://github.com/googleapis/python-api-core/issues/759): update test once we add logic to ignore an incorrect scope.
6867
logger = logging.getLogger("abc")
6968
assert isinstance(logger.handlers[0], logging.StreamHandler)
70-
assert logger.propagate == False
69+
assert not logger.propagate
7170
assert logger.level == logging.DEBUG
7271

7372
reset_logger("foo")
@@ -82,12 +81,12 @@ def test_initialize_logging():
8281

8382
base_logger = logging.getLogger("foo")
8483
assert base_logger.handlers == []
85-
assert base_logger.propagate == False
84+
assert not base_logger.propagate
8685
assert base_logger.level == logging.NOTSET
8786

8887
module_logger = logging.getLogger("foo.bar")
8988
assert isinstance(module_logger.handlers[0], logging.StreamHandler)
90-
assert module_logger.propagate == False
89+
assert not module_logger.propagate
9190
assert module_logger.level == logging.DEBUG
9291

9392
base_logger.propagate = True
@@ -96,10 +95,9 @@ def test_initialize_logging():
9695
with mock.patch("os.getenv", return_value="foo.bar"):
9796
with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foo"):
9897
initialize_logging()
99-
100-
assert base_logger.propagate == True
101-
assert module_logger.propagate == True
10298

99+
assert base_logger.propagate
100+
assert module_logger.propagate
103101

104102
reset_logger("foo")
105103
reset_logger("foo.bar")

0 commit comments

Comments
 (0)