[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Migrating from ' to ".

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant-frontends.

The following commit(s) were added to refs/heads/master by this push:
     new 028ceef  Migrating from ' to ".
028ceef is described below

commit 028ceefda2a2a0d76970bee31ae3f07c7f86c720
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Mar 3 12:59:07 2017 +0100

    Migrating from ' to ".
---
 talerfrontends/donations/donations.py | 43 +++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/talerfrontends/donations/donations.py 
b/talerfrontends/donations/donations.py
index 3d200b2..dfa10fb 100644
--- a/talerfrontends/donations/donations.py
+++ b/talerfrontends/donations/donations.py
@@ -56,17 +56,17 @@ def utility_processor():
     return dict(url=url)
 
 
address@hidden('/')
address@hidden("/")
 def index():
-    return flask.render_template('templates/index.html', 
merchant_currency=CURRENCY)
+    return flask.render_template("templates/index.html", 
merchant_currency=CURRENCY)
 
 
address@hidden('/javascript')
address@hidden("/javascript")
 def javascript_licensing():
-    return flask.render_template('templates/javascript.html')
+    return flask.render_template("templates/javascript.html")
 
 
address@hidden('/checkout', methods=["GET"])
address@hidden("/checkout", methods=["GET"])
 def checkout():
     amount_str = expect_parameter("donation_amount")
     donation_receiver = expect_parameter("donation_receiver")
@@ -76,18 +76,21 @@ def checkout():
         logger.warn("Invalid amount ('%s')", amount_str)
         e = flask.jsonify(error="invalid amount")
         return flask.make_response(e, 400)
-    return flask.render_template('templates/checkout.html',
+    return flask.render_template("templates/checkout.html",
             donation_amount=amount_str,
             donation_receiver=donation_receiver,
             merchant_currency=CURRENCY)
 
 
address@hidden('/generate-contract', methods=["GET"])
address@hidden("/generate-contract", methods=["GET"])
 def generate_contract():
     donation_receiver = expect_parameter("donation_receiver")
     donation_amount = expect_parameter("donation_amount")
     amount = amount_from_float(float(donation_amount))
-    order_id = 'donation-%s-%X-%s' % (donation_receiver, random.randint(0, 
0xFFFFFFFF), datetime.today().strftime('%H_%M_%S'))
+    order_id = "donation-%s-%X-%s" % \
+               (donation_receiver,
+               random.randint(0, 0xFFFFFFFF),
+               datetime.today().strftime('%H_%M_%S'))
     order = dict(
         nonce=flask.request.args.get("nonce"),
         amount=amount,
@@ -113,7 +116,7 @@ def generate_contract():
     r = requests.post(urljoin(BACKEND_URL, 'proposal'), json=dict(order=order))
     return flask.jsonify(r.json()), r.status_code
 
address@hidden('/donate')
address@hidden("/donate")
 def donate():
     donation_receiver = expect_parameter("donation_receiver")
     donation_amount = expect_parameter("donation_amount")
@@ -125,7 +128,7 @@ def donate():
     return response
 
 
address@hidden('/fulfillment')
address@hidden("/fulfillment")
 def fulfillment():
     order_id = expect_parameter("order_id")
     payed_order_ids = flask.session.get("payed_order_ids", [])
@@ -134,13 +137,13 @@ def fulfillment():
     if order_id in payed_order_ids:
         data = payed_order_ids[order_id]
         return flask.render_template(
-                'templates/fulfillment.html',
-                donation_receiver=data['donation_receiver'],
-                donation_amount=data['donation_amount'],
+                "templates/fulfillment.html",
+                donation_receiver=data["donation_receiver"],
+                donation_amount=data["donation_amount"],
                 order_id=order_id,
                 currency=CURRENCY)
         
-    response = 
flask.make_response(flask.render_template('templates/fallback.html'), 402)
+    response = 
flask.make_response(flask.render_template("templates/fallback.html"), 402)
     response.headers["X-Taler-Contract-Query"] = "fulfillment_url"
     response.headers["X-Taler-Pay-Url"] = make_url("/pay")
     response.headers["X-Taler-Offer-Url"] = make_url("/")
@@ -153,15 +156,15 @@ def pay():
     if deposit_permission is None:
         e = flask.jsonify(error="no json in body")
         return e, 400
-    r = requests.post(urljoin(BACKEND_URL, 'pay'), json=deposit_permission)
+    r = requests.post(urljoin(BACKEND_URL, "pay"), json=deposit_permission)
     if 200 != r.status_code:
         return flask.jsonify(r.json()), r.status_code
-    proposal_data = r.json()['proposal_data']
-    order_id = proposal_data['order_id']
+    proposal_data = r.json()["proposal_data"]
+    order_id = proposal_data["order_id"]
     payed_order_ids = flask.session["payed_order_ids"] = 
flask.session.get("payed_order_ids", {})
     payed_order_ids[order_id] = dict(
-        donation_receiver=proposal_data['merchant']['instance'],
-        donation_amount=amount_to_float(proposal_data['amount'])
+        donation_receiver=proposal_data["merchant"]["instance"],
+        donation_amount=amount_to_float(proposal_data["amount"])
     )
     print("received payment for", order_id)
     return flask.jsonify(r.json()), r.status_code
@@ -184,6 +187,6 @@ def history():
 def track_order():
     instance = expect_parameter("instance")
     order_id = expect_parameter("order_id")
-    url = urljoin(BACKEND_URL, 'track/transaction')
+    url = urljoin(BACKEND_URL, "track/transaction")
     r = requests.get(url, params=dict(order_id=order_id, instance=instance))
     return flask.jsonify(r.json()), r.status_code

-- 
To stop receiving notification emails like this one, please contact
address@hidden