innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
12,491 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

47 Commits

Author SHA1 Message Date
Aymeric Augustin ee191715ea [py3] Fixed access to dict keys/values/items. 2012-08-07 12:00:22 +02:00
Aymeric Augustin 0d914d08a0 [py3] Updated urllib/urllib2/urlparse imports. 
Lots of functions were moved. Use explicit imports in all cases
to keey it easy to identify where the functions come from.
 2012-07-22 09:29:55 +02:00
Claude Paroz 2c2c8a6326 Isolated sitemaps test from ABSOLUTE_URL_OVERRIDES 
Refs #15988.
 2012-06-30 18:50:28 +02:00
Claude Paroz 4a103086d5 Fixed #18269 -- Applied unicode_literals for Python 3 compatibility. 
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
 2012-06-07 18:08:47 +02:00
Claude Paroz 7676d6e764 Made sitemaps tests use override_settings. Refs #14478 2012-06-02 21:24:18 +02:00
Aymeric Augustin eb163f37cb Use the class decorator syntax available in Python >= 2.6. Refs #17965. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 09:08:29 +00:00
Jannis Leidel 75a9c8a5ef Fixed #10793 -- Stopped caching paginator instances in sitemap classes to prevent stale sitemaps. Thanks, gnosek, krzysiumed and adam_przybyla. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:56:49 +00:00
Adrian Holovaty 6ecadcbdd2 Made a bunch more edits up until [17418] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-03 20:45:45 +00:00
Aymeric Augustin a4b472dd80 Fixed #8995 -- Added support for HTTPS in sitemaps. 
Modularized tests and did a bit of cleanup while I was in the area.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17409 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-29 19:24:32 +00:00
Aymeric Augustin 123f567093 Fixed #2713 -- Made the name of the sitemap view a parameter of the sitemap index view, in order to allow decorators. Also cleaned up code in the area and removed redundant comments from the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-29 09:30:28 +00:00
Adrian Holovaty 8767439af4 Converted some of the built-in views to use content_type instead of mimetype HttpResponse argument. Refs #16519 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-17 03:53:25 +00:00
Aymeric Augustin 06d9b82a27 Fixed #16906 -- Format datetimes with str/unicode instead of strftime where possible: it's faster and it works for all dates. 
Also ensured that datetime_safe is used wherever strftime is called on dates/datetimes that may be before 1900.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@16978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 19:23:45 +00:00
Ramiro Morales 26b8122087 Fixed #14675 -- Completed removal of `from django.conf.urls.default import *` usage. 
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 22:36:16 +00:00
Jannis Leidel 24f4764a48 Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for the work on the patch and Alex for reviewing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-13 09:35:51 +00:00
Jannis Leidel 54552ee29f Fixed #16175 -- Modified the sitemaps views to return TemplateResponse instances for easier customization. Thanks, mat. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-28 10:17:01 +00:00
Jannis Leidel 60f0421ed3 Fixed #12347 -- Added a mimetype option to sitemaps views to further customize the output of the view, e.g. to support Yahoo's plain text urllist format. Thanks, afurlan. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-28 10:16:47 +00:00
Jannis Leidel 3fe0c69332 Fixed #10907, #14190 and #15829 -- Pass item to sitemaps template to allow further customization like Google News enabled sitemaps. Thanks, manfre and lakinwecker. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-28 10:16:34 +00:00
Russell Keith-Magee afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 15:04:39 +00:00
Russell Keith-Magee 7a60b41130 Fixed #15111 -- Ensured that the auth, contenttypes and sitemaps tests will run when the sites app isn't installed. Thanks to Waldemar Kornewald for the report and draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-05 03:49:03 +00:00
Jannis Leidel 8dfd3dfd49 Fixed #14805 -- Capitalize "Google" in sitemaps docs. Thanks, Adam. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:56:52 +00:00
Jannis Leidel d0257a1558 Fixed #14041 -- Added ability to override the template of the sitemaps views. Thanks, julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:56:29 +00:00
Russell Keith-Magee 23a19240da Fixed #14833 -- Skip the sitemaps localization test if i18n isn't enabled. Thanks to Julien Phalip for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-05 02:07:46 +00:00
Russell Keith-Magee 03f00bcd42 Fixed #14447 -- Modified the auth and sitemaps tests to remove some assumptions about the environment in which the tests are run. Thanks to Gabriel Hurley for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 07:15:47 +00:00
Luke Plant e0ec458360 Fixed #14433 - replaced a thread-unsafe solution to #10235 introduced in [13980] 
This patch also addresses sitemap code found in contrib/gis, which [13980]
did not.

Thanks to gabrielhurley for the initial patch.

Refs #10235, #14386

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 14:34:42 +00:00
Alex Gaynor 5e5be2c44c Fixed #14279 -- Corrected a typo in the sitemaps tests (didn't affect the passage of the test). Thanks to jamesodo for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 03:39:02 +00:00
Russell Keith-Magee 03e7d64de4 Ensure that the sitemaps test deactivates it's locale, so that subsequent tests aren't run in French. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 14:36:18 +00:00
Luke Plant 667d832e90 Fixed #14386, #8960, #10235, #10909, #10608, #13845, #14377 - standardize Site/RequestSite usage in various places. 
Many thanks to gabrielhurley for putting most of this together.  Also to
bmihelac, arthurk, qingfeng, hvendelbo, petr.pulc@s-cape.cz, Hraban for
reports and some initial patches.

The patch also contains some whitespace/PEP8 fixes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-04 14:20:47 +00:00
Karen Tracey 5912903852 Fixed #11358: Don't include private flatpages in sitemap. Thanks dburke and mlavin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-10 23:30:46 +00:00
Russell Keith-Magee 0de3e7a756 Fixed #14198 -- Corrected rendering of generic sitemaps when no priority is specified. Thanks to palkeo for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-30 15:09:12 +00:00
Russell Keith-Magee a5c80a28dc Added a missing (empty) models.py file required for the tests from r13644 to actually run. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-30 12:32:26 +00:00
Russell Keith-Magee 46fab8983e Fixed #14164 -- Ensure that sitemap priorities aren't rendered with localized numerical formats. Thanks to dokterbob for the report, and vung for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-27 15:16:04 +00:00
Adrian Holovaty 660180df30 Fixed #8574 -- Made Sitemap a new-style class 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-17 04:56:04 +00:00
Adrian Holovaty 6bdb7b9529 Fixed #8172 -- Improved a whole bunch of contrib templates (admin, databrowse, admindocs, etc.) to remove unnecessary 'escape' filters, given autoescaping. Also removed unnecessary {% if %} tags and shortened some {% if %}/{% else %} tags to use {% firstof %}. Thanks for the patch, benspaulding 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-08 05:19:28 +00:00
Malcolm Tredinnick 90b6e1438f Fixed #8020 -- Fixed paginator initialisation in sitemaps framework. Thanks, 
John D'Agostino.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 15:40:31 +00:00
Malcolm Tredinnick badde8a7e5 Fixed #7793 -- Handle sitemaps with more than 50,000 URLs in them (by using 
pagination). Patch from Julian Bez.

The docs patch here could probably do with some rewording.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 05:07:16 +00:00
Russell Keith-Magee 508016c0f4 Fixed #7914 -- Added some missing __init__.py files that were missed when the ping_google command was added. Thanks to bernd for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-23 14:15:03 +00:00
Malcolm Tredinnick ef76102e89 Fixed #7185 -- Added a "ping_google" management command to 
django.contrib.sitemaps. Thanks, Pete Shinners.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-01 12:25:59 +00:00
Malcolm Tredinnick 356662cf74 Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359 
See documentation in templates.txt and templates_python.txt for how everything
works.

Backwards incompatible if you're inserting raw HTML output via template variables.

Based on an original design from Simon Willison and with debugging help from Michael Radziej.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-14 12:58:53 +00:00
Malcolm Tredinnick 953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully 
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-04 12:11:04 +00:00
Adrian Holovaty 03966f077b Fixed #4348 -- Updated Google sitemap ping code. Thanks, marijn 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-20 20:47:18 +00:00
Malcolm Tredinnick 439cb4047f Fixed #4040 -- Changed uses of has_key() to "in". Slight performance 
improvement and forward-compatible with future Python releases. Patch from Gary
Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-26 13:30:48 +00:00
Russell Keith-Magee 939ee97d4d Fixed #3106 -- Typo in sitemap ping_google method. Thanks, Bastian Kleineidam. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-12-07 00:02:02 +00:00
Adrian Holovaty 6b7cd79e83 Fixed #3061 -- Fixed wrong schema URL in sitemap_index.xml template. Thanks, Mateusz Pawlik and John D'Agostino 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-25 05:20:14 +00:00
Adrian Holovaty f759dac2c9 Fixed #3033 -- Extended django.contrib.sitemaps to support new, generic sitemap protocol rather than Google's proprietary version. Thanks, Petar Marić 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-20 16:32:40 +00:00
Adrian Holovaty 96f0b7bd21 Fixed #2805 -- Removed some whitespace from the two sitemap XML templates. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-26 16:27:24 +00:00
Adrian Holovaty 5a1d560fb3 Fixed #2643 -- Fixed incorrect reverse() view names in sitemaps contrib app. Thanks for the patch, dummy@habmalnefrage.de 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-02 18:10:00 +00:00
Adrian Holovaty 60ebb616a9 Renamed django.contrib.sitemap to django.contrib.sitemaps, to be more consistent with our plural form for these sorts of things. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-31 23:44:26 +00:00