* needs_better_patch: 0 => 1
* easy: => 0
Comment:
django-13559.patch fails to apply cleanly on to trunk
--
Ticket URL: <http://code.djangoproject.com/ticket/13559#comment:9>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.
* cc: min@… (added)
* ui_ux: => 0
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:10>
* cc: tonnzor (added)
Comment:
Joshua Ginsberg, could you please update your patch to match current
trunk?
I got no luck applying it to the revision given in patch file as well..
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:12>
Comment (by hop):
I updated the patch to apply against current trunk.
Had to fix the unit test as well, but I'm not entirely sure it's OK.
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:13>
* needs_better_patch: 1 => 0
* easy: 0 => 1
Comment:
Thanks, '''hop'''!
'''patchhammer''', could you apply the patch over trunk?
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:14>
* cc: hop (added)
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:15>
* owner: nobody => krzysiumed
* cc: krzysiumed@… (added)
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:16>
* easy: 1 => 0
Comment:
I did some minor changes in hop's patch:
- Repaired a few broken links at
[[https://docs.djangoproject.com/en/dev/ref/contrib/sites/|/ref/contrib/sites.txt]]
doc.
- Added note at [[https://docs.djangoproject.com/en/1.4/ref/settings
/#template-context-processors|/ref/settings/#template-context-
processors]].
- Sites tests used [[https://docs.djangoproject.com/en/1.4/ref/generic-
views/#django-views-generic-simple-direct-to-
template|django.views.generic.simple.direct_to_template]]
function which comes from old function-based generic views which
were permanently deleted. This made some tests broken.
[[https://docs.djangoproject.com/en/dev/ref/class-based-
views/base/#django.views.generic.base.TemplateView|django.view.generic.TemplateView]]
is used now and all tests pass.
- Refactored context processors' tests -- joined `ContextProcessorTest`
and `RequestSiteContextTest`, tests use
[[https://docs.djangoproject.com/en/dev/topics/testing/?from=olddocs
#overriding-settings|django.test.utils.override_settings]] instead of
overriding settings
in `setUp` and `tearDown`.
- Formatted in PEP8 style.
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:17>
* status: new => assigned
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:18>
Comment (by aaugustin):
#17005 is about adding a middleware for the same purpose in views.
With that middleware and the request context processor, the current site
will be available in {{ request.site }}, but that doesn't rule out a
specific context processor in case you don't want the site middleware or
the request context processor.
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:19>
* owner: krzysiumed => chrismedrela
Comment:
I've updated the patch: https://github.com/django/django/pull/1938. BTW,
krzysiumed is my old nick.
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:20>
* needs_better_patch: 0 => 1
Comment:
See my comments on the pull request.
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:21>
* needs_better_patch: 1 => 0
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:22>
* needs_better_patch: 0 => 1
Comment:
I left comments for improvement on PR. Please uncheck "Patch needs
improvement" when you update it, thanks.
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:23>
* owner: chrismedrela => (none)
* status: assigned => new
--
Ticket URL: <https://code.djangoproject.com/ticket/13559#comment:24>