From a6e969e446eb7b95fe37e0207541c9b12644e87e Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Thu, 26 Mar 2015 19:36:52 +0100 Subject: [PATCH] Finish python 2.6 support --- EMSL_api.py | 4 ++-- src/EMSL_local.py | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/EMSL_api.py b/EMSL_api.py index 32f1def..372d5ff 100755 --- a/EMSL_api.py +++ b/EMSL_api.py @@ -84,11 +84,11 @@ if __name__ == '__main__': if arguments["--average_mo_number"]: for name, des, avg in l: - des_str = "{:<50}".format(des) + des_str = "{0:<50}".format(des) print "- '{0}' ({1}) || {2}".format(name, avg, des_str) else: for name, des in l: - des_str = "{:<50}".format(des) + des_str = "{0:<50}".format(des) print "- '{0}' || {1}".format(name, des_str) # _ _ _ _____ _ _ diff --git a/src/EMSL_local.py b/src/EMSL_local.py index 2048451..032029e 100644 --- a/src/EMSL_local.py +++ b/src/EMSL_local.py @@ -68,7 +68,7 @@ def cond_sql_or(table_name, l_value, glob=False): opr = "GLOB" if glob else "=" - l_cmd = ['{} {} "{}"'.format(table_name, opr, val) for val in l_value] + l_cmd = ['{0} {1} "{2}"'.format(table_name, opr, val) for val in l_value] return "({0})".format(" OR ".join(l_cmd)) @@ -172,9 +172,8 @@ class EMSL_local(object): if average_mo_number: column_to_fech += ", data" - filter_where = " ({}) AND ({})".format( - cmd_filter_ele, - cmd_filter_basis) + filter_where = " ({0}) AND ({1})".format(cmd_filter_ele, + cmd_filter_basis) cmd = """SELECT DISTINCT {0} FROM output_tab @@ -192,7 +191,7 @@ class EMSL_local(object): # ~#~#~#~#~#~#~ # # If average_mo_number is asking - from collections import OrderedDict + from misc.collections import OrderedDict dict_info = OrderedDict() # Description : dict_info[name] = [description, nb_mo, nb_ele]