From a8c983a69b12ff32a30d488d7f326915f1aa7d63 Mon Sep 17 00:00:00 2001
From: BonfaceKilz
Date: Mon, 28 Sep 2020 18:00:00 +0300
Subject: Fix casting error

* wqflask/base/trait.py (retrieve_trait_info): If the
description_string or discription_display value return a None object,
evaluate to an empty string. Fixes errors related to *len(None)*.
---
 wqflask/base/trait.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 7666348e..03c4b079 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -507,13 +507,14 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False):
             description_string = unicode(str(trait.description).strip(codecs.BOM_UTF8), 'utf-8')
             target_string = unicode(str(trait.probe_target_description).strip(codecs.BOM_UTF8), 'utf-8')
 
-            if len(description_string) > 1 and description_string != 'None':
+            if str(description_string or "") != "" and description_string != 'None':
                 description_display = description_string
             else:
                 description_display = trait.symbol
 
-            if (len(description_display) > 1 and description_display != 'N/A' and
-                    len(target_string) > 1 and target_string != 'None'):
+            if (str(description_display or "") != "" and
+                description_display != 'N/A' and
+                str(target_string or "") != "" and target_string != 'None'):
                 description_display = description_display + '; ' + target_string.strip()
 
             # Save it for the jinja2 template
@@ -607,4 +608,4 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False):
     else:
         raise KeyError, `trait.name`+' information is not found in the database.'
         
-    return trait
\ No newline at end of file
+    return trait
-- 
cgit v1.2.3