Fixed a number of minor misspellings.

This commit is contained in:
Julien Phalip 2013-07-27 18:45:25 -07:00
parent ca39c0a6be
commit 47c755327b
28 changed files with 31 additions and 31 deletions

View File

@ -87,7 +87,7 @@ class SimpleListFilter(ListFilter):
def lookups(self, request, model_admin): def lookups(self, request, model_admin):
""" """
Must be overriden to return a list of tuples (value, verbose value) Must be overridden to return a list of tuples (value, verbose value)
""" """
raise NotImplementedError raise NotImplementedError

View File

@ -17,7 +17,7 @@ from django.contrib.formtools.wizard.forms import ManagementForm
def normalize_name(name): def normalize_name(name):
""" """
Converts camel-case style names into underscore seperated words. Example:: Converts camel-case style names into underscore separated words. Example::
>>> normalize_name('oneTwoThree') >>> normalize_name('oneTwoThree')
'one_two_three' 'one_two_three'

View File

@ -14,7 +14,7 @@ class GeoIPRecord(Structure):
('longitude', c_float), ('longitude', c_float),
# TODO: In 1.4.6 this changed from `int dma_code;` to # TODO: In 1.4.6 this changed from `int dma_code;` to
# `union {int metro_code; int dma_code;};`. Change # `union {int metro_code; int dma_code;};`. Change
# to a `ctypes.Union` in to accomodate in future when # to a `ctypes.Union` in to accommodate in future when
# pre-1.4.6 versions are no longer distributed. # pre-1.4.6 versions are no longer distributed.
('dma_code', c_int), ('dma_code', c_int),
('area_code', c_int), ('area_code', c_int),

View File

@ -146,7 +146,7 @@ def call_command(name, *args, **options):
# Grab out a list of defaults from the options. optparse does this for us # Grab out a list of defaults from the options. optparse does this for us
# when the script runs from the command line, but since call_command can # when the script runs from the command line, but since call_command can
# be called programatically, we need to simulate the loading and handling # be called programmatically, we need to simulate the loading and handling
# of defaults (see #10080 for details). # of defaults (see #10080 for details).
defaults = {} defaults = {}
for opt in klass.option_list: for opt in klass.option_list:

View File

@ -22,7 +22,7 @@ class Command(BaseCommand):
make_option('-a', '--all', action='store_true', dest='use_base_manager', default=False, make_option('-a', '--all', action='store_true', dest='use_base_manager', default=False,
help="Use Django's base manager to dump all models stored in the database, including those that would otherwise be filtered or modified by a custom manager."), help="Use Django's base manager to dump all models stored in the database, including those that would otherwise be filtered or modified by a custom manager."),
make_option('--pks', dest='primary_keys', help="Only dump objects with " make_option('--pks', dest='primary_keys', help="Only dump objects with "
"given primary keys. Accepts a comma seperated list of keys. " "given primary keys. Accepts a comma separated list of keys. "
"This option will only work when you specify one model."), "This option will only work when you specify one model."),
) )
help = ("Output the contents of the database as a fixture of the given " help = ("Output the contents of the database as a fixture of the given "

View File

@ -25,7 +25,7 @@ class SQLCompiler(compiler.SQLCompiler):
def as_sql(self, with_limits=True, with_col_aliases=False): def as_sql(self, with_limits=True, with_col_aliases=False):
""" """
Creates the SQL for this query. Returns the SQL string and list Creates the SQL for this query. Returns the SQL string and list
of parameters. This is overriden from the original Query class of parameters. This is overridden from the original Query class
to handle the additional SQL Oracle requires to emulate LIMIT to handle the additional SQL Oracle requires to emulate LIMIT
and OFFSET. and OFFSET.

View File

@ -335,7 +335,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
if 'check_same_thread' in kwargs and kwargs['check_same_thread']: if 'check_same_thread' in kwargs and kwargs['check_same_thread']:
warnings.warn( warnings.warn(
'The `check_same_thread` option was provided and set to ' 'The `check_same_thread` option was provided and set to '
'True. It will be overriden with False. Use the ' 'True. It will be overridden with False. Use the '
'`DatabaseWrapper.allow_thread_sharing` property instead ' '`DatabaseWrapper.allow_thread_sharing` property instead '
'for controlling thread shareability.', 'for controlling thread shareability.',
RuntimeWarning RuntimeWarning

View File

@ -90,7 +90,7 @@ class Field(object):
'already exists.'), 'already exists.'),
} }
# Generic field type description, usually overriden by subclasses # Generic field type description, usually overridden by subclasses
def _description(self): def _description(self):
return _('Field of type: %(field_type)s') % { return _('Field of type: %(field_type)s') % {
'field_type': self.__class__.__name__ 'field_type': self.__class__.__name__

View File

@ -142,7 +142,7 @@ database tables already will have been created.
If you require data for a test case, you should add it using If you require data for a test case, you should add it using
either a :ref:`test fixture <topics-testing-fixtures>`, or either a :ref:`test fixture <topics-testing-fixtures>`, or
programatically add it during the ``setUp()`` of your test case. programmatically add it during the ``setUp()`` of your test case.
Database-backend-specific SQL data Database-backend-specific SQL data
---------------------------------- ----------------------------------

View File

@ -271,7 +271,7 @@ Making actions available site-wide
This makes the `export_selected_objects` action globally available as an This makes the `export_selected_objects` action globally available as an
action named `"export_selected_objects"`. You can explicitly give the action action named `"export_selected_objects"`. You can explicitly give the action
a name -- good if you later want to programatically :ref:`remove the action a name -- good if you later want to programmatically :ref:`remove the action
<disabling-admin-actions>` -- by passing a second argument to <disabling-admin-actions>` -- by passing a second argument to
:meth:`AdminSite.add_action()`:: :meth:`AdminSite.add_action()`::

View File

@ -226,7 +226,7 @@ CachedStaticFilesStorage
would be replaced by calling the would be replaced by calling the
:meth:`~django.core.files.storage.Storage.url` :meth:`~django.core.files.storage.Storage.url`
method of the ``CachedStaticFilesStorage`` storage backend, ultimatively method of the ``CachedStaticFilesStorage`` storage backend, ultimately
saving a ``'css/styles.55e7cbb9ba48.css'`` file with the following saving a ``'css/styles.55e7cbb9ba48.css'`` file with the following
content: content:

View File

@ -233,7 +233,7 @@ probably be using this flag.
.. django-admin-option:: --pks .. django-admin-option:: --pks
By default, ``dumpdata`` will output all the records of the model, but By default, ``dumpdata`` will output all the records of the model, but
you can use the ``--pks`` option to specify a comma seperated list of you can use the ``--pks`` option to specify a comma separated list of
primary keys on which to filter. This is only available when dumping primary keys on which to filter. This is only available when dumping
one model. one model.
@ -743,7 +743,7 @@ You can provide an IPv6 address surrounded by brackets
A hostname containing ASCII-only characters can also be used. A hostname containing ASCII-only characters can also be used.
If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled
(default in new projects) the :djadmin:`runserver` command will be overriden (default in new projects) the :djadmin:`runserver` command will be overridden
with its own :ref:`runserver<staticfiles-runserver>` command. with its own :ref:`runserver<staticfiles-runserver>` command.
.. django-admin-option:: --noreload .. django-admin-option:: --noreload

View File

@ -118,7 +118,7 @@ validation for your own manually created models. For example::
article.full_clean() article.full_clean()
except ValidationError as e: except ValidationError as e:
# Do something based on the errors contained in e.message_dict. # Do something based on the errors contained in e.message_dict.
# Display them to a user, or handle them programatically. # Display them to a user, or handle them programmatically.
pass pass
The first step ``full_clean()`` performs is to clean each individual field. The first step ``full_clean()`` performs is to clean each individual field.

View File

@ -4,7 +4,7 @@ Django 1.2.1 release notes
Django 1.2.1 was released almost immediately after 1.2.0 to correct two small Django 1.2.1 was released almost immediately after 1.2.0 to correct two small
bugs: one was in the documentation packaging script, the other was a bug_ that bugs: one was in the documentation packaging script, the other was a bug_ that
affected datetime form field widgets when localisation was enabled. affected datetime form field widgets when localization was enabled.
.. _bug: https://code.djangoproject.com/ticket/13560 .. _bug: https://code.djangoproject.com/ticket/13560

View File

@ -7,7 +7,7 @@ November 27, 2012.
Welcome to Django 1.5 beta! Welcome to Django 1.5 beta!
This is the second in a series of preview/development releases leading This is the second in a series of preview/development releases leading
up to the eventual release of Django 1.5, scheduled for Decemeber up to the eventual release of Django 1.5, scheduled for December
2012. This release is primarily targeted at developers who are 2012. This release is primarily targeted at developers who are
interested in trying out new features and testing the Django codebase interested in trying out new features and testing the Django codebase
to help identify and resolve bugs prior to the final 1.5 release. to help identify and resolve bugs prior to the final 1.5 release.

View File

@ -170,7 +170,7 @@ being taken from the
:attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix` :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
attribute. (The date based generic views use suffixes such as ``_archive``, attribute. (The date based generic views use suffixes such as ``_archive``,
``_archive_year`` and so on to use different templates for the various ``_archive_year`` and so on to use different templates for the various
specialised date-based list views.) specialized date-based list views.)
Using Django's class-based view mixins Using Django's class-based view mixins
====================================== ======================================

View File

@ -619,7 +619,7 @@ context managers breaks atomicity.
Managing autocommit Managing autocommit
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
Django 1.6 introduces an explicit :ref:`API for mananging autocommit Django 1.6 introduces an explicit :ref:`API for managing autocommit
<managing-autocommit>`. <managing-autocommit>`.
To disable autocommit temporarily, instead of:: To disable autocommit temporarily, instead of::

View File

@ -293,7 +293,7 @@ You can edit it multiple times.
expiration (or those set to expire at browser close), this will equal the expiration (or those set to expire at browser close), this will equal the
date :setting:`SESSION_COOKIE_AGE` seconds from now. date :setting:`SESSION_COOKIE_AGE` seconds from now.
This function accepts the same keyword argumets as :meth:`get_expiry_age`. This function accepts the same keyword arguments as :meth:`get_expiry_age`.
.. method:: get_expire_at_browser_close .. method:: get_expire_at_browser_close

View File

@ -623,7 +623,7 @@ change the entry in the URLconf.
In some scenarios where views are of a generic nature, a many-to-one In some scenarios where views are of a generic nature, a many-to-one
relationship might exist between URLs and views. For these cases the view name relationship might exist between URLs and views. For these cases the view name
isn't a good enough identificator for it when it comes the time of reversing isn't a good enough identifier for it when comes the time of reversing
URLs. Read the next section to know about the solution Django provides for this. URLs. Read the next section to know about the solution Django provides for this.
.. _naming-url-patterns: .. _naming-url-patterns:

View File

@ -174,7 +174,7 @@ Advanced features of ``TransactionTestCase``
.. warning:: .. warning::
This attribute is a private API. It may be changed or removed without This attribute is a private API. It may be changed or removed without
a deprecation period in the future, for instance to accomodate changes a deprecation period in the future, for instance to accommodate changes
in application loading. in application loading.
It's used to optimize Django's own test suite, which contains hundreds It's used to optimize Django's own test suite, which contains hundreds

View File

@ -1421,7 +1421,7 @@ The decorator can also be applied to test case classes::
You can also simulate the absence of a setting by deleting it after settings You can also simulate the absence of a setting by deleting it after settings
have been overriden, like this:: have been overridden, like this::
@override_settings() @override_settings()
def test_something(self): def test_something(self):
@ -1437,7 +1437,7 @@ callbacks to clean up and otherwise reset state when settings are changed.
Django itself uses this signal to reset various data: Django itself uses this signal to reset various data:
================================ ======================== ================================ ========================
Overriden settings Data reset Overridden settings Data reset
================================ ======================== ================================ ========================
USE_TZ, TIME_ZONE Databases timezone USE_TZ, TIME_ZONE Databases timezone
TEMPLATE_CONTEXT_PROCESSORS Context processors cache TEMPLATE_CONTEXT_PROCESSORS Context processors cache
@ -1639,7 +1639,7 @@ your test suite.
.. versionadded:: 1.5 .. versionadded:: 1.5
Asserts that the strings ``xml1`` and ``xml2`` are equal. The Asserts that the strings ``xml1`` and ``xml2`` are equal. The
comparison is based on XML semantics. Similarily to comparison is based on XML semantics. Similarly to
:meth:`~SimpleTestCase.assertHTMLEqual`, the comparison is :meth:`~SimpleTestCase.assertHTMLEqual`, the comparison is
made on parsed content, hence only semantic differences are considered, not made on parsed content, hence only semantic differences are considered, not
syntax differences. When unvalid XML is passed in any parameter, an syntax differences. When unvalid XML is passed in any parameter, an

View File

@ -36,7 +36,7 @@ class CustomManagerTests(TestCase):
with self.assertRaises(AttributeError): with self.assertRaises(AttributeError):
manager.optout_public_method() manager.optout_public_method()
# Test that the overriden method is called. # Test that the overridden method is called.
queryset = manager.filter() queryset = manager.filter()
self.assertQuerysetEqual(queryset, ["Bugs Bunny"], six.text_type) self.assertQuerysetEqual(queryset, ["Bugs Bunny"], six.text_type)
self.assertEqual(queryset._filter_CustomQuerySet, True) self.assertEqual(queryset._filter_CustomQuerySet, True)

View File

@ -1824,7 +1824,7 @@ class FormsTestCase(TestCase):
# passing just one argument: overrides the field's label # passing just one argument: overrides the field's label
(('custom',), {}, '<label for="id_field">custom:</label>'), (('custom',), {}, '<label for="id_field">custom:</label>'),
# the overriden label is escaped # the overridden label is escaped
(('custom&',), {}, '<label for="id_field">custom&amp;:</label>'), (('custom&',), {}, '<label for="id_field">custom&amp;:</label>'),
((mark_safe('custom&'),), {}, '<label for="id_field">custom&:</label>'), ((mark_safe('custom&'),), {}, '<label for="id_field">custom&:</label>'),

View File

@ -391,7 +391,7 @@ class ModelFormsetTest(TestCase):
def test_custom_queryset_init(self): def test_custom_queryset_init(self):
""" """
Test that a queryset can be overriden in the __init__ method. Test that a queryset can be overridden in the __init__ method.
https://docs.djangoproject.com/en/dev/topics/forms/modelforms/#changing-the-queryset https://docs.djangoproject.com/en/dev/topics/forms/modelforms/#changing-the-queryset
""" """
author1 = Author.objects.create(name='Charles Baudelaire') author1 = Author.objects.create(name='Charles Baudelaire')

View File

@ -789,7 +789,7 @@ class Queries1Tests(BaseQuerysetTest):
) )
def test_ticket7181(self): def test_ticket7181(self):
# Ordering by related tables should accomodate nullable fields (this # Ordering by related tables should accommodate nullable fields (this
# test is a little tricky, since NULL ordering is database dependent. # test is a little tricky, since NULL ordering is database dependent.
# Instead, we just count the number of results). # Instead, we just count the number of results).
self.assertEqual(len(Tag.objects.order_by('parent__name')), 5) self.assertEqual(len(Tag.objects.order_by('parent__name')), 5)

View File

@ -113,7 +113,7 @@ class LiveServerAddress(LiveServerBase):
def test_test_test(self): def test_test_test(self):
# Intentionally empty method so that the test is picked up by the # Intentionally empty method so that the test is picked up by the
# test runner and the overriden setUpClass() method is executed. # test runner and the overridden setUpClass() method is executed.
pass pass
class LiveServerViews(LiveServerBase): class LiveServerViews(LiveServerBase):

View File

@ -163,7 +163,7 @@ class SettingsTests(TestCase):
def test_override_settings_delete(self): def test_override_settings_delete(self):
""" """
Allow deletion of a setting in an overriden settings set (#18824) Allow deletion of a setting in an overridden settings set (#18824)
""" """
previous_i18n = settings.USE_I18N previous_i18n = settings.USE_I18N
with self.settings(USE_I18N=False): with self.settings(USE_I18N=False):

View File

@ -95,7 +95,7 @@ class SimpleTemplateResponseTest(TestCase):
self.assertEqual(response.content, b'foo') self.assertEqual(response.content, b'foo')
def test_set_content(self): def test_set_content(self):
# content can be overriden # content can be overridden
response = self._response() response = self._response()
self.assertFalse(response.is_rendered) self.assertFalse(response.is_rendered)
response.content = 'spam' response.content = 'spam'