Commit58be8c9

authored

Merge pull request#28654 from charris/backport-28643

BUG: fix deepcopying StringDType arrays (#28643)

2 parentsbac7b36 +3c83161 commit58be8c9Copy full SHA for 58be8c9

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1605,7 +1605,7 @@ _deepcopy_call(char iptr, char optr, PyArray_Descr *dtype,`
`1605`	`1605`	`}`
`1606`	`1606`	`}`
`1607`	`1607`	`}`
`1608`		`-else {`
	`1608`	`+elseif (PyDataType_ISOBJECT(dtype)){`
`1609`	`1609`	`PyObjectitemp,otemp;`
`1610`	`1610`	`PyObject*res;`
`1611`	`1611`	`memcpy(&itemp,iptr,sizeof(itemp));`

Lines changed: 15 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`importconcurrent.futures`
	`2`	`+importcopy`
`2`	`3`	`importitertools`
`3`	`4`	`importos`
`4`		`-importpickle`
`5`	`5`	`importstring`
	`6`	`+importpickle`
`6`	`7`	`importsys`
`7`	`8`	`importtempfile`
`8`	`9`
`@@ -405,6 +406,13 @@ def test_pickle(dtype, string_list):`
`405`	`406`	`os.remove(f.name)`
`406`	`407`
`407`	`408`
	`409`	`+deftest_stdlib_copy(dtype,string_list):`
	`410`	`+arr=np.array(string_list,dtype=dtype)`
	`411`	`+`
	`412`	`+assert_array_equal(copy.copy(arr),arr)`
	`413`	`+assert_array_equal(copy.deepcopy(arr),arr)`
	`414`	`+`
	`415`	`+`
`408`	`416`	`@pytest.mark.parametrize(`
`409`	`417`	`"strings",`
`410`	`418`	`[`
`@@ -1728,12 +1736,12 @@ def test_zeros(self):`
`1728`	`1736`	`assert_array_equal(z,"")`
`1729`	`1737`
`1730`	`1738`	`deftest_copy(self):`
`1731`		`-c=self.a.copy()`
`1732`		`-assert_array_equal(self.get_flags(c),self.get_flags(self.a))`
`1733`		`-assert_array_equal(c,self.a)`
`1734`		`-offsets=self.get_view(c)['offset']`
`1735`		`-assertoffsets[2]==1`
`1736`		`-assertoffsets[3]==1+len(self.s_medium)+self.sizeofstr//2`
	`1739`	`+forcin [self.a.copy(),copy.copy(self.a),copy.deepcopy(self.a)]:`
	`1740`	`+assert_array_equal(self.get_flags(c),self.get_flags(self.a))`
	`1741`	`+assert_array_equal(c,self.a)`
	`1742`	`+offsets=self.get_view(c)['offset']`
	`1743`	`+assertoffsets[2]==1`
	`1744`	`+assertoffsets[3]==1+len(self.s_medium)+self.sizeofstr//2`
`1737`	`1745`
`1738`	`1746`	`deftest_arena_use_with_setting(self):`
`1739`	`1747`	`c=np.zeros_like(self.a)`

Comments

(0)