diff options
| author | Claude Paroz <claude@2xlibre.net> | 2013-07-04 15:19:33 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-07-05 19:27:07 +0200 |
| commit | 7442eb1a242ecf9d186d4e7de1b94e360e04782d (patch) | |
| tree | 018a1fd5cf541393ae157dcf4a5ae1954616f633 /django | |
| parent | 577b0f91894469872974ad609b4fabca949cdc1b (diff) | |
Fixed #20224 -- Update docs examples which mention __unicode__
Thanks Marc Tamlyn and Tim Graham for the review.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/gis/management/commands/ogrinspect.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/utils/ogrinspect.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/django/contrib/gis/management/commands/ogrinspect.py b/django/contrib/gis/management/commands/ogrinspect.py index 44513e3463..2a29fe672a 100644 --- a/django/contrib/gis/management/commands/ogrinspect.py +++ b/django/contrib/gis/management/commands/ogrinspect.py @@ -53,7 +53,7 @@ class Command(LabelCommand): make_option('--multi-geom', action='store_true', dest='multi_geom', default=False, help='Treat the geometry in the data source as a geometry collection.'), make_option('--name-field', dest='name_field', - help='Specifies a field name to return for the `__unicode__` function.'), + help='Specifies a field name to return for the `__unicode__`/`__str__` function.'), make_option('--no-imports', action='store_false', dest='imports', default=True, help='Do not include `from django.contrib.gis.db import models` ' 'statement.'), diff --git a/django/contrib/gis/utils/ogrinspect.py b/django/contrib/gis/utils/ogrinspect.py index 08d3b40397..b7cfafd49d 100644 --- a/django/contrib/gis/utils/ogrinspect.py +++ b/django/contrib/gis/utils/ogrinspect.py @@ -89,7 +89,7 @@ def ogrinspect(*args, **kwargs): `multi_geom` => Boolean (default: False) - specify as multigeometry. `name_field` => String - specifies a field name to return for the - `__unicode__` function (which will be generated if specified). + `__unicode__`/`__str__` function (which will be generated if specified). `imports` => Boolean (default: True) - set to False to omit the `from django.contrib.gis.db import models` code from the @@ -221,4 +221,5 @@ def _ogrinspect(data_source, model_name, geom_name='geom', layer_key=0, srid=Non if name_field: yield '' - yield ' def __str__(self): return self.%s' % name_field + yield ' def __%s__(self): return self.%s' % ( + 'str' if six.PY3 else 'unicode', name_field) |