mirror of
https://github.com/boostorg/python.git
synced 2026-01-19 16:32:16 +00:00
refactor: switch to python 3
This commit is contained in:
committed by
Stefan Seefeld
parent
3e7be69e1e
commit
d30c1bb7a8
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
@@ -15,7 +15,7 @@ if (sys.version_info.major >= 3):
|
||||
class DtypeTestCase(unittest.TestCase):
|
||||
|
||||
def assertEquivalent(self, a, b):
|
||||
return self.assert_(dtype_ext.equivalent(a, b), "%r is not equivalent to %r")
|
||||
return self.assertTrue(dtype_ext.equivalent(a, b), "%r is not equivalent to %r")
|
||||
|
||||
def testIntegers(self):
|
||||
for bits in (8, 16, 32, 64):
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
@@ -19,7 +19,7 @@ class TestNdarray(unittest.TestCase):
|
||||
a1 = ndarray_ext.zeros(shape,dt)
|
||||
a2 = v.reshape(a1.shape)
|
||||
self.assertEqual(shape,a1.shape)
|
||||
self.assert_((a1 == a2).all())
|
||||
self.assertTrue((a1 == a2).all())
|
||||
|
||||
def testNdzeros_matrix(self):
|
||||
for dtp in (numpy.int16, numpy.int32, numpy.float32, numpy.complex128):
|
||||
@@ -28,7 +28,7 @@ class TestNdarray(unittest.TestCase):
|
||||
a1 = ndarray_ext.zeros_matrix(shape, dt)
|
||||
a2 = numpy.matrix(numpy.zeros(shape, dtype=dtp))
|
||||
self.assertEqual(shape,a1.shape)
|
||||
self.assert_((a1 == a2).all())
|
||||
self.assertTrue((a1 == a2).all())
|
||||
self.assertEqual(type(a1), type(a2))
|
||||
|
||||
def testNdarray(self):
|
||||
@@ -38,8 +38,8 @@ class TestNdarray(unittest.TestCase):
|
||||
dt = numpy.dtype(dtp)
|
||||
a1 = ndarray_ext.array(a)
|
||||
a2 = ndarray_ext.array(a,dt)
|
||||
self.assert_((a1 == v).all())
|
||||
self.assert_((a2 == v).all())
|
||||
self.assertTrue((a1 == v).all())
|
||||
self.assertTrue((a2 == v).all())
|
||||
for shape in ((60,),(6,10),(4,3,5),(2,2,3,5)):
|
||||
a1 = a1.reshape(shape)
|
||||
self.assertEqual(shape,a1.shape)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
@@ -18,7 +18,7 @@ class TestTemplates(unittest.TestCase):
|
||||
a1 = numpy.zeros(shape, dtype=dtype)
|
||||
a2 = v.reshape(a1.shape)
|
||||
templates_ext.fill(a1)
|
||||
self.assert_((a1 == a2).all())
|
||||
self.assertTrue((a1 == a2).all())
|
||||
a1 = numpy.zeros((12,), dtype=numpy.float64)
|
||||
self.assertRaises(TypeError, templates_ext.fill, a1)
|
||||
a1 = numpy.zeros((12,2,3), dtype=numpy.float32)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
@@ -24,7 +24,7 @@ class TestUnary(unittest.TestCase):
|
||||
assert_array_almost_equal(b, a*2.0)
|
||||
c = numpy.zeros(5, dtype=float)
|
||||
d = f(a,output=c)
|
||||
self.assert_(c is d)
|
||||
self.assertTrue(c is d)
|
||||
assert_array_almost_equal(d, a*2.0)
|
||||
|
||||
def testList(self):
|
||||
@@ -47,7 +47,7 @@ class TestBinary(unittest.TestCase):
|
||||
assert_array_almost_equal(f(a,b), (a*2+b*3))
|
||||
c = numpy.zeros(5, dtype=float)
|
||||
d = f(a,b,output=c)
|
||||
self.assert_(c is d)
|
||||
self.assertTrue(c is d)
|
||||
assert_array_almost_equal(d, a*2 + b*3)
|
||||
assert_array_almost_equal(f(a, 2.0), a*2 + 6.0)
|
||||
assert_array_almost_equal(f(1.0, b), 2.0 + b*3)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Copyright David Abrahams 2004. Distributed under the Boost
|
||||
# Software License, Version 1.0. (See accompanying
|
||||
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
from cltree import basic,symbol,constant,variable
|
||||
|
||||
|
||||
Reference in New Issue
Block a user