diff options
| author | luz.paz <luzpaz@users.noreply.github.com> | 2018-08-01 12:55:53 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-08-01 16:09:22 -0400 |
| commit | 97e637a87fb45c4de970cca6cb783d93473c9d15 (patch) | |
| tree | f2bc4b9a102aa1277005ee469b6f7e390c925c8d /django | |
| parent | 4263cd0e095c55a1011e5bf0746d651126a8da5f (diff) | |
Fixed typos in comments and docs.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/auth/models.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/db/backends/postgis/operations.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/gdal/feature.py | 2 | ||||
| -rw-r--r-- | django/core/serializers/base.py | 2 | ||||
| -rw-r--r-- | django/db/migrations/operations/base.py | 2 | ||||
| -rw-r--r-- | django/db/models/sql/where.py | 2 | ||||
| -rw-r--r-- | django/template/base.py | 2 | ||||
| -rw-r--r-- | django/template/defaultfilters.py | 4 |
8 files changed, 9 insertions, 9 deletions
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py index c4ccf5b4ef..cc4f48861a 100644 --- a/django/contrib/auth/models.py +++ b/django/contrib/auth/models.py @@ -276,7 +276,7 @@ class PermissionsMixin(models.Model): def has_module_perms(self, app_label): """ Return True if the user has any permissions in the given app label. - Use simlar logic as has_perm(), above. + Use similar logic as has_perm(), above. """ # Active superusers have all permissions. if self.is_active and self.is_superuser: diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py index dd3fdb37b0..b6add9390a 100644 --- a/django/contrib/gis/db/backends/postgis/operations.py +++ b/django/contrib/gis/db/backends/postgis/operations.py @@ -31,7 +31,7 @@ class PostGISOperator(SpatialOperator): # geography type. self.geography = geography # Only a subset of the operators and functions are available for the - # raster type. Lookups that don't suport raster will be converted to + # raster type. Lookups that don't support raster will be converted to # polygons. If the raster argument is set to BILATERAL, then the # operator cannot handle mixed geom-raster lookups. self.raster = raster diff --git a/django/contrib/gis/gdal/feature.py b/django/contrib/gis/gdal/feature.py index db8c981312..a8aadbf883 100644 --- a/django/contrib/gis/gdal/feature.py +++ b/django/contrib/gis/gdal/feature.py @@ -94,7 +94,7 @@ class Feature(GDALBase): @property def geom_type(self): - "Return the OGR Geometry Type for this Feture." + "Return the OGR Geometry Type for this Feature." return OGRGeomType(capi.get_fd_geom_type(self._layer._ldefn)) # #### Feature Methods #### diff --git a/django/core/serializers/base.py b/django/core/serializers/base.py index 0d7946dc3f..624fc312bd 100644 --- a/django/core/serializers/base.py +++ b/django/core/serializers/base.py @@ -188,7 +188,7 @@ class Deserializer: return self def __next__(self): - """Iteration iterface -- return the next item in the stream""" + """Iteration interface -- return the next item in the stream""" raise NotImplementedError('subclasses of Deserializer must provide a __next__() method') diff --git a/django/db/migrations/operations/base.py b/django/db/migrations/operations/base.py index a29e5230c7..b2f4ddd7d4 100644 --- a/django/db/migrations/operations/base.py +++ b/django/db/migrations/operations/base.py @@ -103,7 +103,7 @@ class Operation: def allow_migrate_model(self, connection_alias, model): """ - Return wether or not a model may be migrated. + Return whether or not a model may be migrated. This is a thin wrapper around router.allow_migrate_model() that preemptively rejects any proxy, swapped out, or unmanaged model. diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py index d913abab2e..879de0474a 100644 --- a/django/db/models/sql/where.py +++ b/django/db/models/sql/where.py @@ -142,7 +142,7 @@ class WhereNode(tree.Node): def clone(self): """ Create a clone of the tree. Must only be called on root nodes (nodes - with empty subtree_parents). Childs must be either (Contraint, lookup, + with empty subtree_parents). Childs must be either (Constraint, lookup, value) tuples, or objects supporting .clone(). """ clone = self.__class__._new_instance( diff --git a/django/template/base.py b/django/template/base.py index f6a60ecdf7..9f4fe3363d 100644 --- a/django/template/base.py +++ b/django/template/base.py @@ -760,7 +760,7 @@ class Variable: # catching. Since this should only happen at compile time, that's # probably OK. - # Try to interpret values containg a period or an 'e'/'E' + # Try to interpret values containing a period or an 'e'/'E' # (possibly scientific notation) as a float; otherwise, try int. if '.' in var or 'e' in var.lower(): self.literal = float(var) diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index 53b9ade716..400ce7ceb5 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -222,8 +222,8 @@ def stringformat(value, arg): """ Format the variable according to the arg, a string formatting specifier. - This specifier uses Python string formating syntax, with the exception that - the leading "%" is dropped. + This specifier uses Python string formatting syntax, with the exception + that the leading "%" is dropped. See https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting for documentation of Python string formatting. |
