Rename some functions to avoid shadowing

Author: JWCook

pyinaturalist/controllers/identification_controller.py

@@ -45,15 +45,15 @@ def from_ids(self, identification_ids: MultiInt, **params) -> Paginator[Identifi
             identification_ids: One or more identification IDs
         """
 
-        def get_identifications_by_id(_identification_ids: MultiInt, **params):
+        def _request_identifications_by_id(_identification_ids: MultiInt, **params):
             return self.client.session.request(
                 'GET', f'{API_V1}/identifications', ids=_identification_ids, **params
             ).json()
 
-        params = self.client.add_defaults(get_identifications_by_id, params)
+        params = self.client.add_defaults(_request_identifications_by_id, params)
 
         return IDPaginator(
-            get_identifications_by_id,
+            _request_identifications_by_id,
             Identification,
             ids=ensure_list(identification_ids),
             ids_per_request=IDS_PER_REQUEST,
@@ -75,8 +75,8 @@ def search(self, **params) -> Paginator[Identification]:
             >>> ids = client.identifications.search(user_login='my_username', rank='species').all()
         """
 
-        def get_identifications(**params):
+        def _request_identifications(**params):
             return self.client.session.get(f'{API_V1}/identifications', **params).json()
 
         params = convert_rank_range(params)
-        return self.client.paginate(get_identifications, Identification, **params)
+        return self.client.paginate(_request_identifications, Identification, **params)

pyinaturalist/controllers/observation_controller.py

@@ -73,15 +73,15 @@ def from_ids(self, observation_ids: MultiInt, **params) -> Paginator[Observation
             observation_ids: One or more observation IDs
         """
 
-        def get_observations_by_id(_observation_ids: MultiInt, **params):
+        def _request_observations_by_id(_observation_ids: MultiInt, **params):
             return self.client.session.request(
                 'GET', f'{API_V1}/observations', ids=_observation_ids, **params
             ).json()
 
-        params = self.client.add_defaults(get_observations_by_id, params)
+        params = self.client.add_defaults(_request_observations_by_id, params)
 
         return IDPaginator(
-            get_observations_by_id,
+            _request_observations_by_id,
             Observation,
             ids=ensure_list(observation_ids),
             ids_per_request=MAX_IDS_PER_REQUEST,
@@ -131,14 +131,17 @@ def search(self, **params) -> Paginator[Observation]:
 
         """
 
-        def get_observations(**params):
+        # Inline request function needed to pass to ObservationPaginator (IDRangePaginator),
+        # which requires a callable that accepts pagination kwargs directly. The v1 function
+        # handles its own pagination and cannot be used here.
+        def _request_observations(**params):
             return self.client.session.get(f'{API_V1}/observations', **params).json()
 
         params = validate_multiple_choice_param(params, 'order_by', V1_OBS_ORDER_BY_PROPERTIES)
-        params = self.client.add_defaults(get_observations, params)
+        params = self.client.add_defaults(_request_observations, params)
 
         return ObservationPaginator(
-            get_observations,
+            _request_observations,
             Observation,
             loop=self.client.loop,
             annotation_callback=self.client.annotations.lookup,
@@ -210,6 +213,7 @@ def histogram(self, **params) -> Histogram:
                     :lines: 3-
 
         """
+        params = self.client.add_defaults(self.client.session.get, params)
         response = self.client.session.get(f'{API_V1}/observations/histogram', **params).json()
         return Histogram.from_json(response['results'])
 
@@ -401,8 +405,7 @@ def update(self, **params) -> Observation:
             >>>     description='updated description!',
             >>> )
         """
-        params = self.client.add_defaults(update_observation, params, auth=True)
-        response = update_observation(**params)
+        response = self.client.request(update_observation, auth=True, **params)
         return Observation.from_json(response)
 
     def upload(