aboutsummaryrefslogtreecommitdiff
path: root/wqflask/maintenance
diff options
context:
space:
mode:
authorzsloan2018-04-16 22:23:19 +0000
committerzsloan2018-04-16 22:23:19 +0000
commit35913e15bb6ac93c429e9465ebc36215cc6350ea (patch)
treed0eaff3a15bb167d995f1459ee7e744697f137b3 /wqflask/maintenance
parent273b79a0c2096a2eae5ce9aa2800917437459f68 (diff)
parentf511e38a9b440d08313471cdcc7bfd99add98f70 (diff)
downloadgenenetwork2-35913e15bb6ac93c429e9465ebc36215cc6350ea.tar.gz
Resolved conflicts after pulling changes
Diffstat (limited to 'wqflask/maintenance')
-rw-r--r--wqflask/maintenance/gen_select_dataset.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/wqflask/maintenance/gen_select_dataset.py b/wqflask/maintenance/gen_select_dataset.py
index 16dcebc5..2825c6ea 100644
--- a/wqflask/maintenance/gen_select_dataset.py
+++ b/wqflask/maintenance/gen_select_dataset.py
@@ -63,10 +63,7 @@ from pprint import pformat as pf
#conn = Engine.connect()
-print('WARNING: This conversion is now OBSOLETE as the menu gets built from the database in Javascript using GN_SERVER instead!')
-
-
-def parse_db_uri():
+def parse_db_uri(db_uri):
"""Converts a database URI to the db name, host name, user name, and password"""
parsed_uri = urlparse.urlparse(SQL_URI)