mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 02:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refs #23919, #27778 -- Removed obsolete mentions of unicode.

Browse source
This commit is contained in:
Vytis Banaitis 2017-01-20 23:04:05 +02:00 • committed by Tim Graham
parent 888c1e9bfe
commit d1bab24e01
63 changed files with 201 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

12
docs/ref/contrib/gis/geos.txt
View file

@ -197,14 +197,14 @@ given ``geo_input`` argument, and then assumes the proper geometry subclass
The following input formats, along with their corresponding Python types,
are accepted:
======================= ======================
======================= ==========
Format Input Type
======================= ======================
WKT / EWKT ``str`` or ``unicode``
HEX / HEXEWKB ``str`` or ``unicode``
======================= ==========
WKT / EWKT ``str``
HEX / HEXEWKB ``str``
WKB / EWKB ``buffer``
GeoJSON ``str`` or ``unicode``
======================= ======================
GeoJSON ``str``
======================= ==========
.. classmethod:: GEOSGeometry.from_gml(gml_string)

12
docs/ref/contrib/syndication.txt
View file

@ -114,7 +114,7 @@ into those elements.
calling the methods ``item_title()`` and ``item_description()`` on
the :class:`~django.contrib.syndication.views.Feed` class. They are passed
a single parameter, ``item``, which is the object itself. These are
optional; by default, the unicode representation of the object is used for
optional; by default, the string representation of the object is used for
both.
If you want to do any special formatting for either the title or
@ -615,7 +615,7 @@ This example illustrates all possible attributes and methods for a
# ITEM TITLE AND DESCRIPTION -- If title_template or
# description_template are not defined, these are used instead. Both are
# optional, by default they will use the unicode representation of the
# optional, by default they will use the string representation of the
# item.
def item_title(self, item):
@ -940,8 +940,8 @@ They share this interface:
Any extra keyword arguments you pass to ``__init__`` will be stored in
``self.feed`` for use with `custom feed generators`_.
All parameters should be Unicode objects, except ``categories``, which
should be a sequence of Unicode objects. Beware that some control characters
All parameters should be strings, except ``categories``, which should be a
sequence of strings. Beware that some control characters
are `not allowed <http://www.w3.org/International/questions/qa-controls>`_
in XML documents. If your content has some of them, you might encounter a
:exc:`ValueError` when producing the feed.
@ -971,13 +971,13 @@ They share this interface:
Extra keyword arguments will be stored for `custom feed generators`_.
All parameters, if given, should be Unicode objects, except:
All parameters, if given, should be strings, except:
* ``pubdate`` should be a Python :class:`~datetime.datetime` object.
* ``updateddate`` should be a Python :class:`~datetime.datetime` object.
* ``enclosures`` should be a list of
:class:`django.utils.feedgenerator.Enclosure` instances.
* ``categories`` should be a sequence of Unicode objects.
* ``categories`` should be a sequence of strings.
:meth:`.SyndicationFeed.write`
Outputs the feed in the given encoding to outfile, which is a file-like object.