Fixed various dodgy behaviours

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17226 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/conf/global_settings.py

@@ -152,7 +152,7 @@ DATABASES = {
     },
 }
 
-# Classes used to implement db routing behaviour
+# Classes used to implement DB routing behavior.
 DATABASE_ROUTERS = []
 
 # The email backend to use. For possible shortcuts see django.core.mail.

django/contrib/admin/static/admin/js/admin/ordering.js

@@ -11,7 +11,7 @@ function reorder_init() {
     setOrder(input.value.split(','));
     input.disabled = true;
     draw();
-    // Now initialise the dragging behaviour
+    // Now initialize the dragging behavior
     var limit = (lis.length - 1) * height;
     for (var i = 0; i < lis.length; i++) {
         var li = lis[i];

django/contrib/gis/geos/tests/test_geos.py

@@ -892,11 +892,11 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
 
     def test23_transform_nosrid(self):
         """ Testing `transform` method (no SRID) """
-        # raise a warning if SRID <0/None
+        # Raise a warning if SRID <0/None.
         import warnings
         print "\nBEGIN - expecting Warnings; safe to ignore.\n"
 
-        # test for do-nothing behaviour.
+        # Test for do-nothing behavior.
         try:
             # Keeping line-noise down by only printing the relevant
             # warnings once.

django/contrib/sessions/tests.py

@@ -410,6 +410,6 @@ class CookieSessionTests(SessionTestsMixin, TestCase):
         This test tested cycle_key() which would create a new session
         key for the same session data. But we can't invalidate previously
         signed cookies (other than letting them expire naturally) so
-        testing for this behaviour is meaningless.
+        testing for this behavior is meaningless.
         """
         pass

django/core/management/__init__.py

@@ -168,7 +168,7 @@ class LaxOptionParser(OptionParser):
     def print_lax_help(self):
         """Output the basic options available to every command.
 
-        This just redirects to the default print_help() behaviour.
+        This just redirects to the default print_help() behavior.
         """
         OptionParser.print_help(self)
 

django/db/models/sql/query.py

@@ -1249,7 +1249,7 @@ class Query(object):
         case). Finally, 'negate' is used in the same sense as for add_filter()
         -- it indicates an exclude() filter, or something similar. It is only
         passed in here so that it can be passed to a field's extra_filter() for
-        customised behaviour.
+        customized behavior.
 
         Returns the final field involved in the join, the target database
         column (used for any 'where' constraint), the final 'opts' value and the

django/template/defaulttags.py

@@ -474,7 +474,7 @@ class WithNode(Node):
 @register.tag
 def autoescape(parser, token):
     """
-    Force autoescape behaviour for this block.
+    Force autoescape behavior for this block.
     """
     args = token.contents.split()
     if len(args) != 2:

django/views/debug.py

@@ -92,7 +92,7 @@ def get_exception_reporter_filter(request):
 class ExceptionReporterFilter(object):
     """
     Base for all exception reporter filter classes. All overridable hooks
-    contain lenient default behaviours.
+    contain lenient default behaviors.
     """
 
     def get_request_repr(self, request):

tests/modeltests/force_insert_update/models.py

@@ -1,6 +1,6 @@
 """
 Tests for forcing insert and update queries (instead of Django's normal
-automatic behaviour).
+automatic behavior).
 """
 from django.db import models
 

tests/modeltests/prefetch_related/tests.py

@@ -149,7 +149,7 @@ class PrefetchRelatedTests(TestCase):
 
     def test_get(self):
         """
-        Test that objects retrieved with .get() get the prefetch behaviour
+        Test that objects retrieved with .get() get the prefetch behavior.
         """
         # Need a double
         with self.assertNumQueries(3):

tests/regressiontests/defer_regress/tests.py

@@ -47,7 +47,7 @@ class DeferRegressionTest(TestCase):
         self.assertEqual(r.item, i)
 
         # Some further checks for select_related() and inherited model
-        # behaviour (regression for #10710).
+        # behavior (regression for #10710).
         c1 = Child.objects.create(name="c1", value=42)
         c2 = Child.objects.create(name="c2", value=37)
         Leaf.objects.create(name="l1", child=c1, second_child=c2)

tests/regressiontests/fixtures_regress/models.py

@@ -113,7 +113,7 @@ class Person(models.Model):
         return self.name
 
     # Person doesn't actually have a dependency on store, but we need to define
-    # one to test the behaviour of the dependency resolution algorithm.
+    # one to test the behavior of the dependency resolution algorithm.
     def natural_key(self):
         return (self.name,)
     natural_key.dependencies = ['fixtures_regress.store']

tests/regressiontests/mail/tests.py

@@ -75,9 +75,9 @@ class MailTests(TestCase):
         """
         Test for space continuation character in long (ascii) subject headers (#7747)
         """
-        email = EmailMessage('Long subject lines that get wrapped should use a space continuation character to get expected behaviour in Outlook and Thunderbird', 'Content', 'from@example.com', ['to@example.com'])
+        email = EmailMessage('Long subject lines that get wrapped should use a space continuation character to get expected behavior in Outlook and Thunderbird', 'Content', 'from@example.com', ['to@example.com'])
         message = email.message()
-        self.assertEqual(message['Subject'], 'Long subject lines that get wrapped should use a space continuation\n character to get expected behaviour in Outlook and Thunderbird')
+        self.assertEqual(message['Subject'], 'Long subject lines that get wrapped should use a space continuation\n character to get expected behavior in Outlook and Thunderbird')
 
     def test_message_header_overrides(self):
         """

tests/regressiontests/model_inheritance_regress/tests.py

@@ -1,5 +1,5 @@
 """
-Regression tests for Model inheritance behaviour.
+Regression tests for Model inheritance behavior.
 """
 
 from __future__ import absolute_import
@@ -21,7 +21,7 @@ class ModelInheritanceTest(TestCase):
         # Regression for #7350, #7202
         # Check that when you create a Parent object with a specific reference
         # to an existent child instance, saving the Parent doesn't duplicate
-        # the child. This behaviour is only activated during a raw save - it
+        # the child. This behavior is only activated during a raw save - it
         # is mostly relevant to deserialization, but any sort of CORBA style
         # 'narrow()' API would require a similar approach.
 

tests/regressiontests/multiple_database/tests.py

@@ -934,7 +934,7 @@ class QueryTestCase(TestCase):
                                   extra_arg=True)
 
 class TestRouter(object):
-    # A test router. The behaviour is vaguely master/slave, but the
+    # A test router. The behavior is vaguely master/slave, but the
     # databases aren't assumed to propagate changes.
     def db_for_read(self, model, instance=None, **hints):
         if instance:
@@ -1010,7 +1010,7 @@ class RouterTestCase(TestCase):
         self.assertEqual(Book.objects.db_manager('default').all().db, 'default')
 
     def test_syncdb_selection(self):
-        "Synchronization behaviour is predicatable"
+        "Synchronization behavior is predictable"
 
         self.assertTrue(router.allow_syncdb('default', User))
         self.assertTrue(router.allow_syncdb('default', Book))
@@ -1042,7 +1042,7 @@ class RouterTestCase(TestCase):
         dive = Book.objects.using('other').create(title="Dive into Python",
                                                   published=datetime.date(2009, 5, 4))
 
-        # First check the baseline behaviour
+        # First check the baseline behavior.
 
         self.assertEqual(router.db_for_read(User), 'other')
         self.assertEqual(router.db_for_read(Book), 'other')

tests/regressiontests/queries/tests.py

@@ -1354,7 +1354,7 @@ class Queries6Tests(TestCase):
         ann1.notes.add(n1)
         ann2 = Annotation.objects.create(name='a2', tag=t4)
 
-    # This next test used to cause really weird PostgreSQL behaviour, but it was
+    # This next test used to cause really weird PostgreSQL behavior, but it was
     # only apparent much later when the full test suite ran.
     #@unittest.expectedFailure
     def test_slicing_and_cache_interaction(self):

tests/regressiontests/serializers_regress/tests.py

@@ -97,7 +97,7 @@ def pk_create(pk, klass, data):
 def inherited_create(pk, klass, data):
     instance = klass(id=pk,**data)
     # This isn't a raw save because:
-    #  1) we're testing inheritance, not field behaviour, so none
+    #  1) we're testing inheritance, not field behavior, so none
     #     of the field values need to be protected.
     #  2) saving the child class and having the parent created
     #     automatically is easier than manually creating both.

tests/regressiontests/templates/filters.py

@@ -113,7 +113,7 @@ def get_filter_tests():
         'filter-make_list03': ('{% autoescape off %}{{ a|make_list|stringformat:"s"|safe }}{% endautoescape %}', {"a": mark_safe("&")}, u"[u'&']"),
         'filter-make_list04': ('{{ a|make_list|stringformat:"s"|safe }}', {"a": mark_safe("&")}, u"[u'&']"),
 
-        # Running slugify on a pre-escaped string leads to odd behaviour,
+        # Running slugify on a pre-escaped string leads to odd behavior,
         # but the result is still safe.
         'filter-slugify01': ("{% autoescape off %}{{ a|slugify }} {{ b|slugify }}{% endautoescape %}", {"a": "a & b", "b": mark_safe("a & b")}, u"a-b a-amp-b"),
         'filter-slugify02': ("{{ a|slugify }} {{ b|slugify }}", {"a": "a & b", "b": mark_safe("a & b")}, u"a-b a-amp-b"),

tests/regressiontests/test_client_regress/models.py

@@ -976,7 +976,7 @@ class ResponseTemplateDeprecationTests(TestCase):
 class ReadLimitedStreamTest(TestCase):
     """
     Tests that ensure that HttpRequest.body, HttpRequest.read() and
-    HttpRequest.read(BUFFER) have proper LimitedStream behaviour.
+    HttpRequest.read(BUFFER) have proper LimitedStream behavior.
 
     Refs #14753, #15785
     """
@@ -1017,7 +1017,7 @@ class RequestFactoryStateTest(TestCase):
     """Regression tests for #15929."""
     # These tests are checking that certain middleware don't change certain
     # global state. Alternatively, from the point of view of a test, they are
-    # ensuring test isolation behaviour. So, unusually, it doesn't make sense to
+    # ensuring test isolation behavior. So, unusually, it doesn't make sense to
     # run the tests individually, and if any are failing it is confusing to run
     # them with any other set of tests.