Branch: refs/heads/master
Home: https://github.com/django/django
Commit: 1adc87cd324db6003ef2962e68e11ccc9b104658
https://github.com/django/django/commit/1adc87cd324db6003ef2962e68e11ccc9b104658
Author: Ramiro Morales <cra...@gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M docs/faq/general.txt
M docs/ref/contrib/flatpages.txt
M docs/ref/contrib/gis/db-api.txt
M docs/ref/contrib/gis/geoquerysets.txt
M docs/ref/contrib/redirects.txt
M docs/ref/contrib/syndication.txt
M docs/ref/django-admin.txt
M docs/ref/settings.txt
M docs/topics/auth.txt
M docs/topics/db/queries.txt
Log Message:
-----------
Updated some URLs in the documentation to point to the new repository.
diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index 232f6e4..71de888 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -46,8 +46,8 @@ We've also recorded an `audio clip of the pronunciation`_.
Is Django stable?
-----------------
-Yes, it's quite stable. World Online has been using Django for many years.
Sites built on
-Django have weathered traffic spikes of over one million hits an hour.
+Yes, it's quite stable. World Online has been using Django for many years.
Sites built on
+Django have weathered traffic spikes of over one million hits an hour.
Does Django scale?
------------------
@@ -175,7 +175,7 @@ Technically, the docs on Django's site are generated from
the latest development
versions of those reST documents, so the docs on the Django site may offer more
information than the docs that come with the latest Django release.
-.. _stored in revision control:
https://code.djangoproject.com/browser/django/trunk/docs
+.. _stored in revision control:
https://github.com/django/django/tree/master/django/docs
Where can I find Django developers for hire?
--------------------------------------------
diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt
index 8873c28..0bba65c 100644
--- a/docs/ref/contrib/flatpages.txt
+++ b/docs/ref/contrib/flatpages.txt
@@ -147,7 +147,7 @@ Via the Python API
which lives in `django/contrib/flatpages/models.py`_. You can access
flatpage objects via the :doc:`Django database API </topics/db/queries>`.
-.. _django/contrib/flatpages/models.py:
https://code.djangoproject.com/browser/django/trunk/django/contrib/flatpages/models.py
+.. _django/contrib/flatpages/models.py:
https://github.com/django/django/tree/master/django/django/contrib/flatpages/models.py
.. currentmodule:: django.contrib.flatpages
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index 4cf65e5..eb364de 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -215,7 +215,7 @@ Then distance queries may be performed as follows::
>>> qs = SouthTexasCity.objects.filter(point__distance_gte=(pnt, D(mi=20)))
>>> qs = SouthTexasCity.objects.filter(point__distance_gte=(pnt,
D(chain=100)))
-__
https://code.djangoproject.com/browser/django/trunk/django/contrib/gis/tests/distapp/models.py
+__
https://github.com/django/django/tree/master/django/django/contrib/gis/tests/distapp/models.py
.. _compatibility-table:
diff --git a/docs/ref/contrib/gis/geoquerysets.txt
b/docs/ref/contrib/gis/geoquerysets.txt
index 5bc9ab1..7bd7fc8 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -736,7 +736,7 @@ the distance from the `Tasmanian`__ city of Hobart to every
other
in kilometers. See the :ref:`ref-measure` for usage details and the list
of
:ref:`supported_units`.
-__
https://code.djangoproject.com/browser/django/trunk/django/contrib/gis/tests/distapp/models.py
+__
https://github.com/django/django/tree/master/django/django/contrib/gis/tests/distapp/models.py
__ http://en.wikipedia.org/wiki/Tasmania
``length``
diff --git a/docs/ref/contrib/redirects.txt b/docs/ref/contrib/redirects.txt
index 71c3b4f..f527873 100644
--- a/docs/ref/contrib/redirects.txt
+++ b/docs/ref/contrib/redirects.txt
@@ -67,4 +67,4 @@ Via the Python API
which lives in `django/contrib/redirects/models.py`_. You can access
redirect
objects via the :doc:`Django database API </topics/db/queries>`.
-.. _django/contrib/redirects/models.py:
https://code.djangoproject.com/browser/django/trunk/django/contrib/redirects/models.py
+.. _django/contrib/redirects/models.py:
https://github.com/django/django/tree/master/django/django/contrib/redirects/models.py
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index 76c176e..5b2b0db 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -897,7 +897,7 @@ For example, to create an Atom 1.0 feed and print it to
standard output::
...
</feed>
-.. _django/utils/feedgenerator.py:
https://code.djangoproject.com/browser/django/trunk/django/utils/feedgenerator.py
+.. _django/utils/feedgenerator.py:
https://github.com/django/django/tree/master/django/django/utils/feedgenerator.py
.. currentmodule:: django.contrib.syndication
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 63e471d..3ddb390 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -926,7 +926,7 @@ with the ``--name`` option. The :class:`template context
To work around this problem, you can use the :ttag:`templatetag`
templatetag to "escape" the various parts of the template syntax.
-.. _source:
https://code.djangoproject.com/browser/django/trunk/django/conf/app_template/
+.. _source:
https://github.com/django/django/tree/master/django/django/conf/app_template/
startproject <projectname> [destination]
----------------------------------------
@@ -980,7 +980,7 @@ with the ``--name`` option. The :class:`template context
Please also see the :ref:`rendering warning <render_warning>` as mentioned
for :djadmin:`startapp`.
-.. _`template source`:
https://code.djangoproject.com/browser/django/trunk/django/conf/project_template/
+.. _`template source`:
https://github.com/django/django/tree/master/django/django/conf/project_template/
syncdb
------
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index ede2d37..0513aa8 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -806,7 +806,7 @@ It is also important to remember that when running with
:setting:`DEBUG`
turned on, Django will remember every SQL query it executes. This is useful
when you're debugging, but it'll rapidly consume memory on a production server.
-.. _django/views/debug.py:
https://code.djangoproject.com/browser/django/trunk/django/views/debug.py
+.. _django/views/debug.py:
https://github.com/django/django/tree/master/django/django/views/debug.py
DEBUG_PROPAGATE_EXCEPTIONS
--------------------------
@@ -1237,7 +1237,7 @@ and including a copy here would inevitably become rapidly
out of date. You can
see the current list of translated languages by looking in
``django/conf/global_settings.py`` (or view the `online source`_).
-.. _online source:
https://code.djangoproject.com/browser/django/trunk/django/conf/global_settings.py
+.. _online source:
https://github.com/django/django/tree/master/django/django/conf/global_settings.py
The list is a tuple of two-tuples in the format ``(language code, language
name)``, the ``language code`` part should be a
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index b067e24..3881f4f 100644
--- a/docs/topics/auth.txt
+++ b/docs/topics/auth.txt
@@ -1892,7 +1892,7 @@ A full authorization implementation can be found in
`django/contrib/auth/backends.py`_, which is the default backend and queries
the ``auth_permission`` table most of the time.
-.. _django/contrib/auth/backends.py:
https://code.djangoproject.com/browser/django/trunk/django/contrib/auth/backends.py
+.. _django/contrib/auth/backends.py:
https://github.com/django/django/tree/master/django/django/contrib/auth/backends.py
.. _anonymous_auth:
diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt
index 7782f1c..e9ad376 100644
--- a/docs/topics/db/queries.txt
+++ b/docs/topics/db/queries.txt
@@ -815,7 +815,7 @@ precede the definition of any keyword arguments. For
example::
The `OR lookups examples`_ in the Django unit tests show some possible uses
of ``Q``.
- .. _OR lookups examples:
https://code.djangoproject.com/browser/django/trunk/tests/modeltests/or_lookups/tests.py
+ .. _OR lookups examples:
https://github.com/django/django/tree/master/django/tests/modeltests/or_lookups/tests.py
Comparing objects
=================
================================================================
Commit: c0395dea46231b20a97c884d4f22fc8e9dbdde66
https://github.com/django/django/commit/c0395dea46231b20a97c884d4f22fc8e9dbdde66
Author: Ramiro Morales <cra...@gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M django/contrib/auth/tests/management.py
M django/contrib/auth/tests/models.py
M django/contrib/formtools/tests/wizard/wizardtests/tests.py
M django/contrib/gis/geoip/tests.py
M django/contrib/gis/tests/test_measure.py
M tests/modeltests/prefetch_related/tests.py
M tests/modeltests/select_for_update/tests.py
M tests/modeltests/test_client/models.py
M tests/regressiontests/admin_filters/tests.py
M tests/regressiontests/admin_inlines/tests.py
M tests/regressiontests/admin_views/tests.py
M tests/regressiontests/backends/tests.py
M tests/regressiontests/createsuperuser/tests.py
M tests/regressiontests/file_uploads/tests.py
M tests/regressiontests/servers/tests.py
M tests/regressiontests/settings_tests/tests.py
M tests/regressiontests/test_client_regress/models.py
M tests/regressiontests/test_runner/tests.py
M tests/regressiontests/utils/feedgenerator.py
Log Message:
-----------
Merge branch 'master' of github.com:django/django
diff --git a/django/contrib/auth/tests/management.py
b/django/contrib/auth/tests/management.py
index 3708cc8..5d31bd7 100644
--- a/django/contrib/auth/tests/management.py
+++ b/django/contrib/auth/tests/management.py
@@ -50,7 +50,7 @@ def
test_that_changepassword_command_changes_joes_password(self):
command.execute("joe", stdout=self.stdout)
command_output = self.stdout.getvalue().strip()
- self.assertEquals(command_output, "Changing password for user
'joe'\nPassword changed successfully for user 'joe'")
+ self.assertEqual(command_output, "Changing password for user
'joe'\nPassword changed successfully for user 'joe'")
self.assertTrue(models.User.objects.get(username="joe").check_password("not
qwerty"))
def test_that_max_tries_exits_1(self):
diff --git a/django/contrib/auth/tests/models.py
b/django/contrib/auth/tests/models.py
index 324f433..b956592 100644
--- a/django/contrib/auth/tests/models.py
+++ b/django/contrib/auth/tests/models.py
@@ -46,12 +46,12 @@ class NaturalKeysTestCase(TestCase):
def test_user_natural_key(self):
staff_user = User.objects.get(username='staff')
- self.assertEquals(User.objects.get_by_natural_key('staff'), staff_user)
- self.assertEquals(staff_user.natural_key(), ('staff',))
+ self.assertEqual(User.objects.get_by_natural_key('staff'), staff_user)
+ self.assertEqual(staff_user.natural_key(), ('staff',))
def test_group_natural_key(self):
users_group = Group.objects.create(name='users')
- self.assertEquals(Group.objects.get_by_natural_key('users'),
users_group)
+ self.assertEqual(Group.objects.get_by_natural_key('users'),
users_group)
@override_settings(USE_TZ=False)
@@ -61,7 +61,7 @@ class LoadDataWithoutNaturalKeysTestCase(TestCase):
def test_user_is_created_and_added_to_group(self):
user = User.objects.get(username='my_username')
group = Group.objects.get(name='my_group')
- self.assertEquals(group, user.groups.get())
+ self.assertEqual(group, user.groups.get())
@override_settings(USE_TZ=False)
@@ -71,7 +71,7 @@ class LoadDataWithNaturalKeysTestCase(TestCase):
def test_user_is_created_and_added_to_group(self):
user = User.objects.get(username='my_username')
group = Group.objects.get(name='my_group')
- self.assertEquals(group, user.groups.get())
+ self.assertEqual(group, user.groups.get())
class UserManagerTestCase(TestCase):
@@ -79,23 +79,23 @@ class UserManagerTestCase(TestCase):
def test_create_user(self):
email_lowercase = 'nor...@normal.com'
user = User.objects.create_user('user', email_lowercase)
- self.assertEquals(user.email, email_lowercase)
- self.assertEquals(user.username, 'user')
- self.assertEquals(user.password, '!')
+ self.assertEqual(user.email, email_lowercase)
+ self.assertEqual(user.username, 'user')
+ self.assertEqual(user.password, '!')
def test_create_user_email_domain_normalize_rfc3696(self):
# According to http://tools.ietf.org/html/rfc3696#section-3
# the "@" symbol can be part of the local part of an email address
returned = UserManager.normalize_email(r'Abc\@d...@example.com')
- self.assertEquals(returned, r'Abc\@d...@example.com')
+ self.assertEqual(returned, r'Abc\@d...@example.com')
def test_create_user_email_domain_normalize(self):
returned = UserManager.normalize_email('nor...@domain.com')
- self.assertEquals(returned, 'nor...@domain.com')
+ self.assertEqual(returned, 'nor...@domain.com')
def test_create_user_email_domain_normalize_with_whitespace(self):
returned = UserManager.normalize_email('email\ with_whitesp...@d.com')
- self.assertEquals(returned, 'email\ with_whitesp...@d.com')
+ self.assertEqual(returned, 'email\ with_whitesp...@d.com')
def test_empty_username(self):
self.assertRaisesMessage(ValueError,
diff --git a/django/contrib/formtools/tests/wizard/wizardtests/tests.py
b/django/contrib/formtools/tests/wizard/wizardtests/tests.py
index 24234e4..7afaf51 100644
--- a/django/contrib/formtools/tests/wizard/wizardtests/tests.py
+++ b/django/contrib/formtools/tests/wizard/wizardtests/tests.py
@@ -303,7 +303,7 @@ def get_context_data(self, **kwargs):
view = TestWizard.as_view([forms.Form])
response = view(factory.get('/'))
- self.assertEquals(response.context_data['test_key'], 'test_value')
+ self.assertEqual(response.context_data['test_key'], 'test_value')
def test_get_context_data_with_mixin(self):
class AnotherMixin(object):
@@ -329,8 +329,8 @@ def get_context_data(self, **kwargs):
view = TestWizard.as_view([forms.Form])
response = view(factory.get('/'))
- self.assertEquals(response.context_data['test_key'], 'test_value')
- self.assertEquals(response.context_data['another_key'],
'another_value')
+ self.assertEqual(response.context_data['test_key'], 'test_value')
+ self.assertEqual(response.context_data['another_key'], 'another_value')
class WizardFormKwargsOverrideTests(TestCase):
diff --git a/django/contrib/gis/geoip/tests.py
b/django/contrib/gis/geoip/tests.py
index 6e1f157..a629d86 100644
--- a/django/contrib/gis/geoip/tests.py
+++ b/django/contrib/gis/geoip/tests.py
@@ -87,7 +87,7 @@ def test04_city(self):
self.assertEqual('TX', d['region'])
self.assertEqual(713, d['area_code'])
geom = g.geos(query)
- self.failIf(not isinstance(geom, GEOSGeometry))
+ self.assertTrue(isinstance(geom, GEOSGeometry))
lon, lat = (-95.4010, 29.7079)
lat_lon = g.lat_lon(query)
lat_lon = (lat_lon[1], lat_lon[0])
diff --git a/django/contrib/gis/tests/test_measure.py
b/django/contrib/gis/tests/test_measure.py
index 72482da..f332562 100644
--- a/django/contrib/gis/tests/test_measure.py
+++ b/django/contrib/gis/tests/test_measure.py
@@ -45,7 +45,7 @@ def testAccess(self):
def testAccessInvalid(self):
"Testing access in invalid units"
d = D(m=100)
- self.failIf(hasattr(d, 'banana'))
+ self.assertFalse(hasattr(d, 'banana'))
def testAddition(self):
"Test addition & subtraction"
@@ -133,7 +133,7 @@ def testComparisons(self):
self.assertTrue(d2 > d1)
self.assertTrue(d1 == d1)
self.assertTrue(d1 < d2)
- self.failIf(d3)
+ self.assertFalse(d3)
def testUnitsStr(self):
"Testing conversion to strings"
@@ -179,7 +179,7 @@ def testAccess(self):
def testAccessInvaliA(self):
"Testing access in invalid units"
a = A(sq_m=100)
- self.failIf(hasattr(a, 'banana'))
+ self.assertFalse(hasattr(a, 'banana'))
def testAddition(self):
"Test addition & subtraction"
@@ -267,7 +267,7 @@ def testComparisons(self):
self.assertTrue(a2 > a1)
self.assertTrue(a1 == a1)
self.assertTrue(a1 < a2)
- self.failIf(a3)
+ self.assertFalse(a3)
def testUnitsStr(self):
"Testing conversion to strings"
diff --git a/tests/modeltests/prefetch_related/tests.py
b/tests/modeltests/prefetch_related/tests.py
index 51a9b69..5cd42a7 100644
--- a/tests/modeltests/prefetch_related/tests.py
+++ b/tests/modeltests/prefetch_related/tests.py
@@ -341,7 +341,7 @@ def test_foreignkey(self):
qs = AuthorWithAge.objects.prefetch_related('addresses')
addresses = [[unicode(address) for address in obj.addresses.all()]
for obj in qs]
- self.assertEquals(addresses, [[unicode(self.authorAddress)], [], []])
+ self.assertEqual(addresses, [[unicode(self.authorAddress)], [], []])
def test_m2m_to_inheriting_model(self):
qs = AuthorWithAge.objects.prefetch_related('books_with_year')
@@ -351,7 +351,7 @@ def test_m2m_to_inheriting_model(self):
qs = AuthorWithAge.objects.all()
lst2 = [[unicode(book) for book in author.books_with_year.all()]
for author in qs]
- self.assertEquals(lst, lst2)
+ self.assertEqual(lst, lst2)
qs = BookWithYear.objects.prefetch_related('aged_authors')
with self.assertNumQueries(2):
@@ -360,7 +360,7 @@ def test_m2m_to_inheriting_model(self):
qs = BookWithYear.objects.all()
lst2 = [[unicode(author) for author in book.aged_authors.all()]
for book in qs]
- self.assertEquals(lst, lst2)
+ self.assertEqual(lst, lst2)
def test_parent_link_prefetch(self):
with self.assertNumQueries(2):
@@ -402,7 +402,7 @@ def test_foreignkey(self):
qs = Author.objects.prefetch_related('addresses')
addresses = [[unicode(address) for address in obj.addresses.all()]
for obj in qs]
- self.assertEquals(addresses, [[unicode(self.authorAddress)], [], []])
+ self.assertEqual(addresses, [[unicode(self.authorAddress)], [], []])
def test_m2m(self):
with self.assertNumQueries(3):
@@ -411,7 +411,7 @@ def test_m2m(self):
[unicode(i_like) for i_like in author.favorite_authors.all()],
[unicode(likes_me) for likes_me in author.favors_me.all()]
) for author in qs]
- self.assertEquals(
+ self.assertEqual(
favorites,
[
([unicode(self.author2)],[unicode(self.author3)]),
@@ -549,7 +549,7 @@ def test_using_is_honored_m2m(self):
authors = "".join(["%s: %s\n" %
(author.name, ", ".join(b.title for b in
author.books.all()))
for author in qs2])
- self.assertEquals(authors,
+ self.assertEqual(authors,
"Charlotte: Poems, Jane Eyre\n"
"Anne: Poems\n"
"Emily: Poems, Wuthering Heights\n"
diff --git a/tests/modeltests/select_for_update/tests.py
b/tests/modeltests/select_for_update/tests.py
index 0587e11..243f6b5 100644
--- a/tests/modeltests/select_for_update/tests.py
+++ b/tests/modeltests/select_for_update/tests.py
@@ -80,7 +80,7 @@ def has_for_update_sql(self, tested_connection, nowait=False):
return bool(sql.find(for_update_sql) > -1)
def check_exc(self, exc):
- self.failUnless(isinstance(exc, DatabaseError))
+ self.assertTrue(isinstance(exc, DatabaseError))
@skipUnlessDBFeature('has_select_for_update')
def test_for_update_sql_generated(self):
@@ -217,7 +217,7 @@ def test_block(self):
# Check the thread has finished. Assuming it has, we should
# find that it has updated the person's name.
- self.failIf(thread.isAlive())
+ self.assertFalse(thread.isAlive())
# We must commit the transaction to ensure that MySQL gets a fresh
read,
# since by default it runs in REPEATABLE READ mode
diff --git a/tests/modeltests/test_client/models.py
b/tests/modeltests/test_client/models.py
index cfbb4fb..a533d6a 100644
--- a/tests/modeltests/test_client/models.py
+++ b/tests/modeltests/test_client/models.py
@@ -378,7 +378,7 @@ def test_view_with_permissions_exception(self):
# Get the page without logging in. Should result in 403.
response =
self.client.get('/test_client/permission_protected_view_exception/')
- self.assertEquals(response.status_code, 403)
+ self.assertEqual(response.status_code, 403)
# Log in
login = self.client.login(username='testclient', password='password')
@@ -386,7 +386,7 @@ def test_view_with_permissions_exception(self):
# Log in with wrong permissions. Should result in 403.
response =
self.client.get('/test_client/permission_protected_view_exception/')
- self.assertEquals(response.status_code, 403)
+ self.assertEqual(response.status_code, 403)
def test_view_with_method_permissions(self):
"Request a page that is protected with a @permission_required method"
diff --git a/tests/regressiontests/admin_filters/tests.py
b/tests/regressiontests/admin_filters/tests.py
index e2a12c9..8c9788b 100644
--- a/tests/regressiontests/admin_filters/tests.py
+++ b/tests/regressiontests/admin_filters/tests.py
@@ -270,7 +270,7 @@ def test_relatedfieldlistfilter_foreignkey(self):
# Make sure the last choice is None and is selected
filterspec = changelist.get_filters(request)[0][1]
- self.assertEquals(force_unicode(filterspec.title), u'Verbose Author')
+ self.assertEqual(force_unicode(filterspec.title), u'Verbose Author')
choices = list(filterspec.choices(changelist))
self.assertEqual(choices[-1]['selected'], True)
self.assertEqual(choices[-1]['query_string'], '?author__isnull=True')
@@ -280,7 +280,7 @@ def test_relatedfieldlistfilter_foreignkey(self):
# Make sure the correct choice is selected
filterspec = changelist.get_filters(request)[0][1]
- self.assertEquals(force_unicode(filterspec.title), u'Verbose Author')
+ self.assertEqual(force_unicode(filterspec.title), u'Verbose Author')
# order of choices depends on User model, which has no order
choice = select_by(filterspec.choices(changelist), "display", "alfred")
self.assertEqual(choice['selected'], True)
@@ -298,7 +298,7 @@ def test_relatedfieldlistfilter_manytomany(self):
# Make sure the last choice is None and is selected
filterspec = changelist.get_filters(request)[0][2]
- self.assertEquals(force_unicode(filterspec.title), u'Verbose
Contributors')
+ self.assertEqual(force_unicode(filterspec.title), u'Verbose
Contributors')
choices = list(filterspec.choices(changelist))
self.assertEqual(choices[-1]['selected'], True)
self.assertEqual(choices[-1]['query_string'],
'?contributors__isnull=True')
@@ -308,7 +308,7 @@ def test_relatedfieldlistfilter_manytomany(self):
# Make sure the correct choice is selected
filterspec = changelist.get_filters(request)[0][2]
- self.assertEquals(force_unicode(filterspec.title), u'Verbose
Contributors')
+ self.assertEqual(force_unicode(filterspec.title), u'Verbose
Contributors')
choice = select_by(filterspec.choices(changelist), "display", "bob")
self.assertEqual(choice['selected'], True)
self.assertEqual(choice['query_string'], '?contributors__id__exact=%d'
% self.bob.pk)
@@ -509,7 +509,7 @@ def test_simplelistfilter(self):
self.assertEqual(choices[3]['query_string'],
'?publication-decade=the+00s&author__id__exact=%s' % self.alfred.pk)
filterspec = changelist.get_filters(request)[0][0]
- self.assertEquals(force_unicode(filterspec.title), u'Verbose Author')
+ self.assertEqual(force_unicode(filterspec.title), u'Verbose Author')
choice = select_by(filterspec.choices(changelist), "display", "alfred")
self.assertEqual(choice['selected'], True)
self.assertEqual(choice['query_string'],
'?publication-decade=the+00s&author__id__exact=%s' % self.alfred.pk)
diff --git a/tests/regressiontests/admin_inlines/tests.py
b/tests/regressiontests/admin_inlines/tests.py
index d6d02ed..2cca670 100644
--- a/tests/regressiontests/admin_inlines/tests.py
+++ b/tests/regressiontests/admin_inlines/tests.py
@@ -405,14 +405,14 @@ def test_add_inlines(self):
# Check that there's only one inline to start with and that it has the
# correct ID.
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set')), 1)
- self.failUnlessEqual(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set')[0].get_attribute('id'),
'profile_set-0')
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set#profile_set-0
input[name=profile_set-0-first_name]')), 1)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set#profile_set-0
input[name=profile_set-0-last_name]')), 1)
# Add an inline
@@ -420,24 +420,24 @@ def test_add_inlines(self):
# Check that the inline has been added, that it has the right id, and
# that it contains the right fields.
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set')), 2)
- self.failUnlessEqual(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set')[1].get_attribute('id'), 'profile_set-1')
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set#profile_set-1
input[name=profile_set-1-first_name]')), 1)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set#profile_set-1
input[name=profile_set-1-last_name]')), 1)
# Let's add another one to be sure
self.selenium.find_element_by_link_text('Add another Profile').click()
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set')), 3)
- self.failUnlessEqual(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set')[2].get_attribute('id'), 'profile_set-2')
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set#profile_set-2
input[name=profile_set-2-first_name]')), 1)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'.dynamic-profile_set#profile_set-2
input[name=profile_set-2-last_name]')), 1)
# Enter some data and click 'Save'
@@ -473,17 +473,17 @@ def test_delete_inlines(self):
self.selenium.find_element_by_link_text('Add another Profile').click()
self.selenium.find_element_by_link_text('Add another Profile').click()
self.selenium.find_element_by_link_text('Add another Profile').click()
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'#profile_set-group table tr.dynamic-profile_set')), 5)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form
tr.dynamic-profile_set#profile_set-0')), 1)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form
tr.dynamic-profile_set#profile_set-1')), 1)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form
tr.dynamic-profile_set#profile_set-2')), 1)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form
tr.dynamic-profile_set#profile_set-3')), 1)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form
tr.dynamic-profile_set#profile_set-4')), 1)
# Click on a few delete buttons
@@ -492,13 +492,13 @@ def test_delete_inlines(self):
self.selenium.find_element_by_css_selector(
'form#profilecollection_form tr.dynamic-profile_set#profile_set-2
td.delete a').click()
# Verify that they're gone and that the IDs have been re-sequenced
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'#profile_set-group table tr.dynamic-profile_set')), 3)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form
tr.dynamic-profile_set#profile_set-0')), 1)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form
tr.dynamic-profile_set#profile_set-1')), 1)
- self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
+ self.assertEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form
tr.dynamic-profile_set#profile_set-2')), 1)
diff --git a/tests/regressiontests/admin_views/tests.py
b/tests/regressiontests/admin_views/tests.py
index 047bcc2..f9a9b15 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -3144,7 +3144,7 @@ def test_readonly_manytomany(self):
def test_user_password_change_limited_queryset(self):
su = User.objects.filter(is_superuser=True)[0]
response = self.client.get('/test_admin/admin2/auth/user/%s/password/'
% su.pk)
- self.assertEquals(response.status_code, 404)
+ self.assertEqual(response.status_code, 404)
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
diff --git a/tests/regressiontests/backends/tests.py
b/tests/regressiontests/backends/tests.py
index 038f652..eec817c 100644
--- a/tests/regressiontests/backends/tests.py
+++ b/tests/regressiontests/backends/tests.py
@@ -521,7 +521,7 @@ def runner():
t = threading.Thread(target=runner)
t.start()
t.join()
- self.assertEquals(len(connections_set), 3)
+ self.assertEqual(len(connections_set), 3)
# Finish by closing the connections opened by the other threads (the
# connection opened in the main thread will automatically be closed on
# teardown).
@@ -548,7 +548,7 @@ def runner():
t = threading.Thread(target=runner)
t.start()
t.join()
- self.assertEquals(len(connections_set), 6)
+ self.assertEqual(len(connections_set), 6)
# Finish by closing the connections opened by the other threads (the
# connection opened in the main thread will automatically be closed on
# teardown).
diff --git a/tests/regressiontests/createsuperuser/tests.py
b/tests/regressiontests/createsuperuser/tests.py
index 4fdb592..1c1bb0e 100644
--- a/tests/regressiontests/createsuperuser/tests.py
+++ b/tests/regressiontests/createsuperuser/tests.py
@@ -28,7 +28,7 @@ def
test_that_changepassword_command_with_database_option_uses_given_db(self):
command.execute("joe", database='other', stdout=self.stdout)
command_output = self.stdout.getvalue().strip()
- self.assertEquals(command_output, "Changing password for user
'joe'\nPassword changed successfully for user 'joe'")
+ self.assertEqual(command_output, "Changing password for user
'joe'\nPassword changed successfully for user 'joe'")
self.assertTrue(models.User.objects.using('other').get(username="joe").check_password("not
qwerty"))
diff --git a/tests/regressiontests/file_uploads/tests.py
b/tests/regressiontests/file_uploads/tests.py
index a461ce1..b9ce3c2 100644
--- a/tests/regressiontests/file_uploads/tests.py
+++ b/tests/regressiontests/file_uploads/tests.py
@@ -202,7 +202,7 @@ def test_truncated_multipart_handled_gracefully(self):
'wsgi.input': client.FakePayload(payload),
}
got = json.loads(self.client.request(**r).content)
- self.assertEquals(got, {})
+ self.assertEqual(got, {})
def test_empty_multipart_handled_gracefully(self):
"""
@@ -217,7 +217,7 @@ def test_empty_multipart_handled_gracefully(self):
'wsgi.input': client.FakePayload(''),
}
got = json.loads(self.client.request(**r).content)
- self.assertEquals(got, {})
+ self.assertEqual(got, {})
def test_custom_upload_handler(self):
# A small file (under the 5M quota)
@@ -313,7 +313,7 @@ def handle_uncaught_exception(self, request, resolver,
exc_info):
try:
response = self.client.post('/file_uploads/upload_errors/',
post_data)
except reference_error.__class__ as err:
- self.failIf(
+ self.assertFalse(
str(err) == str(reference_error),
"Caught a repeated exception that'll cause an infinite loop in
file uploads."
)
diff --git a/tests/regressiontests/servers/tests.py
b/tests/regressiontests/servers/tests.py
index c3def15..5d287a1 100644
--- a/tests/regressiontests/servers/tests.py
+++ b/tests/regressiontests/servers/tests.py
@@ -103,7 +103,7 @@ def test_404(self):
try:
self.urlopen('/')
except urllib2.HTTPError as err:
- self.assertEquals(err.code, 404, 'Expected 404 response')
+ self.assertEqual(err.code, 404, 'Expected 404 response')
else:
self.fail('Expected 404 response')
@@ -113,7 +113,7 @@ def test_view(self):
Refs #2879.
"""
f = self.urlopen('/example_view/')
- self.assertEquals(f.read(), 'example view')
+ self.assertEqual(f.read(), 'example view')
def test_static_files(self):
"""
@@ -121,7 +121,7 @@ def test_static_files(self):
Refs #2879.
"""
f = self.urlopen('/static/example_static_file.txt')
- self.assertEquals(f.read(), 'example static file\n')
+ self.assertEqual(f.read(), 'example static file\n')
def test_media_files(self):
"""
@@ -129,7 +129,7 @@ def test_media_files(self):
Refs #2879.
"""
f = self.urlopen('/media/example_media_file.txt')
- self.assertEquals(f.read(), 'example media file\n')
+ self.assertEqual(f.read(), 'example media file\n')
class LiveServerDatabase(LiveServerBase):
@@ -141,7 +141,7 @@ def test_fixtures_loaded(self):
Refs #2879.
"""
f = self.urlopen('/model_view/')
- self.assertEquals(f.read().splitlines(), ['jane', 'robert'])
+ self.assertEqual(f.read().splitlines(), ['jane', 'robert'])
def test_database_writes(self):
"""
diff --git a/tests/regressiontests/settings_tests/tests.py
b/tests/regressiontests/settings_tests/tests.py
index 2027382..ffcb79e 100644
--- a/tests/regressiontests/settings_tests/tests.py
+++ b/tests/regressiontests/settings_tests/tests.py
@@ -19,10 +19,10 @@ def test_method_override(self):
self.assertEqual(settings.TEST, 'override2')
def test_decorated_testcase_name(self):
- self.assertEquals(FullyDecoratedTranTestCase.__name__,
'FullyDecoratedTranTestCase')
+ self.assertEqual(FullyDecoratedTranTestCase.__name__,
'FullyDecoratedTranTestCase')
def test_decorated_testcase_module(self):
- self.assertEquals(FullyDecoratedTranTestCase.__module__, __name__)
+ self.assertEqual(FullyDecoratedTranTestCase.__module__, __name__)
@override_settings(TEST='override')
diff --git a/tests/regressiontests/test_client_regress/models.py
b/tests/regressiontests/test_client_regress/models.py
index ab0afd0..4f057b9 100644
--- a/tests/regressiontests/test_client_regress/models.py
+++ b/tests/regressiontests/test_client_regress/models.py
@@ -956,23 +956,23 @@ class ReadLimitedStreamTest(TestCase):
def test_body_from_empty_request(self):
"""HttpRequest.body on a test client GET request should return
the empty string."""
-
self.assertEquals(self.client.get("/test_client_regress/body/").content, '')
+
self.assertEqual(self.client.get("/test_client_regress/body/").content, '')
def test_read_from_empty_request(self):
"""HttpRequest.read() on a test client GET request should return the
empty string."""
-
self.assertEquals(self.client.get("/test_client_regress/read_all/").content, '')
+
self.assertEqual(self.client.get("/test_client_regress/read_all/").content, '')
def test_read_numbytes_from_empty_request(self):
"""HttpRequest.read(LARGE_BUFFER) on a test client GET request should
return the empty string."""
-
self.assertEquals(self.client.get("/test_client_regress/read_buffer/").content,
'')
+
self.assertEqual(self.client.get("/test_client_regress/read_buffer/").content,
'')
def test_read_from_nonempty_request(self):
"""HttpRequest.read() on a test client PUT request with some payload
should return that payload."""
payload = 'foobar'
- self.assertEquals(self.client.put("/test_client_regress/read_all/",
+ self.assertEqual(self.client.put("/test_client_regress/read_all/",
data=payload,
content_type='text/plain').content,
payload)
@@ -980,7 +980,7 @@ def test_read_numbytes_from_nonempty_request(self):
"""HttpRequest.read(LARGE_BUFFER) on a test client PUT request with
some payload should return that payload."""
payload = 'foobar'
- self.assertEquals(self.client.put("/test_client_regress/read_buffer/",
+ self.assertEqual(self.client.put("/test_client_regress/read_buffer/",
data=payload,
content_type='text/plain').content,
payload)
diff --git a/tests/regressiontests/test_runner/tests.py
b/tests/regressiontests/test_runner/tests.py
index 27e18ce..3a8a4ef 100644
--- a/tests/regressiontests/test_runner/tests.py
+++ b/tests/regressiontests/test_runner/tests.py
@@ -296,11 +296,11 @@ class AutoIncrementResetTest(TransactionTestCase):
"tests")
def test_autoincrement_reset1(self):
p = Person.objects.create(first_name='Jack', last_name='Smith')
- self.assertEquals(p.pk, 1)
+ self.assertEqual(p.pk, 1)
@unittest.skipIf(connection.vendor == 'oracle',
"Oracle's auto-increment fields are not reset between "
"tests")
def test_autoincrement_reset2(self):
p = Person.objects.create(first_name='Jack', last_name='Smith')
- self.assertEquals(p.pk, 1)
+ self.assertEqual(p.pk, 1)
diff --git a/tests/regressiontests/utils/feedgenerator.py
b/tests/regressiontests/utils/feedgenerator.py
index 3990896..4f1d078 100644
--- a/tests/regressiontests/utils/feedgenerator.py
+++ b/tests/regressiontests/utils/feedgenerator.py
@@ -100,12 +100,12 @@ def test_rss_mime_type(self):
def test_feed_without_feed_url_gets_rendered_without_atom_link(self):
feed = feedgenerator.Rss201rev2Feed('title', '/link/', 'descr')
- self.assertEquals(feed.feed['feed_url'], None)
+ self.assertEqual(feed.feed['feed_url'], None)
feed_content = feed.writeString('utf-8')
self.assertNotIn('<atom:link href=', feed_content)
def test_feed_with_feed_url_gets_rendered_with_atom_link(self):
feed = feedgenerator.Rss201rev2Feed('title', '/link/', 'descr',
feed_url='/feed/')
- self.assertEquals(feed.feed['feed_url'], '/feed/')
+ self.assertEqual(feed.feed['feed_url'], '/feed/')
feed_content = feed.writeString('utf-8')
self.assertIn('<atom:link href="/feed/" rel="self"></atom:link>',
feed_content)
================================================================
Compare: https://github.com/django/django/compare/b52672d...c0395de
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
