diff options
author | Lei Yan | 2013-06-25 21:50:53 +0000 |
---|---|---|
committer | Lei Yan | 2013-06-25 21:50:53 +0000 |
commit | 54ce9aec126d8d642755c709e0d6b3dc50a91d29 (patch) | |
tree | b3df8f299215e26fd95137367955d5dbe5d8868c /wqflask/base/trait.py | |
parent | 615b861dfd05c04df2e1a753dd135b07c1d88a94 (diff) | |
parent | a0a1d8b70e02871328fb044c7ae190f805b0a04e (diff) | |
download | genenetwork2-54ce9aec126d8d642755c709e0d6b3dc50a91d29.tar.gz |
Merge git://github.com/zsloan/genenetwork into flask
Diffstat (limited to 'wqflask/base/trait.py')
-rwxr-xr-x | wqflask/base/trait.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 3429d9c1..401b729c 100755 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -30,7 +30,7 @@ class GeneralTrait(object): def __init__(self, get_qtl_info=False, **kw): # xor assertion - assert bool(kw.get('dataset')) != bool(kw.get('dataset_name')), "Needs dataset ob. xor name"; + assert bool(kw.get('dataset')) != bool(kw.get('dataset_name')), "Needs dataset ob. or name"; if kw.get('dataset_name'): self.dataset = create_dataset(kw.get('dataset_name')) else: |