diff --git a/speciesData.py b/speciesData.py index 252c37db6d19014af9437f557a0ab7d81ae3c676..6ee1b798466d6effa27d25ccb82f2aaf2c4931c2 100755 --- a/speciesData.py +++ b/speciesData.py @@ -47,12 +47,12 @@ class SpeciesData: else: return string - def set_service_attribute(self, attribute, service, parameters_dictionary): + def set_service_attribute(self, service, parameters_dictionary): parameters_dictionary_services = parameters_dictionary[constants.ORG_PARAM_SERVICES] if(service in parameters_dictionary_services.keys()): - attribute = parameters_dictionary_services[service] + return parameters_dictionary_services[service] else: - attribute = "0" + return "0" def __init__(self, parameters_dictionary): self.parameters_dictionary = parameters_dictionary @@ -91,8 +91,8 @@ class SpeciesData: self.blastx_path = parameters_dictionary_data[constants.ORG_PARAM_DATA_BLASTX_PATH] self.orthofinder_path = parameters_dictionary_data[constants.ORG_PARAM_DATA_ORTHOFINDER_PATH] - self.set_service_attribute(self.blast, constants.ORG_PARAM_SERVICES_BLAST, parameters_dictionary) - self.set_service_attribute(self.go, constants.ORG_PARAM_SERVICES_GO, parameters_dictionary) + self.blast = set_service_attribute(constants.ORG_PARAM_SERVICES_BLAST, parameters_dictionary) + self.go = set_service_attribute(constants.ORG_PARAM_SERVICES_GO, parameters_dictionary) self.genus_lowercase = self.genus.lower() self.species_lower = self.species.lower()