2.23.1

braintreeps · braintreeps · commit d03f99abae3a · 2013-10-22T16:02:46.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.23.1
+* Add configuration option for custom HTTP strategies
+
 ## 2.23.0
 * Adds hold_in_escrow method
 * Add error codes for verification not supported error
diff --git a/braintree/configuration.py b/braintree/configuration.py
@@ -40,12 +40,13 @@ class Configuration(object):
 .. [1] `URL Fetch Python API Overview <https://developers.google.com/appengine/docs/python/urlfetch/overview>`_
     """
     @staticmethod
-    def configure(environment, merchant_id, public_key, private_key):
+    def configure(environment, merchant_id, public_key, private_key, http_strategy=None):
         Configuration.environment = environment
         Configuration.merchant_id = merchant_id
         Configuration.public_key = public_key
         Configuration.private_key = private_key
         Configuration.use_unsafe_ssl = False
+        Configuration.default_http_strategy = http_strategy
 
     @staticmethod
     def gateway():
@@ -54,22 +55,27 @@ def gateway():
     @staticmethod
     def instantiate():
         return Configuration(
-            Configuration.environment,
-            Configuration.merchant_id,
-            Configuration.public_key,
-            Configuration.private_key
+            environment=Configuration.environment,
+            merchant_id=Configuration.merchant_id,
+            public_key=Configuration.public_key,
+            private_key=Configuration.private_key,
+            http_strategy=Configuration.default_http_strategy
         )
 
     @staticmethod
     def api_version():
         return "3"
 
-    def __init__(self, environment, merchant_id, public_key, private_key):
+    def __init__(self, environment, merchant_id, public_key, private_key, http_strategy=None):
         self.environment = environment
         self.merchant_id = merchant_id
         self.public_key = public_key
         self.private_key = private_key
-        self._http_strategy = self.__determine_http_strategy()
+
+        if http_strategy:
+            self._http_strategy = http_strategy(self, self.environment)
+        else:
+            self._http_strategy = self.__determine_http_strategy()
 
     def base_merchant_path(self):
         return "/merchants/" + self.merchant_id
diff --git a/braintree/version.py b/braintree/version.py
@@ -1 +1 @@
-Version = "2.23.0"
+Version = "2.23.1"
diff --git a/tests/unit/test_configuration.py b/tests/unit/test_configuration.py
@@ -39,3 +39,13 @@ def test_overriding_http_strategy(self):
                 del(os.environ["PYTHON_HTTP_STRATEGY"])
             else:
                 os.environ["PYTHON_HTTP_STRATEGY"] = old_http_strategy
+
+    def test_configuring_with_an_http_strategy(self):
+        old_http_strategy = Configuration.default_http_strategy
+
+        try:
+            Configuration.default_http_strategy = braintree.util.http_strategy.httplib_strategy.HttplibStrategy
+            strategy = Configuration.instantiate().http_strategy()
+            self.assertTrue(isinstance(strategy, braintree.util.http_strategy.httplib_strategy.HttplibStrategy))
+        finally:
+            Configuration.default_http_strategy = old_http_strategy

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Version = "2.23.0"`
	`1`	`+Version = "2.23.1"`