cope with unicode junk in the amount field (bug 724062)

Andy McKay · Andy McKay · commit 3a3e0951f6e3 · 2012-02-06T11:03:10.000-08:00
diff --git a/apps/paypal/__init__.py b/apps/paypal/__init__.py
@@ -92,7 +92,7 @@ def add_receivers(chains, email, amount, uuid, preapproval=False):
     """
     try:
         remainder = Decimal(str(amount))
-    except InvalidOperation, msg:
+    except (UnicodeEncodeError, InvalidOperation), msg:
         raise PaypalDataError(msg)
 
     result = {}
diff --git a/apps/paypal/tests/test.py b/apps/paypal/tests/test.py
@@ -219,6 +219,12 @@ def test_error_currency(self, _call):
         data['currency'] = 'xxx'
         self.assertRaises(paypal.CurrencyError, paypal.get_paykey, data)
 
+    def test_error_currency_junk(self):
+        for v in [u'\u30ec\u30b9', 'xysxdfsfd']:
+            self.assertRaises(paypal.PaypalDataError,
+                              paypal.add_receivers,
+                              [], 'f@foo.com', v, '')
+
 
 class TestPurchase(amo.tests.TestCase):
 
