Merge branch 'master' into gui

This commit is contained in:
poka 2020-11-15 10:36:51 +01:00
commit ea05f308b0
1 changed files with 5 additions and 4 deletions

9
pay.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python3
import sys, re, os.path, json
import sys, re, os.path, json, ast
from shutil import copyfile
if not os.path.isfile("userEnv.py"):
copyfile("userEnv.py.template", "userEnv.py")
@ -58,8 +58,8 @@ def sendGenDoc(recipient, amount, comment):
txDoc = str(client.execute(queryBuild, variable_values=paramsBuild))[13:-3].replace('\\n','\n')
return txDoc
except Exception as e:
#e = json.dumps(str(e))
sys.stderr.write("Echec de la génération du document:\n" + str(e) + "\n")
message = ast.literal_eval(str(e))["message"]
sys.stderr.write("Echec de la génération du document:\n" + message + "\n")
sys.exit(1)
@ -116,7 +116,8 @@ def sendTXDoc(signedDoc):
client.execute(querySign, variable_values=paramsSign)
print(colored("Transaction effectué avec succès !", "green"))
except Exception as e:
sys.stderr.write("Echec de la transaction:\n" + str(e) + "\n")
message = ast.literal_eval(str(e))["message"]
sys.stderr.write("Echec de la transaction:\n" + message + "\n")
sys.exit(1)