diff options
| author | BonfaceKilz | 2020-10-12 14:24:29 +0300 |
|---|---|---|
| committer | BonfaceKilz | 2020-10-12 14:24:29 +0300 |
| commit | 276e0381d62b07525e0ebd28528e59be8230c954 (patch) | |
| tree | 287758f0efa03f76d87a4debb1a50d5e6f806547 /wqflask/base/trait.py | |
| parent | 16cd94dfa0e892576f1c566948b775b954f7f508 (diff) | |
| parent | 58c3815571f83db0296dc099f1e4c6ff69619f64 (diff) | |
| download | genenetwork2-276e0381d62b07525e0ebd28528e59be8230c954.tar.gz | |
Merge branch 'testing' into build/python3-migration
Diffstat (limited to 'wqflask/base/trait.py')
| -rw-r--r-- | wqflask/base/trait.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index a493cfbf..cfc02f8b 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -132,7 +132,7 @@ class GeneralTrait(object): @property def description_fmt(self): - '''Return a text formated description''' + """Return a text formated description""" if self.dataset.type == 'ProbeSet': if self.description: formatted = self.description @@ -153,7 +153,7 @@ class GeneralTrait(object): @property def alias_fmt(self): - '''Return a text formatted alias''' + """Return a text formatted alias""" alias = 'Not available' if getattr(self, "alias", None): @@ -164,7 +164,7 @@ class GeneralTrait(object): @property def wikidata_alias_fmt(self): - '''Return a text formatted alias''' + """Return a text formatted alias""" alias = 'Not available' if self.symbol: @@ -194,12 +194,12 @@ class GeneralTrait(object): @property def location_fmt(self): - '''Return a text formatted location + """Return a text formatted location While we're at it we set self.location in case we need it later (do we?) - ''' + """ if self.chr and self.mb: self.location = 'Chr %s @ %s Mb' % (self.chr, self.mb) @@ -542,7 +542,7 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False): if (str(description_display or "") != "" and description_display != 'N/A' and - str(target_string or "") != "" and target_string != 'None'): + str(target_string or "") != "" and target_string != 'None'): description_display = description_display + '; ' + target_string.strip() # Save it for the jinja2 template @@ -631,7 +631,8 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False): else: trait.locus = trait.lrs = trait.additive = "" if (dataset.type == 'Publish' or dataset.type == "ProbeSet") and str(trait.locus_chr or "") != "" and str(trait.locus_mb or "") != "": - trait.LRS_location_repr = LRS_location_repr = 'Chr%s: %.6f' % (trait.locus_chr, float(trait.locus_mb)) + trait.LRS_location_repr = LRS_location_repr = 'Chr%s: %.6f' % ( + trait.locus_chr, float(trait.locus_mb)) if str(trait.lrs or "") != "": trait.LRS_score_repr = LRS_score_repr = '%3.1f' % trait.lrs else: |