[GNUnet-SVN] [taler-bank] branch master updated (8c2d25b -> 4e54940)

[gnunet]

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

marcello pushed a change to branch master
in repository bank.

    from 8c2d25b  #5546
     add 22ecff2  Hotfixing syntax problem.
     new 4e54940  Remove garbage gone through conflict resolution.

The 1 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:
 talerbank/app/middleware.py | 3 +--
 talerbank/app/models.py     | 2 --
 talerbank/app/tests.py      | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/talerbank/app/middleware.py b/talerbank/app/middleware.py
index a5888e2..f6f8c1e 100644
--- a/talerbank/app/middleware.py
+++ b/talerbank/app/middleware.py
@@ -7,7 +7,7 @@ from .views import \
      LoginFailed, RejectNoRightsException)
 from .schemas import \
     (URLParameterMissing, URLParameterMalformed,
-     JSONFieldException, UnknownCurrencyException)
+     JSONFieldException)
 from .amount import \
     (CurrencyMismatch, BadFormatAmount,
      NumberTooBig, NegativeNumber)
@@ -44,7 +44,6 @@ class ExceptionMiddleware:
             BadFormatAmount: 11,
             LoginFailed: 12,
             RejectNoRightsException: 13,
-            UnknownCurrencyException: 14,
             NumberTooBig: 1,
             NegativeNumber: 0}
 
diff --git a/talerbank/app/models.py b/talerbank/app/models.py
index 5b52883..369a84c 100644
--- a/talerbank/app/models.py
+++ b/talerbank/app/models.py
@@ -37,8 +37,6 @@ class InvalidAmount(Amount):
     def dump(self):
         return "Invalid Amount, please report"
 
-class AmountField(models.Field):
-
 ##
 # Helper function that instantiates a zero-valued @a Amount
 # object.
diff --git a/talerbank/app/tests.py b/talerbank/app/tests.py
index eff2387..3fbe170 100644
--- a/talerbank/app/tests.py
+++ b/talerbank/app/tests.py
@@ -560,7 +560,6 @@ class ParseAmountTestCase(TestCase):
         try:
             Amount.parse("Buggy")
         except BadFormatAmount as err:
-            self.assertEqual(err.hint, "Amount given was incorrect")
             return
         # make sure the control doesn't get here
         self.assertEqual(True, False)

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