diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2019-03-29 18:53:44 +0100 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2019-03-29 18:53:44 +0100 |
| commit | 4e54940b36a70f1aa4da83efcbbf19b53ac3f357 (patch) | |
| tree | ab3571496ce0e34cb5b072af80865d064307e28e /talerbank/app | |
| parent | 22ecff236a4a11169aae7dcb81f2bb675bfc8594 (diff) | |
| download | bank-4e54940b36a70f1aa4da83efcbbf19b53ac3f357.tar.gz bank-4e54940b36a70f1aa4da83efcbbf19b53ac3f357.tar.bz2 bank-4e54940b36a70f1aa4da83efcbbf19b53ac3f357.zip | |
Remove garbage gone through conflict resolution.
Diffstat (limited to 'talerbank/app')
| -rw-r--r-- | talerbank/app/middleware.py | 3 | ||||
| -rw-r--r-- | talerbank/app/tests.py | 1 |
2 files changed, 1 insertions, 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) |