Use gn-libs code for db connection.

Use the code in gn-libs to connect to the database, rather than a
local module.

2 files changed, 4 insertions, 2 deletions

diff --git a/uploader/expression_data/dbinsert.py b/uploader/expression_data/dbinsert.py
index 32ca359..6d8ce80 100644
--- a/uploader/expression_data/dbinsert.py
+++ b/uploader/expression_data/dbinsert.py
@@ -7,16 +7,17 @@ from datetime import datetime
 
 from redis import Redis
 from MySQLdb.cursors import DictCursor
+from gn_libs.mysqldb import database_connection
 from flask import (
     flash, request, url_for, Blueprint, redirect, render_template,
     current_app as app)
 
 from uploader import jobs
 from uploader.authorisation import require_login
+from uploader.db_utils import with_db_connection
 from uploader.population.models import populations_by_species
 from uploader.species.models import all_species, species_by_id
 from uploader.platforms.models import platform_by_species_and_id
-from uploader.db_utils import with_db_connection, database_connection
 
 dbinsertbp = Blueprint("dbinsert", __name__)
 
diff --git a/uploader/expression_data/views.py b/uploader/expression_data/views.py
index bbe6538..7629f3e 100644
--- a/uploader/expression_data/views.py
+++ b/uploader/expression_data/views.py
@@ -8,6 +8,7 @@ from zipfile import ZipFile, is_zipfile
 import jsonpickle
 from redis import Redis
 from werkzeug.utils import secure_filename
+from gn_libs.mysqldb import database_connection
 from flask import (flash,
                    request,
                    url_for,
@@ -21,8 +22,8 @@ from uploader import jobs
 from uploader.datautils import order_by_family
 from uploader.ui import make_template_renderer
 from uploader.authorisation import require_login
+from uploader.db_utils import with_db_connection
 from uploader.species.models import all_species, species_by_id
-from uploader.db_utils import with_db_connection, database_connection
 from uploader.population.models import (populations_by_species,
                                         population_by_species_and_id)