LCPQ/EMSL_Basis_Set_Exchange_Local
10
0
Fork 0
mirror of https://github.com/LCPQ/EMSL_Basis_Set_Exchange_Local synced 2024-12-22 12:23:39 +01:00
Code Issues Releases Wiki Activity

Finish python 2.6 support

Browse Source
This commit is contained in:
Thomas Applencourt 2015-03-26 19:36:52 +01:00
parent f1ca1c2dfb
commit a6e969e446
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EMSL_api.py
View File

@ -84,11 +84,11 @@ if __name__ == '__main__':
if arguments["--average_mo_number"]: if arguments["--average_mo_number"]:
for name, des, avg in l: 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) print "- '{0}' ({1}) || {2}".format(name, avg, des_str)
else: else:
for name, des in l: for name, des in l:
des_str = "{:<50}".format(des) des_str = "{0:<50}".format(des)
print "- '{0}' || {1}".format(name, des_str) print "- '{0}' || {1}".format(name, des_str)
# _ _ _ _____ _ _ # _ _ _ _____ _ _

7
src/EMSL_local.py
View File

@ -68,7 +68,7 @@ def cond_sql_or(table_name, l_value, glob=False):
opr = "GLOB" if glob else "=" 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)) return "({0})".format(" OR ".join(l_cmd))
@ -172,8 +172,7 @@ class EMSL_local(object):
if average_mo_number: if average_mo_number:
column_to_fech += ", data" column_to_fech += ", data"
filter_where = " ({}) AND ({})".format( filter_where = " ({0}) AND ({1})".format(cmd_filter_ele,
cmd_filter_ele,
cmd_filter_basis) cmd_filter_basis)
cmd = """SELECT DISTINCT {0} cmd = """SELECT DISTINCT {0}
@ -192,7 +191,7 @@ class EMSL_local(object):
# ~#~#~#~#~#~#~ # # ~#~#~#~#~#~#~ #
# If average_mo_number is asking # If average_mo_number is asking
from collections import OrderedDict from misc.collections import OrderedDict
dict_info = OrderedDict() dict_info = OrderedDict()
# Description : dict_info[name] = [description, nb_mo, nb_ele] # Description : dict_info[name] = [description, nb_mo, nb_ele]