GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — bpo-38916: array.array: remove fromstring() and tostring() (GH-17487) · python/cpython@0131aba

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Doc
- library
  - array.rst
- whatsnew
  - 3.9.rst
Lib/test
- test_array.py
Misc/NEWS.d/next/Library
- 2019-12-06-18-47-56.bpo-38916.K-raU8.rst
Modules
- arraymodule.c
- clinic
  - arraymodule.c.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎Doc/library/array.rst‎`

Copy file name to clipboardExpand all lines: Doc/library/array.rst

-10Lines changed: 0 additions & 10 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -169,11 +169,6 @@ The following data items and methods are also supported:`
`169`	`169`	a.append(x)`` except that if there is a type error, the array is unchanged.
`170`	`170`
`171`	`171`
`172`		`-.. method:: array.fromstring()`
`173`		`-`
`174`		- Deprecated alias for :meth:`frombytes`.
`175`		`-`
`176`		`-`
`177`	`172`	`.. method:: array.fromunicode(s)`
`178`	`173`
`179`	`174`	`Extends this array with data from the given unicode string. The array must`
`@@ -231,11 +226,6 @@ The following data items and methods are also supported:`
`231`	`226`	`Convert the array to an ordinary list with the same items.`
`232`	`227`
`233`	`228`
`234`		`-.. method:: array.tostring()`
`235`		`-`
`236`		- Deprecated alias for :meth:`tobytes`.
`237`		`-`
`238`		`-`
`239`	`229`	`.. method:: array.tounicode()`
`240`	`230`
`241`	`231`	Convert the array to a unicode string. The array must be a type ``'u'`` array;

Collapse file

`‎Doc/whatsnew/3.9.rst‎`

Copy file name to clipboardExpand all lines: Doc/whatsnew/3.9.rst

+5Lines changed: 5 additions & 0 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,11 @@ Deprecated`
`279`	`279`	`Removed`
`280`	`280`	`=======`
`281`	`281`
	`282`	+* :class:`array.array`: ``tostring()`` and ``fromstring()`` methods have been
	`283`	+ removed. They were aliases to ``tobytes()`` and ``frombytes()``, deprecated
	`284`	`+ since Python 3.2.`
	`285`	+ (Contributed by Victor Stinner in :issue:`38916`.)
	`286`	`+`
`282`	`287`	* The abstract base classes in :mod:`collections.abc` no longer are
`283`	`288`	exposed in the regular :mod:`collections` module. This will help
`284`	`289`	`create a clearer distinction between the concrete classes and the abstract`

Collapse file

`‎Lib/test/test_array.py‎`

Copy file name to clipboardExpand all lines: Lib/test/test_array.py

-20Lines changed: 0 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -426,26 +426,6 @@ def test_tofromlist(self):`
`426`	`426`	`b.fromlist(a.tolist())`
`427`	`427`	`self.assertEqual(a, b)`
`428`	`428`
`429`		`- def test_tofromstring(self):`
`430`		`- # Warnings not raised when arguments are incorrect as Argument Clinic`
`431`		`- # handles that before the warning can be raised.`
`432`		`- nb_warnings = 2`
`433`		`- with warnings.catch_warnings(record=True) as r:`
`434`		`- warnings.filterwarnings("always",`
`435`		`- message=r"(to\|from)string\(\) is deprecated",`
`436`		`- category=DeprecationWarning)`
`437`		`- a = array.array(self.typecode, 2*self.example)`
`438`		`- b = array.array(self.typecode)`
`439`		`- self.assertRaises(TypeError, a.tostring, 42)`
`440`		`- self.assertRaises(TypeError, b.fromstring)`
`441`		`- self.assertRaises(TypeError, b.fromstring, 42)`
`442`		`- b.fromstring(a.tostring())`
`443`		`- self.assertEqual(a, b)`
`444`		`- if a.itemsize>1:`
`445`		`- self.assertRaises(ValueError, b.fromstring, "x")`
`446`		`- nb_warnings += 1`
`447`		`- self.assertEqual(len(r), nb_warnings)`
`448`		`-`
`449`	`429`	`def test_tofrombytes(self):`
`450`	`430`	`a = array.array(self.typecode, 2*self.example)`
`451`	`431`	`b = array.array(self.typecode)`

Collapse file

`‎Misc/NEWS.d/next/Library/2019-12-06-18-47-56.bpo-38916.K-raU8.rst‎`

Copy file name to clipboard

+3Lines changed: 3 additions & 0 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+:class:`array.array`: Remove ``tostring()`` and ``fromstring()`` methods.
	`2`	+They were aliases to ``tobytes()`` and ``frombytes()``, deprecated since
	`3`	`+Python 3.2.`

Collapse file

`‎Modules/arraymodule.c‎`

Copy file name to clipboardExpand all lines: Modules/arraymodule.c

-41Lines changed: 0 additions & 41 deletions

Original file line number	Diff line number	Diff line change
`@@ -1623,27 +1623,6 @@ frombytes(arrayobject self, Py_buffer buffer)`
`1623`	`1623`	`Py_RETURN_NONE;`
`1624`	`1624`	`}`
`1625`	`1625`
`1626`		`-/*[clinic input]`
`1627`		`-array.array.fromstring`
`1628`		`-`
`1629`		`- buffer: Py_buffer(accept={str, buffer})`
`1630`		`- /`
`1631`		`-`
`1632`		`-Appends items from the string, interpreting it as an array of machine values, as if it had been read from a file using the fromfile() method).`
`1633`		`-`
`1634`		`-This method is deprecated. Use frombytes instead.`
`1635`		`-[clinic start generated code]*/`
`1636`		`-`
`1637`		`-static PyObject *`
`1638`		`-array_array_fromstring_impl(arrayobject self, Py_buffer buffer)`
`1639`		`-/[clinic end generated code: output=31c4baa779df84ce input=a3341a512e11d773]/`
`1640`		`-{`
`1641`		`- if (PyErr_WarnEx(PyExc_DeprecationWarning,`
`1642`		`- "fromstring() is deprecated. Use frombytes() instead.", 2) != 0)`
`1643`		`- return NULL;`
`1644`		`- return frombytes(self, buffer);`
`1645`		`-}`
`1646`		`-`
`1647`	`1626`	`/*[clinic input]`
`1648`	`1627`	`array.array.frombytes`
`1649`	`1628`
`@@ -1678,24 +1657,6 @@ array_array_tobytes_impl(arrayobject *self)`
`1678`	`1657`	`}`
`1679`	`1658`	`}`
`1680`	`1659`
`1681`		`-/*[clinic input]`
`1682`		`-array.array.tostring`
`1683`		`-`
`1684`		`-Convert the array to an array of machine values and return the bytes representation.`
`1685`		`-`
`1686`		`-This method is deprecated. Use tobytes instead.`
`1687`		`-[clinic start generated code]*/`
`1688`		`-`
`1689`		`-static PyObject *`
`1690`		`-array_array_tostring_impl(arrayobject *self)`
`1691`		`-/[clinic end generated code: output=7d6bd92745a2c8f3 input=b6c0ddee7b30457e]/`
`1692`		`-{`
`1693`		`- if (PyErr_WarnEx(PyExc_DeprecationWarning,`
`1694`		`- "tostring() is deprecated. Use tobytes() instead.", 2) != 0)`
`1695`		`- return NULL;`
`1696`		`- return array_array_tobytes_impl(self);`
`1697`		`-}`
`1698`		`-`
`1699`	`1660`	`/*[clinic input]`
`1700`	`1661`	`array.array.fromunicode`
`1701`	`1662`
`@@ -2283,7 +2244,6 @@ static PyMethodDef array_methods[] = {`
`2283`	`2244`	`ARRAY_ARRAY_EXTEND_METHODDEF`
`2284`	`2245`	`ARRAY_ARRAY_FROMFILE_METHODDEF`
`2285`	`2246`	`ARRAY_ARRAY_FROMLIST_METHODDEF`
`2286`		`- ARRAY_ARRAY_FROMSTRING_METHODDEF`
`2287`	`2247`	`ARRAY_ARRAY_FROMBYTES_METHODDEF`
`2288`	`2248`	`ARRAY_ARRAY_FROMUNICODE_METHODDEF`
`2289`	`2249`	`ARRAY_ARRAY_INDEX_METHODDEF`
`@@ -2294,7 +2254,6 @@ static PyMethodDef array_methods[] = {`
`2294`	`2254`	`ARRAY_ARRAY_REVERSE_METHODDEF`
`2295`	`2255`	`ARRAY_ARRAY_TOFILE_METHODDEF`
`2296`	`2256`	`ARRAY_ARRAY_TOLIST_METHODDEF`
`2297`		`- ARRAY_ARRAY_TOSTRING_METHODDEF`
`2298`	`2257`	`ARRAY_ARRAY_TOBYTES_METHODDEF`
`2299`	`2258`	`ARRAY_ARRAY_TOUNICODE_METHODDEF`
`2300`	`2259`	`ARRAY_ARRAY___SIZEOF___METHODDEF`

Collapse file

`‎Modules/clinic/arraymodule.c.h‎`

Copy file name to clipboardExpand all lines: Modules/clinic/arraymodule.c.h

+1-69Lines changed: 1 addition & 69 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.