diff --git a/usda/client.py b/usda/client.py index f0db6a0..abd5c15 100644 --- a/usda/client.py +++ b/usda/client.py @@ -17,7 +17,7 @@ class UsdaClient(DataGovClientBase): lt=UsdaNdbListType.all_nutrients.value, max=max, offset=offset, sort=sort) response_data = get_response_data(uri) - nutrients = self.__build_nutrients_list(response_data) + nutrients = self._build_nutrients_list(response_data) return nutrients def list_foods(self, max, offset=0, sort='n'): @@ -25,7 +25,7 @@ class UsdaClient(DataGovClientBase): UsdaApis.ndb.value, UsdaUriActions.list.value, lt=UsdaNdbListType.food.value, max=max, offset=offset, sort=sort) response_data = get_response_data(uri) - foods = self.__build_foods_list(response_data) + foods = self._build_foods_list(response_data) return foods def get_food_report(self, ndb_food_id, @@ -42,18 +42,18 @@ class UsdaClient(DataGovClientBase): UsdaApis.ndb.value, UsdaUriActions.report.value, type=report_type.value, ndbno=ndb_nutrient_id) - def __build_item_list(self, data, usda_class): + def _build_item_list(self, data, usda_class): result = list() data_list = data['list']['item'] for raw_data in data_list: result.append(usda_class.from_response_data(raw_data)) return result - def __build_nutrients_list(self, response_data): - return self.__build_item_list(response_data, Nutrient) + def _build_nutrients_list(self, response_data): + return self._build_item_list(response_data, Nutrient) - def __build_foods_list(self, response_data): - return self.__build_item_list(response_data, Food) + def _build_foods_list(self, response_data): + return self._build_item_list(response_data, Food) - def __build_food_report(self, response_data): + def _build_food_report(self, response_data): return FoodReport(response_data) diff --git a/usda/domain.py b/usda/domain.py index 009b65d..34517e0 100644 --- a/usda/domain.py +++ b/usda/domain.py @@ -79,17 +79,17 @@ class Food(UsdaObject): class FoodReport(UsdaObject): @staticmethod - def __get_measures(raw_measures): + def _get_measures(raw_measures): measures = list() for raw_measure in raw_measures: measures.append(Measure.from_response_data(raw_measure)) return measures @staticmethod - def __get_nutrients(raw_nutrients): + def _get_nutrients(raw_nutrients): nutrients = list() for raw_nutrient in raw_nutrients: - measures = FoodReport.__get_measures(raw_nutrient["measures"]) + measures = FoodReport._get_measures(raw_nutrient["measures"]) nutrient = Nutrient( id=raw_nutrient["nutrient_id"], name=raw_nutrient["name"], group=raw_nutrient["group"], unit=raw_nutrient["unit"], @@ -106,7 +106,7 @@ class FoodReport(UsdaObject): else food["fg"] return FoodReport( food=Food(id=food["ndbno"], name=food['name']), - nutrients=FoodReport.__get_nutrients(food["nutrients"]), + nutrients=FoodReport._get_nutrients(food["nutrients"]), report_type=report["type"], foot_notes=report["footnotes"], food_group=food_group)