gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-merchant-frontend-examples] branch master updated (c


From: gnunet
Subject: [GNUnet-SVN] [taler-merchant-frontend-examples] branch master updated (c628e37 -> 250b9cb)
Date: Tue, 21 Feb 2017 17:04:57 +0100

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

marcello pushed a change to branch master
in repository merchant-frontend-examples.

    from c628e37  Fix fraction conversion
     new 13a3397  Fix fraction conversion
     new 250b9cb  forcing pytaler installation

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Python/lib/Makefile           | 2 +-
 Python/lib/pytaler/amounts.py | 2 +-
 Python/tutorial/tutorial.py   | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Python/lib/Makefile b/Python/lib/Makefile
index 26cdbc4..cf3cacc 100644
--- a/Python/lib/Makefile
+++ b/Python/lib/Makefile
@@ -1,5 +1,5 @@
 install:
-       pip3 install . --install-option="--prefix=$(TALER_PREFIX)"
+       pip3 install . --install-option="--prefix=$(TALER_PREFIX)" --upgrade
 
 check:
        python3 pytaler/tests.py
diff --git a/Python/lib/pytaler/amounts.py b/Python/lib/pytaler/amounts.py
index 0e7bbfe..e15e623 100644
--- a/Python/lib/pytaler/amounts.py
+++ b/Python/lib/pytaler/amounts.py
@@ -30,7 +30,7 @@ def string_to_amount(fmt):
     split = num.split(".")
     value = int(split[0])
     fraction = float("0." + split[1]) * FRACTION
-    return dict(value=value, fraction=fraction, currency=currency)
+    return dict(value=value, fraction=int(fraction), currency=currency)
 
 
 def amount_sum(a1, a2):
diff --git a/Python/tutorial/tutorial.py b/Python/tutorial/tutorial.py
index be966bd..7d6bbff 100644
--- a/Python/tutorial/tutorial.py
+++ b/Python/tutorial/tutorial.py
@@ -4,10 +4,14 @@ from urllib.parse import urljoin, urlencode
 from pytaler import amounts
 import base64
 import os
+import logging
+import json
 
 
 app = flask.Flask(__name__)
 app.secret_key = base64.b64encode(os.urandom(64)).decode('utf-8')
+logger = logging.getLogger(__name__)
+
 CURRENCY = "PUDOS"
 BACKEND_URL = "http://backend.test.taler.net/";
 

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]