From 2697301045266b40f571eeb2f9c7d8eb220552b4 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Thu, 27 Aug 2020 01:28:08 +0300 Subject: Replace mysqldb's "escape" with the one from utils.db_tools Mysqldb's escape returns a binary string. Use utils.db_tools which adds an extra step of converting the binary string to a string. --- wqflask/base/mrna_assay_tissue_data.py | 2 +- wqflask/base/trait.py | 2 +- wqflask/wqflask/api/correlation.py | 2 +- wqflask/wqflask/correlation/show_corr_results.py | 2 +- wqflask/wqflask/do_search.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wqflask/base/mrna_assay_tissue_data.py b/wqflask/base/mrna_assay_tissue_data.py index 12f18f71..f1929518 100644 --- a/wqflask/base/mrna_assay_tissue_data.py +++ b/wqflask/base/mrna_assay_tissue_data.py @@ -5,7 +5,7 @@ from flask import g from utility import db_tools from utility import Bunch -from MySQLdb import escape_string as escape +from utility.db_tools import escape from utility.logger import getLogger diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 2fd5d725..e3507ae1 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -19,7 +19,7 @@ Redis = get_redis_conn() from wqflask import app import simplejson as json -from MySQLdb import escape_string as escape +from utility.db_tools import escape from pprint import pformat as pf from flask import Flask, g, request, url_for, redirect, make_response, render_template diff --git a/wqflask/wqflask/api/correlation.py b/wqflask/wqflask/api/correlation.py index 7da13121..f5b50dcd 100644 --- a/wqflask/wqflask/api/correlation.py +++ b/wqflask/wqflask/api/correlation.py @@ -2,7 +2,7 @@ import collections import scipy -from MySQLdb import escape_string as escape +from utility.db_tools import escape from flask import g diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py index e5b87c6a..91146e5b 100644 --- a/wqflask/wqflask/correlation/show_corr_results.py +++ b/wqflask/wqflask/correlation/show_corr_results.py @@ -35,7 +35,7 @@ from wqflask.correlation import correlation_functions from utility.benchmark import Bench import utility.webqtlUtil from utility.type_checking import is_str, get_float, get_int, get_string -from MySQLdb import escape_string as escape +from utility.db_tools import escape from flask import Flask, g diff --git a/wqflask/wqflask/do_search.py b/wqflask/wqflask/do_search.py index 7e71f7d7..00636563 100644 --- a/wqflask/wqflask/do_search.py +++ b/wqflask/wqflask/do_search.py @@ -4,7 +4,7 @@ import json from flask import Flask, g -from MySQLdb import escape_string as escape +from utility.db_tools import escape from pprint import pformat as pf import sys -- cgit v1.2.3