TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix pytest deprecation warnings

Browse Source
This commit is contained in:
rdb 2018-09-28 14:19:40 +02:00
parent fac82e6dca
commit cd9673ae9b
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/interrogate/test_property.py
View File

@ -2,7 +2,11 @@ import sys
import pytest import pytest
from panda3d import core from panda3d import core
from contextlib import contextmanager from contextlib import contextmanager
import collections
if sys.version_info >= (3, 3):
import collections.abc as collections_abc
else:
import _abcoll as collections_abc
@contextmanager @contextmanager
@ -52,7 +56,6 @@ def test_property2():
# The next tests are for MAKE_SEQ_PROPERTY. # The next tests are for MAKE_SEQ_PROPERTY.
@pytest.fixture
def seq_property(*items): def seq_property(*items):
""" Returns a sequence property initialized with the given items. """ """ Returns a sequence property initialized with the given items. """
@ -73,11 +76,11 @@ item_c = core.CollisionSphere((0, 0, 0), 3)
def test_seq_property_abc(): def test_seq_property_abc():
prop = seq_property() prop = seq_property()
assert isinstance(prop, collections.Container) assert isinstance(prop, collections_abc.Container)
assert isinstance(prop, collections.Sized) assert isinstance(prop, collections_abc.Sized)
assert isinstance(prop, collections.Iterable) assert isinstance(prop, collections_abc.Iterable)
assert isinstance(prop, collections.MutableSequence) assert isinstance(prop, collections_abc.MutableSequence)
assert isinstance(prop, collections.Sequence) assert isinstance(prop, collections_abc.Sequence)
def test_seq_property_empty(): def test_seq_property_empty():
@ -411,7 +414,6 @@ def test_seq_property_extend():
# The next tests are for MAKE_MAP_PROPERTY. # The next tests are for MAKE_MAP_PROPERTY.
@pytest.fixture
def map_property(**items): def map_property(**items):
""" Returns a mapping property initialized with the given values. """ """ Returns a mapping property initialized with the given values. """
@ -425,11 +427,11 @@ def map_property(**items):
def test_map_property_abc(): def test_map_property_abc():
prop = map_property() prop = map_property()
assert isinstance(prop, collections.Container) assert isinstance(prop, collections_abc.Container)
assert isinstance(prop, collections.Sized) assert isinstance(prop, collections_abc.Sized)
assert isinstance(prop, collections.Iterable) assert isinstance(prop, collections_abc.Iterable)
assert isinstance(prop, collections.MutableMapping) assert isinstance(prop, collections_abc.MutableMapping)
assert isinstance(prop, collections.Mapping) assert isinstance(prop, collections_abc.Mapping)
def test_map_property_empty(): def test_map_property_empty():
@ -607,19 +609,19 @@ def test_map_property_update():
def test_map_property_keys(): def test_map_property_keys():
prop = map_property(key='value', key2='value2') prop = map_property(key='value', key2='value2')
assert isinstance(prop.keys(), collections.MappingView) assert isinstance(prop.keys(), collections_abc.MappingView)
assert frozenset(prop.keys()) == frozenset(('key', 'key2')) assert frozenset(prop.keys()) == frozenset(('key', 'key2'))
def test_map_property_values(): def test_map_property_values():
prop = map_property(key='value', key2='value2') prop = map_property(key='value', key2='value2')
assert isinstance(prop.values(), collections.ValuesView) assert isinstance(prop.values(), collections_abc.ValuesView)
assert frozenset(prop.values()) == frozenset(('value', 'value2')) assert frozenset(prop.values()) == frozenset(('value', 'value2'))
def test_map_property_items(): def test_map_property_items():
prop = map_property(key='value', key2='value2') prop = map_property(key='value', key2='value2')
assert isinstance(prop.items(), collections.MappingView) assert isinstance(prop.items(), collections_abc.MappingView)
assert frozenset(prop.items()) == frozenset((('key', 'value'), ('key2', 'value2'))) assert frozenset(prop.items()) == frozenset((('key', 'value'), ('key2', 'value2')))