diff options
| author | zsloan | 2020-10-29 14:35:09 -0500 |
|---|---|---|
| committer | zsloan | 2020-10-29 14:35:09 -0500 |
| commit | 7c1c9e2a519ba662e9f293eea73eb7922b2160e4 (patch) | |
| tree | f6d4db465d338c1433bbb126e911062a6c31748b /wqflask/utility/helper_functions.py | |
| parent | 5a1f69aa85809768577069ae63d92c9ef6aecc02 (diff) | |
| parent | 6e6911b466c2727b16a190d8b714f55d7842d7e2 (diff) | |
| download | genenetwork2-7c1c9e2a519ba662e9f293eea73eb7922b2160e4.tar.gz | |
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into reaper_bootstrap_fix
Diffstat (limited to 'wqflask/utility/helper_functions.py')
| -rw-r--r-- | wqflask/utility/helper_functions.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/wqflask/utility/helper_functions.py b/wqflask/utility/helper_functions.py index 9ce809b6..7eb7f013 100644 --- a/wqflask/utility/helper_functions.py +++ b/wqflask/utility/helper_functions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function, division - from base import data_set from base.trait import create_trait from base.species import TheSpecies @@ -13,7 +11,7 @@ logger = logging.getLogger(__name__ ) def get_species_dataset_trait(self, start_vars): #assert type(read_genotype) == type(bool()), "Expecting boolean value for read_genotype" - if "temp_trait" in start_vars.keys(): + if "temp_trait" in list(start_vars.keys()): if start_vars['temp_trait'] == "True": self.dataset = data_set.create_dataset(dataset_name = "Temp", dataset_type = "Temp", group_name = start_vars['group']) else: @@ -34,7 +32,7 @@ def get_species_dataset_trait(self, start_vars): #self.genotype = self.dataset.group.genotype def get_trait_db_obs(self, trait_db_list): - if isinstance(trait_db_list, basestring): + if isinstance(trait_db_list, str): trait_db_list = trait_db_list.split(",") self.trait_list = [] |