Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Cleaned whitespace errors introduced in previous commit

  • Loading branch information...
commit a035d9d6502c824155783dd74f88912ba2dffd9b 1 parent b6d533a
Anssi Kääriäinen akaariai authored
8 django/contrib/contenttypes/tests.py
View
@@ -151,14 +151,14 @@ def test_get_for_concrete_model(self):
self.assertEqual(concrete_model_ct,
ContentType.objects.get_for_model(DeferredConcreteModel,
for_concrete_model=False))
-
+
self.assertEqual(concrete_model_ct,
ContentType.objects.get_for_model(DeferredProxyModel))
self.assertEqual(proxy_model_ct,
ContentType.objects.get_for_model(DeferredProxyModel,
for_concrete_model=False))
-
+
def test_get_for_concrete_models(self):
"""
Make sure the `for_concrete_models` kwarg correctly works
@@ -185,7 +185,7 @@ def test_get_for_concrete_models(self):
ConcreteModel.objects.create(name="Concrete")
DeferredConcreteModel = ConcreteModel.objects.only('pk').get().__class__
DeferredProxyModel = ProxyModel.objects.only('pk').get().__class__
-
+
cts = ContentType.objects.get_for_models(DeferredConcreteModel,
DeferredProxyModel)
self.assertEqual(cts, {
@@ -200,7 +200,7 @@ def test_get_for_concrete_models(self):
DeferredConcreteModel: concrete_model_ct,
DeferredProxyModel: proxy_model_ct,
})
-
+
def test_shortcut_view(self):
"""
16 docs/ref/contrib/contenttypes.txt
View
@@ -226,15 +226,15 @@ lookup::
.. versionadded:: 1.5
-Prior to Django 1.5 :meth:`~ContentTypeManager.get_for_model()` and
-:meth:`~ContentTypeManager.get_for_models()` always returned the
-:class:`~django.contrib.contenttypes.models.ContentType` associated with the
-concrete model of the specified one(s). That means there was no way to retreive
-the :class:`~django.contrib.contenttypes.models.ContentType` of a proxy model
-using those methods. As of Django 1.5 you can now pass a boolean flag –
+Prior to Django 1.5 :meth:`~ContentTypeManager.get_for_model()` and
+:meth:`~ContentTypeManager.get_for_models()` always returned the
+:class:`~django.contrib.contenttypes.models.ContentType` associated with the
+concrete model of the specified one(s). That means there was no way to retreive
+the :class:`~django.contrib.contenttypes.models.ContentType` of a proxy model
+using those methods. As of Django 1.5 you can now pass a boolean flag –
respectively ``for_concrete_model`` and ``for_concrete_models`` – to specify
-wether or not you want to retreive the
-:class:`~django.contrib.contenttypes.models.ContentType` for the concrete or
+wether or not you want to retreive the
+:class:`~django.contrib.contenttypes.models.ContentType` for the concrete or
direct model.
Generic relations
8 docs/releases/1.5.txt
View
@@ -72,11 +72,11 @@ tag's content.
Retreival of ``ContentType`` instances associated with proxy models
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The methods :meth:`ContentTypeManager.get_for_model() <django.contrib.contenttypes.models.ContentTypeManager.get_for_model()>`
-and :meth:`ContentTypeManager.get_for_models() <django.contrib.contenttypes.models.ContentTypeManager.get_for_models()>`
-have a new keyword argument – respectively ``for_concrete_model`` and ``for_concrete_models``.
+The methods :meth:`ContentTypeManager.get_for_model() <django.contrib.contenttypes.models.ContentTypeManager.get_for_model()>`
+and :meth:`ContentTypeManager.get_for_models() <django.contrib.contenttypes.models.ContentTypeManager.get_for_models()>`
+have a new keyword argument – respectively ``for_concrete_model`` and ``for_concrete_models``.
By passing ``False`` using this argument it is now possible to retreive the
-:class:`ContentType <django.contrib.contenttypes.models.ContentType>`
+:class:`ContentType <django.contrib.contenttypes.models.ContentType>`
associated with proxy models.
Minor features
Please sign in to comment.
Something went wrong with that request. Please try again.