3.29.1

braintreeps · braintreeps · commit 7b85f42e920d · 2016-08-01T18:36:01.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 3.29.1
+* Improve error handling around server timeouts
+
 ## 3.29.0
 * Allow 'default_payment_method' option in Customer
 
diff --git a/braintree/resource_collection.py b/braintree/resource_collection.py
@@ -1,3 +1,6 @@
+import braintree
+from braintree.exceptions.unexpected_error import UnexpectedError
+
 class ResourceCollection(object):
     """
     A class representing results from a search. Supports the iterator protocol::
@@ -8,6 +11,8 @@ class ResourceCollection(object):
     """
 
     def __init__(self, query, results, method):
+        if "search_results" not in results:
+            raise UnexpectedError("Unprocessable entity due to an invalid request")
         self.__ids = results["search_results"]["ids"]
         self.__method = method
         self.__page_size = results["search_results"]["page_size"]
diff --git a/braintree/transaction.py b/braintree/transaction.py
@@ -507,7 +507,12 @@ def create_signature():
                             "points",
                             "currency_amount",
                             "currency_iso_code"
-                        ]
+                        ],
+                        "venmo_merchant_data": [
+                            "venmo_merchant_public_id",
+                            "originating_transaction_id",
+                            "originating_merchant_id"
+                        ],
                     },
                 ]
             },
diff --git a/braintree/version.py b/braintree/version.py
@@ -1 +1 @@
-Version = "3.29.0"
+Version = "3.29.1"
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from distutils.core import setup
 setup(
     name="braintree",
-    version="3.29.0",
+    version="3.29.1",
     description="Braintree Python Library",
     author="Braintree",
     author_email="support@braintreepayments.com",
diff --git a/tests/integration/test_sub_merchant_account.py b/tests/integration/test_sub_merchant_account.py
@@ -4,7 +4,9 @@
 
 class TestSubMerchantAccount(unittest.TestCase):
     def setUp(self):
-        raise SkipTest("The SubMerchantAccount API is not currently supported. Skipping this test for now.")
+        if skip_sub_merchant_account_tests():
+            raise SkipTest("The SubMerchantAccount API is not currently supported. Skipping this test for now.")
+
         self.old_merchant_id = Configuration.merchant_id
         self.old_public_key = Configuration.public_key
         self.old_private_key = Configuration.private_key
diff --git a/tests/integration/test_transaction.py b/tests/integration/test_transaction.py
@@ -220,6 +220,24 @@ def test_sale_with_vault_customer_and_credit_card_data_and_store_in_vault(self):
         self.assertEquals("411111******1111", transaction.credit_card_details.masked_number)
         self.assertEquals("411111******1111", transaction.vault_credit_card.masked_number)
 
+    def test_sale_with_venmo_merchant_data(self):
+        result = Transaction.sale({
+            "amount": Decimal(TransactionAmounts.Authorize),
+            "credit_card": {
+                "number": "4111111111111111",
+                "expiration_date": "05/2009"
+            },
+            "options": {
+                "venmo_merchant_data": {
+                    "venmo_merchant_public_id": "12345",
+                    "originating_transaction_id": "abc123",
+                    "originating_merchant_id": "xyz123",
+                }
+            }
+        })
+
+        self.assertTrue(result.is_success)
+
     def test_sale_with_custom_fields(self):
         result = Transaction.sale({
             "amount": TransactionAmounts.Authorize,
diff --git a/tests/test_helper.py b/tests/test_helper.py
@@ -16,6 +16,7 @@
 from datetime import date, datetime, timedelta
 from decimal import Decimal
 from random import randint
+from subprocess import Popen, PIPE
 
 from nose.tools import make_decorator
 from nose.tools import raises
@@ -61,6 +62,11 @@ def showwarning(message, category, filename, lineno, file=None, line=None):
     pass
 warnings.showwarning = showwarning
 
+def skip_sub_merchant_account_tests():
+    output, _ = Popen(["git", "rev-parse", "--abbrev-ref", "HEAD"], stdout=PIPE).communicate()
+    branch_supports_sub_merchant_accounts = bool(re.match(r"^marketplace_v2$|^btmkpl", output.strip(), re.IGNORECASE))
+    return not branch_supports_sub_merchant_accounts
+
 class TestHelper(object):
 
     default_merchant_account_id = "sandbox_credit_card"
diff --git a/tests/unit/test_resource_collection.py b/tests/unit/test_resource_collection.py
@@ -44,3 +44,8 @@ def test_ids_returns_array_of_ids(self):
          }
         collection = ResourceCollection("some_query", empty_collection_data, TestResourceCollection.TestResource.fetch)
         self.assertEqual(collection.ids, [])
+
+    @raises_with_regexp(UnexpectedError, "Unprocessable entity due to an invalid request")
+    def test_no_search_results(self):
+        bad_collection_data = { }
+        collection = ResourceCollection("some_query", bad_collection_data, TestResourceCollection.TestResource.fetch)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Version = "3.29.0"`
	`1`	`+Version = "3.29.1"`
Original file line number	Diff line number	Diff line change
`@@ -44,3 +44,8 @@ def test_ids_returns_array_of_ids(self):`
`44`	`44`	`}`
`45`	`45`	`collection = ResourceCollection("some_query", empty_collection_data, TestResourceCollection.TestResource.fetch)`
`46`	`46`	`self.assertEqual(collection.ids, [])`
	`47`	`+`
	`48`	`+ @raises_with_regexp(UnexpectedError, "Unprocessable entity due to an invalid request")`
	`49`	`+ def test_no_search_results(self):`
	`50`	`+ bad_collection_data = { }`
	`51`	`+ collection = ResourceCollection("some_query", bad_collection_data, TestResourceCollection.TestResource.fetch)`