Mirroring/vcrpy
1
0
Fork 0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-08 16:53:23 +00:00
Code Releases Activity

Fix deprecation warnings

Browse Source
This commit is contained in:
Luiz Menezes
2019-04-06 00:37:36 -03:00
parent 114fcd29b4
commit 1b474c0510
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/test_migration.py
View File

@@ -22,9 +22,9 @@ def test_try_migrate_with_yaml(tmpdir):
shutil.copy('tests/fixtures/migration/old_cassette.yaml', cassette) shutil.copy('tests/fixtures/migration/old_cassette.yaml', cassette)
assert vcr.migration.try_migrate(cassette) assert vcr.migration.try_migrate(cassette)
with open('tests/fixtures/migration/new_cassette.yaml', 'r') as f: with open('tests/fixtures/migration/new_cassette.yaml', 'r') as f:
expected_yaml = yaml.load(f) expected_yaml = yaml.load(f, Loader=yaml.FullLoader)
with open(cassette, 'r') as f: with open(cassette, 'r') as f:
actual_yaml = yaml.load(f) actual_yaml = yaml.load(f, Loader=yaml.FullLoader)
assert actual_yaml == expected_yaml assert actual_yaml == expected_yaml

10
vcr/config.py
View File

@@ -1,5 +1,4 @@
import copy import copy
import collections
import functools import functools
import inspect import inspect
import os import os
@@ -14,6 +13,11 @@ from .util import compose, auto_decorate
from . import matchers from . import matchers
from . import filters from . import filters
try:
from collections.abc import Iterable
except ImportError:
from collections import Iterable
class VCR(object): class VCR(object):
@@ -175,7 +179,7 @@ class VCR(object):
if decode_compressed_response: if decode_compressed_response:
filter_functions.append(filters.decode_response) filter_functions.append(filters.decode_response)
if before_record_response: if before_record_response:
if not isinstance(before_record_response, collections.Iterable): if not isinstance(before_record_response, Iterable):
before_record_response = (before_record_response,) before_record_response = (before_record_response,)
filter_functions.extend(before_record_response) filter_functions.extend(before_record_response)
@@ -241,7 +245,7 @@ class VCR(object):
filter_functions.append(self._build_ignore_hosts(hosts_to_ignore)) filter_functions.append(self._build_ignore_hosts(hosts_to_ignore))
if before_record_request: if before_record_request:
if not isinstance(before_record_request, collections.Iterable): if not isinstance(before_record_request, Iterable):
before_record_request = (before_record_request,) before_record_request = (before_record_request,)
filter_functions.extend(before_record_request) filter_functions.extend(before_record_request)