Skip to content

Commit

Permalink
Add select_related to Post queries
Browse files Browse the repository at this point in the history
Remove unneeded compat.py.
  • Loading branch information
grahamu committed Jan 9, 2018
1 parent de27851 commit 803afa0
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 19 deletions.
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Expand Up @@ -98,7 +98,6 @@ Here is an example of these rules applied:
from tagging.fields import TagField
# fourth set of imports are local apps
from .compat import reverse
from .fields import MarkupField
Expand Down
16 changes: 8 additions & 8 deletions README.md
Expand Up @@ -86,19 +86,19 @@ To install pinax-blog:
Add `pinax.blog` to your `INSTALLED_APPS` setting:

```python
INSTALLED_APPS = [
# other apps
"pinax.blog",
]
INSTALLED_APPS = [
# other apps
"pinax.blog",
]
```

Add `pinax.blog.urls` to your project urlpatterns:

```python
urlpatterns = [
# other urls
url(r"^blog/", include("pinax.blog.urls", namespace="pinax_blog")),
]
urlpatterns = [
# other urls
url(r"^blog/", include("pinax.blog.urls", namespace="pinax_blog")),
]
```

Optionally, if you want `creole` support for a mark up choice:
Expand Down
4 changes: 0 additions & 4 deletions pinax/blog/compat.py

This file was deleted.

2 changes: 1 addition & 1 deletion pinax/blog/models.py
Expand Up @@ -2,6 +2,7 @@
from random import choice

from django.db import models
from django.urls import reverse
from django.utils import timezone
from django.utils.encoding import python_2_unicode_compatible
from django.utils.html import strip_tags
Expand All @@ -10,7 +11,6 @@
import pytz
from pinax.images.models import ImageSet

from .compat import reverse
from .conf import settings
from .hooks import hookset
from .managers import PostManager
Expand Down
2 changes: 1 addition & 1 deletion pinax/blog/tests/tests.py
Expand Up @@ -6,9 +6,9 @@
from django.core.exceptions import ValidationError
from django.http.request import HttpRequest
from django.test import TestCase
from django.urls import reverse
from django.utils.text import slugify

from ..compat import reverse
from ..context_processors import scoped
from ..models import Blog, Post, Section

Expand Down
9 changes: 6 additions & 3 deletions pinax/blog/views.py
Expand Up @@ -6,6 +6,7 @@
from django.http import Http404, HttpResponse, JsonResponse
from django.shortcuts import get_object_or_404, redirect
from django.template.loader import render_to_string
from django.urls import reverse
from django.views.decorators.http import require_POST
from django.views.generic import (
CreateView,
Expand All @@ -16,7 +17,6 @@
)
from django.views.generic.dates import DateDetailView

from .compat import reverse
from .conf import settings
from .forms import PostForm
from .hooks import hookset
Expand Down Expand Up @@ -58,7 +58,7 @@ def search(self, posts):

def get_queryset(self):
blog = hookset.get_blog(**self.kwargs)
qs = Post.objects.current().filter(blog=blog)
qs = Post.objects.current().filter(blog=blog).select_related("section", "blog")
return self.search(qs)


Expand Down Expand Up @@ -165,7 +165,10 @@ def blog_feed(request, **kwargs):
scoper_lookup = kwargs.get(settings.PINAX_BLOG_SCOPING_URL_VAR, None)

blog = hookset.get_blog(**kwargs)
posts = Post.objects.published().filter(blog=blog).order_by("-updated")
posts = (Post.objects.published()
.filter(blog=blog)
.order_by("-updated")
.select_related("section", "blog"))

blog_url_kwargs = {}
if scoper_lookup is not None:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -97,11 +97,11 @@
install_requires=[
"django>=1.11",
"django-appconf>=1.0.1",
"pinax-images>=3.0.0",
"pytz>=2016.6.1",
"Pillow>=3.0.0",
"Markdown>=2.6.5",
"Pygments>=2.0.2",
"pinax-images>=3.0.0",
],
tests_require=[
"pinax-theme-bootstrap>=7.4.0",
Expand Down

0 comments on commit 803afa0

Please sign in to comment.