From 0107956102d914a68f157d80614f207f78dffb96 Mon Sep 17 00:00:00 2001 From: Julian Taylor Date: Thu, 13 Apr 2017 20:24:04 +0200 Subject: DOC: stop refering to 'S' dtype as string The S dtype is zero terminated bytes which happen to match what Python 2 called strings. As this is not the case in Python 3 we should stop naming it wrong in our documentation. [ci skip] --- doc/source/reference/arrays.scalars.rst | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'doc/source/reference/arrays.scalars.rst') diff --git a/doc/source/reference/arrays.scalars.rst b/doc/source/reference/arrays.scalars.rst index f76087ce2..9c4f05f75 100644 --- a/doc/source/reference/arrays.scalars.rst +++ b/doc/source/reference/arrays.scalars.rst @@ -71,7 +71,7 @@ Array scalar type Related Python type :class:`int_` :class:`IntType` (Python 2 only) :class:`float_` :class:`FloatType` :class:`complex_` :class:`ComplexType` -:class:`str_` :class:`StringType` +:class:`bytes_` :class:`BytesType` :class:`unicode_` :class:`UnicodeType` ==================== ================================ @@ -193,15 +193,17 @@ size: the data they describe can be of different length in different arrays. (In the character codes ``#`` is an integer denoting how many elements the data type consists of.) -=================== ============================= ======== -:class:`str_` compatible: Python str ``'S#'`` -:class:`unicode_` compatible: Python unicode ``'U#'`` -:class:`void` ``'V#'`` -=================== ============================= ======== +=================== ============================== ======== +:class:`bytes_` compatible: Python bytes ``'S#'`` +:class:`unicode_` compatible: Python unicode/str ``'U#'`` +:class:`void` ``'V#'`` +=================== ============================== ======== .. warning:: + See :ref:`Note on string types`. + Numeric Compatibility: If you used old typecode characters in your Numeric code (which was never recommended), you will need to change some of them to the new characters. In particular, the needed -- cgit v1.2.1