mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
Code Issues 30 Releases Wiki Activity
10,771 Commits 28 Branches 426 Tags 668 MiB
0f8f46802a
Commit Graph

36 Commits

Author SHA1 Message Date
Ramiro Morales
326949e444 Fixed #14503 -- Unified multiple implementations of test cases assert* methods that verify a given exception is raised by a callable throughout the Django test suite. 
Replaced them with a new assertRaisesMessage method of a new SimpleTestCase, a lightweight subclass of unittest.TestCase. Both are also available for usage in user tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-13 00:42:08 +00:00
Jannis Leidel
02dcbe3317 Fixed #11559 -- Fixed the URL resolver to be able to handle captured parameters in parent URLconfs when also using namespaces. Thanks, cwb, ungenio and hvdklauw. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:15:50 +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
b4cdf4d111 Fixed #10802 -- Handle ImportErrors and AttributeErrors gracefully when raised by the URL resolver system during startup. Many thanks, IonelMaries and Bas Peschier. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-16 16:41:14 +00:00
Jannis Leidel
ae3fec0da8 Fixed minor typo in tests introduced in r16121. Refs #5925. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-12 13:24:07 +00:00
Jannis Leidel
fe96214939 Fixed #13154 -- Fixed the URL resolver's reverse() to match the behavior of its resolve() with regard to the default kwargs. Many thanks to patrys. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 16:59:25 +00:00
Jannis Leidel
e99fa0c47f Added file forgotten in r16121. Refs #5925. Thanks, Julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-29 12:03:02 +00:00
Jannis Leidel
79afd55278 Fixed #5925 -- Added new lazily evaluated version of django.core.urlresolvers.reverse. Thanks, SmileyChris, Preston Timmons and Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-29 11:49:59 +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
7ff5580d95 Fixed #14389, #9666 -- Started the migration path to make the first argument to url and ssi template tags syntactically consistent with other tags. Thanks to Sean Brant for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-20 06:22:28 +00:00
Russell Keith-Magee
121d2e3678 Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 12:55:17 +00:00
Russell Keith-Magee
36ac6f1fb9 Migrated urlpatterns_reverse doctests. Thanks to Stephan Jaekel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13893 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-27 15:16:46 +00:00
Malcolm Tredinnick
882cba0f69 Debug 404 page now displays names of URL patterns, if they exist. 
Thanks to Tobias McNulty for the patch. Fixed #9310.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 19:27:33 +00:00
Russell Keith-Magee
01720c979a Added file missing from r13590. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-14 15:50:46 +00:00
Russell Keith-Magee
859fc020a7 Fixed #5350 -- Added fallback to default 404/500 handlers when they're not explicitly specified (or imported) in a urls.py file. Thanks to Thomas Güttler for the report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-14 14:27:35 +00:00
Russell Keith-Magee
f90a25551d Fixed #14027 -- Ensure that reverse() raises an exception when you try to reverse None. Thanks to Alex for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-06 14:34:10 +00:00
Russell Keith-Magee
69d1e71fad Corrected [13479], accounting for unnamed urls that are instances of classes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-06 13:47:56 +00:00
Russell Keith-Magee
e0fb90b2f3 Fixed #13922 -- Updated resolve() to support namespaces. Thanks to Nowell Strite for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-05 07:09:47 +00:00
Russell Keith-Magee
667ced2abc Fixed #12594 -- Ensured that a meaningful exception is raised when the urlconf_module is None. Thanks to buriy for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-26 15:08:24 +00:00
Adrian Holovaty
2ef52d0ce2 Fixed #11960 -- Improved error message for redirects. Thanks, mattmcc 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-10 18:44:39 +00:00
Jacob Kaplan-Moss
1c5fe467bd Fixed #10326: handler500 and handler404 may now be callables. Thanks, dcwatson, adurdin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-13 20:29:04 +00:00
Brian Rosner
6c61ca3d74 Fixed #5034 -- honor request.urlconf in reverse and resolve. 
This enables {% url %} to honor request.urlconf set from process_request
middleware methods.

Thanks SmileyChris for the initial patch work.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-16 01:58:00 +00:00
Russell Keith-Magee
8d48eaa064 Fixed #10061 -- Added namespacing for named URLs - most importantly, for the admin site, where the absence of this facility was causing problems. Thanks to the many people who contributed to and helped review this patch. 
This change is backwards incompatible for anyone that is using the named URLs
introduced in [9739]. Any usage of the old admin_XXX names need to be modified
to use the new namespaced format; in many cases this will be as simple as a
search & replace for "admin_" -> "admin:". See the docs for more details on
the new URL names, and the namespace resolution strategy.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-16 16:16:13 +00:00
Russell Keith-Magee
735309341e Fixed #10834 -- Added bucket condition to ensure that URL resolvers won't ever return None. Thanks to Chris Cahoon for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11120 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-29 14:02:17 +00:00
Russell Keith-Magee
ff166a3cdc Fixed #10065 -- Corrected an error message when an empty urlpattern object is provided. Thanks to Matthew Flanagan for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-04 06:54:56 +00:00
Jacob Kaplan-Moss
d7e8127524 Fixed #10194: added django.shortcuts.redirect, a do-what-I-mean redirect shortcut. See the docs at topics/http/shortcuts for details. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-21 13:09:13 +00:00
Jacob Kaplan-Moss
c01098e9cb In urlconfs, include() may now be used on an iterable of patterns instead of just a module string. Refs #6470 -- making the admin use a urlconf is much easier with this work done. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-10 22:54:20 +00:00
Malcolm Tredinnick
37ee86b7ee Fixed another case of reverse URL resolving that wasn't working. 
This is a similar situation to that fixed in r9087. We weren't merging
multiple levels of include() calls together correctly.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-30 05:52:35 +00:00
Malcolm Tredinnick
15b0158e39 Fixed #9038 -- Correctly handle URL patterns with the same name (or view name), 
declared independently and that differ only by argument signatures.

Patch from Russell Keith-Magee.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-27 06:14:11 +00:00
Malcolm Tredinnick
a9465a75de Fixed a case of incorrect parsing of quanitifers in reg-exp patterns. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 23:03:03 +00:00
Malcolm Tredinnick
e1ea7014ad Fixed #8725 -- Handle empty URL patterns in reverse(). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 17:20:40 +00:00
Malcolm Tredinnick
a63a83e5d8 A rewrite of the reverse URL parsing: the reverse() call and the "url" template tag. 
This is fully backwards compatible, but it fixes a bunch of little bugs. Thanks
to SmileyChris and Ilya Semenov for some early patches in this area that were
incorporated into this change.

Fixed #2977, #4915, #6934, #7206.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 11:11:20 +00:00
Malcolm Tredinnick
5deb4fcbb9 Revert [7849] and [7850]. Brain failure on my part. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-06 14:20:30 +00:00
Malcolm Tredinnick
c88e55b4fe Some tests for the new features. These pretty much fail at the moment. Based on 
SmileyChris's original work.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-06 14:16:43 +00:00
Adrian Holovaty
e073861332 Fixed #6831 -- Reverse URL resolver now replaces backslashes correctly. Thanks, Bastian Kleineidam 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 04:16:21 +00:00
Russell Keith-Magee
97b9ad73b4 Refs #2333 - Modified runtests script to use new testing framework. Migrated existing tests to use Django testing framework. All the 'othertests' have been migrated into 'regressiontests', and converted into doctests/unittests, as appropriate. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-27 13:59:47 +00:00