1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
--- a/collada/tests/test_source.py
+++ b/collada/tests/test_source.py
@@ -31,7 +31,7 @@ class TestSource(unittest.TestCase):
def test_idref_source_saving(self):
idrefsource = collada.source.IDRefSource("myidrefsource",
- numpy.array(['Ref1', 'Ref2'], dtype=numpy.string_),
+ numpy.array(['Ref1', 'Ref2'], dtype=numpy.str_),
('MORPH_TARGET',))
self.assertEqual(idrefsource.id, "myidrefsource")
self.assertEqual(len(idrefsource), 2)
@@ -39,7 +39,7 @@ class TestSource(unittest.TestCase):
self.assertIsNotNone(str(idrefsource))
idrefsource.id = "youridrefsource"
idrefsource.components = ('JOINT_TARGET', 'WHATEVER_TARGET')
- idrefsource.data = numpy.array(['Ref5', 'Ref6', 'Ref7', 'Ref8', 'Ref9', 'Ref10'], dtype=numpy.string_)
+ idrefsource.data = numpy.array(['Ref5', 'Ref6', 'Ref7', 'Ref8', 'Ref9', 'Ref10'], dtype=numpy.str_)
idrefsource.save()
loaded_idrefsource = collada.source.Source.load(self.dummy, {}, fromstring(tostring(idrefsource.xmlnode)))
self.assertTrue(isinstance(loaded_idrefsource, collada.source.IDRefSource))
@@ -49,7 +49,7 @@ class TestSource(unittest.TestCase):
def test_name_source_saving(self):
namesource = collada.source.NameSource("mynamesource",
- numpy.array(['Name1', 'Name2'], dtype=numpy.string_),
+ numpy.array(['Name1', 'Name2'], dtype=numpy.str_),
('JOINT',))
self.assertEqual(namesource.id, "mynamesource")
self.assertEqual(len(namesource), 2)
@@ -57,7 +57,7 @@ class TestSource(unittest.TestCase):
self.assertIsNotNone(str(namesource))
namesource.id = "yournamesource"
namesource.components = ('WEIGHT', 'WHATEVER')
- namesource.data = numpy.array(['Name1', 'Name2', 'Name3', 'Name4', 'Name5', 'Name6'], dtype=numpy.string_)
+ namesource.data = numpy.array(['Name1', 'Name2', 'Name3', 'Name4', 'Name5', 'Name6'], dtype=numpy.str_)
namesource.save()
loaded_namesource = collada.source.Source.load(self.dummy, {}, fromstring(tostring(namesource.xmlnode)))
self.assertTrue(isinstance(loaded_namesource, collada.source.NameSource))
--- a/collada/source.py
+++ b/collada/source.py
@@ -318,7 +318,7 @@ class IDRefSource(Source):
values = [v for v in arraynode.text.split()]
except ValueError:
raise DaeMalformedError('Corrupted IDREF array')
- data = numpy.array(values, dtype=numpy.unicode_)
+ data = numpy.array(values, dtype=numpy.str_)
paramnodes = node.findall('%s/%s/%s' % (collada.tag('technique_common'), collada.tag('accessor'), collada.tag('param')))
if not paramnodes:
raise DaeIncompleteError('No accessor info in source node')
@@ -425,7 +425,7 @@ class NameSource(Source):
values = [v for v in arraynode.text.split()]
except ValueError:
raise DaeMalformedError('Corrupted Name array')
- data = numpy.array(values, dtype=numpy.unicode_)
+ data = numpy.array(values, dtype=numpy.str_)
paramnodes = node.findall('%s/%s/%s' % (tag('technique_common'), tag('accessor'), tag
('param')))
if not paramnodes:
|
