Author: jezdez
Date: 2011-08-12 07:14:15 -0700 (Fri, 12 Aug 2011)
New Revision: 16598
Modified:
django/trunk/django/conf/global_settings.py
django/trunk/django/contrib/comments/views/comments.py
django/trunk/django/contrib/comments/views/moderation.py
django/trunk/django/contrib/formtools/wizard/views.py
django/trunk/django/contrib/gis/db/backends/postgis/operations.py
django/trunk/django/contrib/gis/db/backends/spatialite/operations.py
django/trunk/django/contrib/gis/gdal/envelope.py
django/trunk/django/contrib/gis/geos/prototypes/io.py
django/trunk/django/contrib/gis/maps/google/zoom.py
django/trunk/django/contrib/gis/tests/geoapp/tests.py
django/trunk/django/contrib/gis/tests/relatedapp/tests.py
django/trunk/django/contrib/localflavor/cz/forms.py
django/trunk/django/core/management/commands/syncdb.py
django/trunk/django/core/management/sql.py
django/trunk/django/db/models/deletion.py
django/trunk/django/forms/formsets.py
django/trunk/django/forms/models.py
django/trunk/django/http/__init__.py
django/trunk/django/middleware/gzip.py
django/trunk/django/test/_doctest.py
django/trunk/extras/csrf_migration_helper.py
django/trunk/tests/modeltests/lookup/tests.py
django/trunk/tests/modeltests/unmanaged_models/models.py
django/trunk/tests/regressiontests/admin_widgets/tests.py
django/trunk/tests/regressiontests/aggregation_regress/tests.py
django/trunk/tests/regressiontests/cache/tests.py
django/trunk/tests/regressiontests/generic_views/dates.py
django/trunk/tests/regressiontests/multiple_database/tests.py
Log:
Fixed #16584 -- Fixed a bunch of typos in code comments. Thanks, Bernhard Essl.
Modified: django/trunk/django/conf/global_settings.py
===================================================================
--- django/trunk/django/conf/global_settings.py 2011-08-12 08:43:52 UTC (rev
16597)
+++ django/trunk/django/conf/global_settings.py 2011-08-12 14:14:15 UTC (rev
16598)
@@ -13,7 +13,7 @@
TEMPLATE_DEBUG = False
# Whether the framework should propagate raw exceptions rather than catching
-# them. This is useful under some testing siutations and should never be used
+# them. This is useful under some testing situations and should never be used
# on a live site.
DEBUG_PROPAGATE_EXCEPTIONS = False
@@ -389,7 +389,7 @@
# Boolean that sets whether to add thousand separator when formatting numbers
USE_THOUSAND_SEPARATOR = False
-# Number of digits that will be together, when spliting them by
+# Number of digits that will be together, when splitting them by
# THOUSAND_SEPARATOR. 0 means no grouping, 3 means splitting by thousands...
NUMBER_GROUPING = 0
@@ -506,7 +506,7 @@
# MESSAGES #
############
-# Class to use as messges backend
+# Class to use as messages backend
MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'
# Default values of MESSAGE_LEVEL and MESSAGE_TAGS are defined within
Modified: django/trunk/django/contrib/comments/views/comments.py
===================================================================
--- django/trunk/django/contrib/comments/views/comments.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/django/contrib/comments/views/comments.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -87,7 +87,7 @@
# preview templates, so we have to preserve that format.
"comments/%s_%s_preview.html" % (model._meta.app_label,
model._meta.module_name),
"comments/%s_preview.html" % model._meta.app_label,
- # Now the usual directory based template heirarchy.
+ # Now the usual directory based template hierarchy.
"comments/%s/%s/preview.html" % (model._meta.app_label,
model._meta.module_name),
"comments/%s/preview.html" % model._meta.app_label,
"comments/preview.html",
Modified: django/trunk/django/contrib/comments/views/moderation.py
===================================================================
--- django/trunk/django/contrib/comments/views/moderation.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/django/contrib/comments/views/moderation.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -87,7 +87,7 @@
)
# The following functions actually perform the various flag/aprove/delete
-# actions. They've been broken out into seperate functions to that they
+# actions. They've been broken out into separate functions to that they
# may be called from admin actions.
def perform_flag(request, comment):
Modified: django/trunk/django/contrib/formtools/wizard/views.py
===================================================================
--- django/trunk/django/contrib/formtools/wizard/views.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/django/contrib/formtools/wizard/views.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -152,7 +152,7 @@
# if not, add the form with a zero based counter as unicode
init_form_list[unicode(i)] = form
- # walk through the ne created list of forms
+ # walk through the new created list of forms
for form in init_form_list.itervalues():
if issubclass(form, formsets.BaseFormSet):
# if the element is based on BaseFormSet (FormSet/ModelFormSet)
Modified: django/trunk/django/contrib/gis/db/backends/postgis/operations.py
===================================================================
--- django/trunk/django/contrib/gis/db/backends/postgis/operations.py
2011-08-12 08:43:52 UTC (rev 16597)
+++ django/trunk/django/contrib/gis/db/backends/postgis/operations.py
2011-08-12 14:14:15 UTC (rev 16598)
@@ -536,7 +536,7 @@
op = op(self.geom_func_prefix, value[1])
elif lookup_type in self.distance_functions and lookup_type !=
'dwithin':
if not field.geography and field.geodetic(self.connection):
- # Geodetic distances are only availble from Points to
+ # Geodetic distances are only available from Points to
# PointFields on PostGIS 1.4 and below.
if not self.connection.ops.geography:
if field.geom_type != 'POINT':
Modified: django/trunk/django/contrib/gis/db/backends/spatialite/operations.py
===================================================================
--- django/trunk/django/contrib/gis/db/backends/spatialite/operations.py
2011-08-12 08:43:52 UTC (rev 16597)
+++ django/trunk/django/contrib/gis/db/backends/spatialite/operations.py
2011-08-12 14:14:15 UTC (rev 16598)
@@ -90,7 +90,7 @@
'contains' : SpatiaLiteFunction('Contains'),
'intersects' : SpatiaLiteFunction('Intersects'),
'relate' : (SpatiaLiteRelate, basestring),
- # Retruns true if B's bounding box completely contains A's bounding
box.
+ # Returns true if B's bounding box completely contains A's bounding
box.
'contained' : SpatiaLiteFunction('MbrWithin'),
# Returns true if A's bounding box completely contains B's bounding
box.
'bbcontains' : SpatiaLiteFunction('MbrContains'),
Modified: django/trunk/django/contrib/gis/gdal/envelope.py
===================================================================
--- django/trunk/django/contrib/gis/gdal/envelope.py 2011-08-12 08:43:52 UTC
(rev 16597)
+++ django/trunk/django/contrib/gis/gdal/envelope.py 2011-08-12 14:14:15 UTC
(rev 16598)
@@ -50,7 +50,7 @@
else:
raise TypeError('Incorrect type of argument: %s' %
str(type(args[0])))
elif len(args) == 4:
- # Individiual parameters passed in.
+ # Individual parameters passed in.
# Thanks to ww for the help
self._from_sequence(map(float, args))
else:
@@ -125,7 +125,7 @@
# An x and an y parameter were passed in
return self.expand_to_include((args[0], args[1], args[0],
args[1]))
elif len(args) == 4:
- # Individiual parameters passed in.
+ # Individual parameters passed in.
return self.expand_to_include(args)
else:
raise OGRException('Incorrect number (%d) of arguments.' %
len(args[0]))
Modified: django/trunk/django/contrib/gis/geos/prototypes/io.py
===================================================================
--- django/trunk/django/contrib/gis/geos/prototypes/io.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/django/contrib/gis/geos/prototypes/io.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -207,7 +207,7 @@
thread_context = ThreadLocalIO()
# These module-level routines return the I/O object that is local to the
-# the thread. If the I/O object does not exist yet it will be initialized.
+# thread. If the I/O object does not exist yet it will be initialized.
def wkt_r():
if not thread_context.wkt_r:
thread_context.wkt_r = _WKTReader()
Modified: django/trunk/django/contrib/gis/maps/google/zoom.py
===================================================================
--- django/trunk/django/contrib/gis/maps/google/zoom.py 2011-08-12 08:43:52 UTC
(rev 16597)
+++ django/trunk/django/contrib/gis/maps/google/zoom.py 2011-08-12 14:14:15 UTC
(rev 16598)
@@ -41,7 +41,7 @@
# Getting the degrees and radians per pixel, and the 1/2 the
number of
# for every zoom level.
self._degpp.append(z / 360.) # degrees per pixel
- self._radpp.append(z / (2 * pi)) # radians per pixl
+ self._radpp.append(z / (2 * pi)) # radians per pixel
self._npix.append(z / 2) # number of pixels to center of tile
# Multiplying `z` by 2 for the next iteration.
Modified: django/trunk/django/contrib/gis/tests/geoapp/tests.py
===================================================================
--- django/trunk/django/contrib/gis/tests/geoapp/tests.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/django/contrib/gis/tests/geoapp/tests.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -671,7 +671,7 @@
'12.40500 43.94833,12.40889 43.95499,12.41580 43.95795)))')
sm = Country.objects.create(name='San Marino', mpoly=fromstr(wkt))
- # Because floating-point arithmitic isn't exact, we set a tolerance
+ # Because floating-point arithmetic isn't exact, we set a tolerance
# to pass into GEOS `equals_exact`.
tol = 0.000000001
Modified: django/trunk/django/contrib/gis/tests/relatedapp/tests.py
===================================================================
--- django/trunk/django/contrib/gis/tests/relatedapp/tests.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/django/contrib/gis/tests/relatedapp/tests.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -130,7 +130,7 @@
# Now creating a second Parcel where the borders are the same, just
# in different coordinate systems. The center points are also the
- # the same (but in different coordinate systems), and this time they
+ # same (but in different coordinate systems), and this time they
# actually correspond to the centroid of the border.
c1 = b1.centroid
c2 = c1.transform(2276, clone=True)
Modified: django/trunk/django/contrib/localflavor/cz/forms.py
===================================================================
--- django/trunk/django/contrib/localflavor/cz/forms.py 2011-08-12 08:43:52 UTC
(rev 16597)
+++ django/trunk/django/contrib/localflavor/cz/forms.py 2011-08-12 14:14:15 UTC
(rev 16598)
@@ -134,7 +134,7 @@
# remainder is equal:
# 0 or 10: last digit is 1
# 1: last digit is 0
- # in other case, last digin is 11 - remainder
+ # in other case, last digit is 11 - remainder
if (not remainder % 10 and check == 1) or \
(remainder == 1 and check == 0) or \
Modified: django/trunk/django/core/management/commands/syncdb.py
===================================================================
--- django/trunk/django/core/management/commands/syncdb.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/django/core/management/commands/syncdb.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -140,7 +140,7 @@
if verbosity >= 1:
print "Installing indexes ..."
- # Install SQL indicies for all newly created models
+ # Install SQL indices for all newly created models
for app_name, model_list in manifest.items():
for model in model_list:
if model in created_models:
Modified: django/trunk/django/core/management/sql.py
===================================================================
--- django/trunk/django/core/management/sql.py 2011-08-12 08:43:52 UTC (rev
16597)
+++ django/trunk/django/core/management/sql.py 2011-08-12 14:14:15 UTC (rev
16598)
@@ -11,7 +11,7 @@
if connection.settings_dict['ENGINE'] == 'django.db.backends.dummy':
# This must be the "dummy" database backend, which means the user
- # hasn't set ENGINE for the databse.
+ # hasn't set ENGINE for the database.
raise CommandError("Django doesn't know which syntax to use for your
SQL statements,\n" +
"because you haven't specified the ENGINE setting for the
database.\n" +
"Edit your settings file and change DATBASES['default']['ENGINE']
to something like\n" +
Modified: django/trunk/django/db/models/deletion.py
===================================================================
--- django/trunk/django/db/models/deletion.py 2011-08-12 08:43:52 UTC (rev
16597)
+++ django/trunk/django/db/models/deletion.py 2011-08-12 14:14:15 UTC (rev
16598)
@@ -217,7 +217,7 @@
self.data[model] = sorted(instances, key=attrgetter("pk"))
# if possible, bring the models in an order suitable for databases that
- # don't support transactions or cannot defer contraint checks until the
+ # don't support transactions or cannot defer constraint checks until
the
# end of a transaction.
self.sort()
Modified: django/trunk/django/forms/formsets.py
===================================================================
--- django/trunk/django/forms/formsets.py 2011-08-12 08:43:52 UTC (rev
16597)
+++ django/trunk/django/forms/formsets.py 2011-08-12 14:14:15 UTC (rev
16598)
@@ -213,7 +213,7 @@
return (1, 0) # +infinity, larger than any number
return (0, k[1])
self._ordering.sort(key=compare_ordering_key)
- # Return a list of form.cleaned_data dicts in the order spcified by
+ # Return a list of form.cleaned_data dicts in the order specified by
# the form data.
return [self.forms[i[0]] for i in self._ordering]
ordered_forms = property(_get_ordered_forms)
Modified: django/trunk/django/forms/models.py
===================================================================
--- django/trunk/django/forms/models.py 2011-08-12 08:43:52 UTC (rev 16597)
+++ django/trunk/django/forms/models.py 2011-08-12 14:14:15 UTC (rev 16598)
@@ -117,7 +117,7 @@
if exclude and f.name in exclude:
continue
if isinstance(f, ManyToManyField):
- # If the object doesn't have a primry key yet, just use an empty
+ # If the object doesn't have a primary key yet, just use an empty
# list for its m2m fields. Calling f.value_from_object will raise
# an exception.
if instance.pk is None:
@@ -288,7 +288,7 @@
# Exclude empty fields that are not required by the form, if the
# underlying model field is required. This keeps the model field
# from raising a required error. Note: don't exclude the field from
- # validaton if the model field allows blanks. If it does, the blank
+ # validation if the model field allows blanks. If it does, the
blank
# value may be included in a unique check, so cannot be excluded
# from validation.
else:
Modified: django/trunk/django/http/__init__.py
===================================================================
--- django/trunk/django/http/__init__.py 2011-08-12 08:43:52 UTC (rev
16597)
+++ django/trunk/django/http/__init__.py 2011-08-12 14:14:15 UTC (rev
16598)
@@ -282,7 +282,7 @@
def _get_upload_handlers(self):
if not self._upload_handlers:
- # If thre are no upload handlers defined, initialize them from
settings.
+ # If there are no upload handlers defined, initialize them from
settings.
self._initialize_handlers()
return self._upload_handlers
Modified: django/trunk/django/middleware/gzip.py
===================================================================
--- django/trunk/django/middleware/gzip.py 2011-08-12 08:43:52 UTC (rev
16597)
+++ django/trunk/django/middleware/gzip.py 2011-08-12 14:14:15 UTC (rev
16598)
@@ -22,7 +22,7 @@
if response.has_header('Content-Encoding'):
return response
- # MSIE have issues with gzipped respones of various content types.
+ # MSIE have issues with gzipped response of various content types.
if "msie" in request.META.get('HTTP_USER_AGENT', '').lower():
ctype = response.get('Content-Type', '').lower()
if not ctype.startswith("text/") or "javascript" in ctype:
Modified: django/trunk/django/test/_doctest.py
===================================================================
--- django/trunk/django/test/_doctest.py 2011-08-12 08:43:52 UTC (rev
16597)
+++ django/trunk/django/test/_doctest.py 2011-08-12 14:14:15 UTC (rev
16598)
@@ -552,7 +552,7 @@
^ (?P<msg> \w+ .*) # a line *starts* with alphanum.
""", re.VERBOSE | re.MULTILINE | re.DOTALL)
- # A callable returning a true value iff its argument is a blank line
+ # A callable returning a true value if its argument is a blank line
# or contains a single comment.
_IS_BLANK_OR_COMMENT = re.compile(r'^[ ]*(#.*)?$').match
Modified: django/trunk/extras/csrf_migration_helper.py
===================================================================
--- django/trunk/extras/csrf_migration_helper.py 2011-08-12 08:43:52 UTC
(rev 16597)
+++ django/trunk/extras/csrf_migration_helper.py 2011-08-12 14:14:15 UTC
(rev 16598)
@@ -43,7 +43,7 @@
#
# - It's impossible to programmatically determine which forms should and should
# not have the token added. The developer must decide when to do this,
-# ensuring that the token is only added to internally targetted forms.
+# ensuring that the token is only added to internally targeted forms.
#
# - It's impossible to programmatically work out when a template is used. The
# attempts to trace back to view functions are guesses, and could easily fail
Modified: django/trunk/tests/modeltests/lookup/tests.py
===================================================================
--- django/trunk/tests/modeltests/lookup/tests.py 2011-08-12 08:43:52 UTC
(rev 16597)
+++ django/trunk/tests/modeltests/lookup/tests.py 2011-08-12 14:14:15 UTC
(rev 16598)
@@ -251,7 +251,7 @@
def test_values_list(self):
# values_list() is similar to values(), except that the results are
# returned as a list of tuples, rather than a list of dictionaries.
- # Within each tuple, the order of the elemnts is the same as the order
+ # Within each tuple, the order of the elements is the same as the order
# of fields in the values_list() call.
identity = lambda x:x
self.assertQuerysetEqual(Article.objects.values_list('headline'),
Modified: django/trunk/tests/modeltests/unmanaged_models/models.py
===================================================================
--- django/trunk/tests/modeltests/unmanaged_models/models.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/tests/modeltests/unmanaged_models/models.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -5,7 +5,7 @@
from django.db import models
-# All of these models are creatd in the database by Django.
+# All of these models are created in the database by Django.
class A01(models.Model):
f_a = models.CharField(max_length=10, db_index=True)
Modified: django/trunk/tests/regressiontests/admin_widgets/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_widgets/tests.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/tests/regressiontests/admin_widgets/tests.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -274,7 +274,7 @@
)
def test_fk_related_model_not_in_admin(self):
- # FK to a model not registered with admin site. Raw ID widget shoud
+ # FK to a model not registered with admin site. Raw ID widget should
# have no magnifying glass link. See #16542
big_honeycomb = models.Honeycomb.objects.create(location='Old tree')
big_honeycomb.bee_set.create()
@@ -287,7 +287,7 @@
)
def test_fk_to_self_model_not_in_admin(self):
- # FK to self, not registered with admin site. Raw ID widget shoud have
+ # FK to self, not registered with admin site. Raw ID widget should have
# no magnifying glass link. See #16542
subject1 = models.Individual.objects.create(name='Subject #1')
models.Individual.objects.create(name='Child', parent=subject1)
@@ -345,7 +345,7 @@
def test_m2m_related_model_not_in_admin(self):
# M2M relationship with model not registered with admin site. Raw ID
- # widget shoud have no magnifying glass link. See #16542
+ # widget should have no magnifying glass link. See #16542
consultor1 = models.Advisor.objects.create(name='Rockstar Techie')
c1 = models.Company.objects.create(name='Doodle')
Modified: django/trunk/tests/regressiontests/aggregation_regress/tests.py
===================================================================
--- django/trunk/tests/regressiontests/aggregation_regress/tests.py
2011-08-12 08:43:52 UTC (rev 16597)
+++ django/trunk/tests/regressiontests/aggregation_regress/tests.py
2011-08-12 14:14:15 UTC (rev 16598)
@@ -644,7 +644,7 @@
)
# Regression for #10766 - Shouldn't be able to reference an aggregate
- # fields in an an aggregate() call.
+ # fields in an aggregate() call.
self.assertRaises(
FieldError,
lambda:
Book.objects.annotate(mean_age=Avg('authors__age')).annotate(Avg('mean_age'))
Modified: django/trunk/tests/regressiontests/cache/tests.py
===================================================================
--- django/trunk/tests/regressiontests/cache/tests.py 2011-08-12 08:43:52 UTC
(rev 16597)
+++ django/trunk/tests/regressiontests/cache/tests.py 2011-08-12 14:14:15 UTC
(rev 16598)
@@ -220,7 +220,7 @@
self.assertEqual(self.cache.has_key("goodbye1"), False)
def test_in(self):
- # The in operator can be used to inspet cache contents
+ # The in operator can be used to inspect cache contents
self.cache.set("hello2", "goodbye2")
self.assertEqual("hello2" in self.cache, True)
self.assertEqual("goodbye2" in self.cache, False)
@@ -338,7 +338,7 @@
self.assertEqual(self.cache.get(key), value)
def test_binary_string(self):
- # Binary strings should be cachable
+ # Binary strings should be cacheable
from zlib import compress, decompress
value = 'value_to_be_compressed'
compressed_value = compress(value)
Modified: django/trunk/tests/regressiontests/generic_views/dates.py
===================================================================
--- django/trunk/tests/regressiontests/generic_views/dates.py 2011-08-12
08:43:52 UTC (rev 16597)
+++ django/trunk/tests/regressiontests/generic_views/dates.py 2011-08-12
14:14:15 UTC (rev 16598)
@@ -339,7 +339,7 @@
self.assertEqual(list(res.context['book_list']), [b])
self.assertEqual(res.context['day'], future)
- # allow_future but not allow_empty, next/prev amust be valid
+ # allow_future but not allow_empty, next/prev must be valid
self.assertEqual(res.context['next_day'], None)
self.assertEqual(res.context['previous_day'], datetime.date(2008, 10,
1))
Modified: django/trunk/tests/regressiontests/multiple_database/tests.py
===================================================================
--- django/trunk/tests/regressiontests/multiple_database/tests.py
2011-08-12 08:43:52 UTC (rev 16597)
+++ django/trunk/tests/regressiontests/multiple_database/tests.py
2011-08-12 14:14:15 UTC (rev 16598)
@@ -1085,7 +1085,7 @@
self.assertEqual(list(pro.authors.values_list('name', flat=True)),
[u'Marty Alchin'])
self.assertEqual(pro.editor.name, u'Marty Alchin')
- # get_or_create is a special case. The get needs to be targetted at
+ # get_or_create is a special case. The get needs to be targeted at
# the write database in order to avoid potential transaction
# consistency problems
book, created = Book.objects.get_or_create(title="Pro Django")
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
