[GNUnet-SVN] [taler-bank] 01/01: Remove garbage gone through conflict resolution.

[gnunet]

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

marcello pushed a commit to branch master
in repository bank.

commit 4e54940b36a70f1aa4da83efcbbf19b53ac3f357
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Mar 29 18:53:44 2019 +0100

    Remove garbage gone through conflict resolution.
---
 talerbank/app/middleware.py | 3 +--
 talerbank/app/tests.py      | 1 -
 2 files changed, 1 insertion(+), 3 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/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