From 18e5898ec420d7e5b29e53c12abf475ca6ed829a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 20 Sep 2014 11:28:59 -0700 Subject: [PATCH] Return a tuple from the _request function on CassettePatcherBuilder even if import fails. Make _recursively_apply_get_cassette_subclass actually work with dictionaries. --- vcr/patch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcr/patch.py b/vcr/patch.py index a3672f4..74bb355 100644 --- a/vcr/patch.py +++ b/vcr/patch.py @@ -87,7 +87,7 @@ class CassettePatcherBuilder(object): def _recursively_apply_get_cassette_subclass(self, replacement_dict_or_obj): if isinstance(replacement_dict_or_obj, dict): - for key, replacement_obj in replacement_dict_or_obj: + for key, replacement_obj in replacement_dict_or_obj.items(): replacement_obj = self._recursively_apply_get_cassette_subclass( replacement_obj) replacement_dict_or_obj[key] = replacement_obj @@ -121,7 +121,7 @@ class CassettePatcherBuilder(object): try: import requests.packages.urllib3.connectionpool as cpool except ImportError: # pragma: no cover - return + return () from .stubs.requests_stubs import VCRRequestsHTTPConnection, VCRRequestsHTTPSConnection mock_triples = ( (cpool, 'VerifiedHTTPSConnection', VCRRequestsHTTPSConnection),