Skip to content

Commit 380ba71

Browse files
Conformance edits.
1 parent 5c21863 commit 380ba71

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

meraki/__init__.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
API_KEY_ENVIRONMENT_VARIABLE, DEFAULT_BASE_URL, SINGLE_REQUEST_TIMEOUT, CERTIFICATE_PATH, REQUESTS_PROXY,
2323
WAIT_ON_RATE_LIMIT, NGINX_429_RETRY_WAIT_TIME, ACTION_BATCH_RETRY_WAIT_TIME, RETRY_4XX_ERROR,
2424
RETRY_4XX_ERROR_WAIT_TIME, MAXIMUM_RETRIES, OUTPUT_LOG, LOG_PATH, LOG_FILE_PREFIX, PRINT_TO_CONSOLE,
25-
SUPPRESS_LOGGING, SIMULATE_API_CALLS, BE_GEO_ID, MERAKI_PYTHON_SDK_CALLER, INHERIT_LOGGING_CONFIG
25+
SUPPRESS_LOGGING, SIMULATE_API_CALLS, BE_GEO_ID, MERAKI_PYTHON_SDK_CALLER, USE_ITERATOR_FOR_GET_PAGES,
26+
INHERIT_LOGGING_CONFIG
2627
)
2728

2829
__version__ = '1.15.0'
@@ -87,6 +88,8 @@ def __init__(self, api_key=None,
8788
# Pull the caller from an environment variable if present
8889
caller = caller or os.environ.get('MERAKI_PYTHON_SDK_CALLER')
8990

91+
inherit_logging_config = inherit_logging_config
92+
9093
# Configure logging
9194
if not suppress_logging:
9295
self._logger = logging.getLogger(__name__)
@@ -137,7 +140,7 @@ def __init__(self, api_key=None,
137140
simulate=simulate,
138141
be_geo_id=be_geo_id,
139142
caller=caller,
140-
use_iterator_for_get_pages=use_iterator_for_get_pages,
143+
use_iterator_for_get_pages=use_iterator_for_get_pages
141144
)
142145

143146
# API endpoints by section

meraki/aio/rest_session.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def __init__(
3535
maximum_concurrent_requests=AIO_MAXIMUM_CONCURRENT_REQUESTS,
3636
be_geo_id=BE_GEO_ID,
3737
caller=MERAKI_PYTHON_SDK_CALLER,
38-
use_iterator_for_get_pages=False,
38+
use_iterator_for_get_pages=USE_ITERATOR_FOR_GET_PAGES,
3939
):
4040
super().__init__()
4141

@@ -58,8 +58,7 @@ def __init__(
5858
)
5959
self._be_geo_id = be_geo_id
6060
self._caller = caller
61-
62-
self.use_iterator_for_get_pages = use_iterator_for_get_pages
61+
self._use_iterator_for_get_pages = use_iterator_for_get_pages
6362

6463
# Check base URL
6564
if "v0" in self._base_url:

meraki/rest_session.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def __init__(
7474
simulate=SIMULATE_API_CALLS,
7575
be_geo_id=BE_GEO_ID,
7676
caller=MERAKI_PYTHON_SDK_CALLER,
77-
use_iterator_for_get_pages=False,
77+
use_iterator_for_get_pages=USE_ITERATOR_FOR_GET_PAGES
7878
):
7979
super(RestSession, self).__init__()
8080

@@ -94,8 +94,7 @@ def __init__(
9494
self._simulate = simulate
9595
self._be_geo_id = be_geo_id
9696
self._caller = caller
97-
98-
self.use_iterator_for_get_pages = use_iterator_for_get_pages
97+
self._use_iterator_for_get_pages = use_iterator_for_get_pages
9998

10099
# Initialize a new `requests` session
101100
self._req_session = requests.session()

0 commit comments

Comments
 (0)