aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2020-11-03 15:24:22 -0600
committerGitHub2020-11-03 15:24:22 -0600
commit55bb282311d82abf842d95a44c61d744803cf4a2 (patch)
tree64012062bb114908433a4a4c15c7aa22957b9f48
parent5ea0872f60152b3884b71c8e8b3083474ecc66e8 (diff)
parent96b095aa83ed113250442e4c6f180c7dd66d3e0e (diff)
downloadgenenetwork2-55bb282311d82abf842d95a44c61d744803cf4a2.tar.gz
Merge pull request #479 from zsloan/bug/haplotype_analyst_error_fix
Bug/haplotype analyst error fix
-rw-r--r--wqflask/base/GeneralObject.py2
-rw-r--r--wqflask/wqflask/marker_regression/display_mapping_results.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/wqflask/base/GeneralObject.py b/wqflask/base/GeneralObject.py
index 0122ee32..249195e2 100644
--- a/wqflask/base/GeneralObject.py
+++ b/wqflask/base/GeneralObject.py
@@ -28,7 +28,7 @@ class GeneralObject:
"""
Base class to define an Object.
a = [Spam(1, 4), Spam(9, 3), Spam(4,6)]
- a.sort(lambda x, y: cmp(x.eggs, y.eggs))
+ a.sort(key = lambda x: x.eggs)
"""
def __init__(self, *args, **kw):
diff --git a/wqflask/wqflask/marker_regression/display_mapping_results.py b/wqflask/wqflask/marker_regression/display_mapping_results.py
index 04d47624..6d6572ff 100644
--- a/wqflask/wqflask/marker_regression/display_mapping_results.py
+++ b/wqflask/wqflask/marker_regression/display_mapping_results.py
@@ -1460,7 +1460,7 @@ class DisplayMappingResults(object):
else:
continue
- smd.sort(lambda A, B: cmp(A.value, B.value))
+ smd.sort(key = lambda A: A.value)
smd.reverse()
samplelist = list(self.genotype.prgy)