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

396 Commits

Author SHA1 Message Date
Justin Bronn 1efa807703 Fixed #12632 -- Improved performance of `SortedDict`. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13742 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 02:28:16 +00:00
Malcolm Tredinnick 255147c97e Added more readable __str__ and __repr__ methods to MergeDict. 
Thanks, john@calixto.net. Fixed #3508.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-10 19:24:24 +00:00
Russell Keith-Magee 806f3b26f8 Fixed #11021 -- Clarified newline stripping behavior in the truncatewords and truncatewords_html filters. Thanks to Ben Spaulding for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 14:57:24 +00:00
Russell Keith-Magee c4b6edf3b8 Fixed #12746 -- Updated sorting calls to use 'key' instead of 'cmp'. This will be slightly faster in certain circumstances, but more importantly, is a required step for migration to Python 3. Thanks to Martin van Loewis for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-06 16:31:44 +00:00
Karen Tracey adc9458541 Fixed #13653: Fixed django.utils.hashcompat to support running on Python 2.4 with standalone hashlib. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 11:46:03 +00:00
Jannis Leidel 34ddcd9939 Fixed #13547 -- Made sure the ISO 8601 date formatting introduced in r12058 uses "T" as the separator between the date and the time value to increase real world usefulness. 
While the ISO standard permits the use of a space instead of "T" for readability, it does have an impact on standards like HTML5 which rely on specific rules made in RFC 3339.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-16 15:54:10 +00:00
Luke Plant b29b0f8cac Corrected 'name' of functions wrapped with method_decorator 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-13 11:11:27 +00:00
Brian Rosner 47639b6410 Fixed #3469 -- added django.utils documentation for stable bits 
Thanks to Rupe and Ramiro Morales for their initial work on this patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-08 21:38:27 +00:00
Russell Keith-Magee 5211f48ae3 Fixed #12164 -- Removed the Python 2.3 compatibility imports and workarounds. Thanks to timo and claudep for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 14:00:30 +00:00
Russell Keith-Magee 4ca7c4e34d Fixed #13464 -- Reworked module_has_submodule to break the requirement for loader and finder to be the same class. Thanks to Alex Gaynor for the report and patch, and Brett Cannon for suggesting the approach. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13082 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 06:14:47 +00:00
Jannis Leidel 77c13844ae Fixed #11068 - Introduced new language code "nb" for Norwegian Bokmål as a replacement of the current "no". 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-29 14:36:09 +00:00
Russell Keith-Magee 9872badf33 Fixed #13404 -- Reworked module_has_submodule() to allow it to work under AppEngine. Thanks to Waldemar Kornewald for the report and testing help. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-25 13:18:24 +00:00
Russell Keith-Magee ebfe9383bf Fixed #13370 -- Corrected the handling of pickling for lazy() proxy objects. Thanks to Alex Gaynor for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-19 12:40:46 +00:00
Karen Tracey 29341aaffc Fixed #13348: Restored ability to load models from apps in eggs. Thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 18:44:51 +00:00
Russell Keith-Magee 7d25682108 Fixed #13234 -- Rejiggered the imports in the translation utils . Thanks to roklenardic and Spark23 for their reports, and to Alex for his suggestion on a potential fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-29 08:14:57 +00:00
Russell Keith-Magee ad5afd6ed2 Fixed #12769, #12924 -- Corrected the pickling of curried and lazy objects, which was preventing queries with translated or related fields from being pickled. And lo, Alex Gaynor didst slayeth the dragon. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-27 15:54:31 +00:00
Jannis Leidel 10d4094b86 Fixed #13054 - Only apply grouping to integer part of numbers if explicitly wanted. Thanks, Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 15:26:41 +00:00
Russell Keith-Magee be8a1f612d Fixed #12849 -- Corrected the way strings are encoded for display by the colorizer so that they work with unicode. Thanks to jype for the report, and frasern for his work on the issue. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-18 13:24:11 +00:00
Russell Keith-Magee 615eab6b02 Fixed #13093 -- Updated some decorators and the decorator_from_middleware function to allow callable classes to be decorated. Thanks to Brian Neal for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-12 13:06:13 +00:00
Jannis Leidel 0d2a24fd42 Fixed #12779 - Sanitize numeric form field input according to decimal and thousand separator settings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 10:19:24 +00:00
Jannis Leidel 284e7e3cbd Refined changes made in r12546 to also respect the request.LANGUAGE_CODE in case the LocaleMiddleware is used to discover the language preference. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12624 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 10:19:01 +00:00
Karen Tracey 9e95d6f604 Fixed #12302: Modified force_unicode to avoid raising unicode errors when 
handed exceptions with non-ASCII bytestring data and no working unicode method
under Python 2.6 and higher.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@12621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-28 15:18:03 +00:00
Joseph Kocherhans c8cd8b80aa Fixed #12119. Changed smart_split to stop splitting on whitespace in quotes. Thanks, emulbreh. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 20:52:14 +00:00
Jannis Leidel 2164e138e3 Fixed #5691 - Adds the active language to the cache key. Thanks, Antoni Aloy, Ramiro Morales and Yann Malet. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 20:45:28 +00:00
Joseph Kocherhans b3d20ade47 Fixed #12820. Implemented other dict methods for MergeDict. Thanks, Gisle Aas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 23:38:18 +00:00
Jannis Leidel 12d40a9fd6 Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:17:17 +00:00
Jannis Leidel 16942e178f Removed Python 2.3 compat code in translation framework. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:16:01 +00:00
Jannis Leidel 71da5f62da Fixed #7720 - Fallback to the base language if the sub language given in the language cookie doesn't exist. Thanks, djoume and Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:13:48 +00:00
Jacob Kaplan-Moss 76afc30229 Fixed a couple Python 2.4 incompatibilities. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-14 20:29:42 +00:00
Jacob Kaplan-Moss 1d078be448 Fixed #6799 - added an `end_text` argument to `truncate_words`/`truncate_html_words`. 
This allows customizing the standard "..." end text. Yes, this is technically a
feature sneaking in after the deadline, but I just couldn't bring myself to punt
it again: we already used that excuse for not getting it into 1.1.

Thanks to Adam Fast and Travis Cline for work on this patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-14 18:36:48 +00:00
Russell Keith-Magee 0e5836dc07 Fixed #12613 -- Added Q and Z to the list of characters supported by the phone2numeric filter. Thanks to gabrielhurley for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 14:36:21 +00:00
Russell Keith-Magee 03924929ba Fixed #12524 -- Clarified handling of pre-1000AD dates in datetime_safe (and thus, the serializers). Patch includes moving the datetime_safe tests into the utils regressiontests module. Thanks to gsf for the report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 14:02:32 +00:00
Luke Plant 4bff194633 Fixed #12804 - regression with decorating admin views. 
This is a BACKWARDS INCOMPATIBLE change, because it removes the flawed
'auto_adapt_to_methods' decorator, and replaces it with 'method_decorator'
which must be applied manually when necessary, as described in the 1.2
release notes.

For users of 1.1 and 1.0, this affects the decorators:

 * login_required
 * permission_required
 * user_passes_test

For those following trunk, this also affects:

 * csrf_protect
 * anything created with decorator_from_middleware 

If a decorator does not depend on the signature of the function it is
supposed to decorate (for example if it only does post-processing of the
result), it will not be affected.
 



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-09 15:02:39 +00:00
Jannis Leidel a28bd76bb6 Fixed #12777 - Localize decimal fields correctly. Thanks, Florian Apolloner 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-05 00:44:35 +00:00
Russell Keith-Magee c4c27d8a04 Fixed #6188, #6304, #6618, #6969, #8758, #8989, #10334, #11069, #11973 and #12403 -- Modified the syndication framework to use class-based views. Thanks to Ben Firshman for his work on this patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-28 13:46:18 +00:00
Russell Keith-Magee e71b10efb7 Added color configuration for HTTP 304, since it doesn't require as much attention as other 3XX codes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-23 17:26:56 +00:00
Adrian Holovaty 5ceed0a053 Changed a whole bunch of places to raise exception instances instead of old-style raising exception classes plus a comma. Good for the future Python 3 conversion 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-10 18:36:20 +00:00
Adrian Holovaty a7dc2c0653 Fixed #10979 -- Fixed misleading FixedOffset.__repr__(). Thanks, gsong 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-10 17:28:20 +00:00
Luke Plant bcef28349a Fixed #12506 - 'lazy' fails when there are multiple expected classes with the same method 
Thanks to Alex for report and patch



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-05 12:06:45 +00:00
Russell Keith-Magee 77e27e7de7 Fixed #7679 -- Added (configurable) highlighting colors to the development server. Thanks to Rob Hudson, hunteke, and Bastian Kleineidam for the various patches that contributed to the final result. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-04 12:16:09 +00:00
Gary Wilson Jr a5fc65b46e Fixed #12445 -- Added ' (single quote), @ (at sign), and ~ (tilde) to safe characters in `iri_to_uri` function. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12066 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-03 18:06:27 +00:00
Russell Keith-Magee 0aa12da000 Fixed #12476 -- Forced the rollout of generators passed to SortedDict so that the data source can be read twice. Thanks to gsf for the report, and Alex for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12064 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-03 06:54:56 +00:00
Jannis Leidel d981cb4e66 Fixed #7262 - Added ISO 8601 and microsecond format string to utils.dateformat. Thanks zegor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-01 21:39:26 +00:00
Jannis Leidel ac371ccac8 Fixed #12435 - Handle Unicode characters in format strings correctly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-01 21:38:58 +00:00
Jannis Leidel 855e805b4c Fixed #12230 - Updated utils.translation.to_locale to support the special sr_Latn locale. Thanks to Janos Guljas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-01 21:38:34 +00:00
Jannis Leidel 20fbba7f90 Fixed #12472 - Correctly show TimeFields values when using locale-aware formatting. Thanks to Ramiro Morales for providing the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-01 21:36:36 +00:00
Jannis Leidel fa0653cd1d Fixed #12454 - Added support for localized formats to admin date and time widgets. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-30 22:12:16 +00:00
Jannis Leidel bf33d3eb1d Fixed #12444 - Date based widgets now correctly handle input values when using locale-aware formatting. Also fixes #7656. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-30 22:11:48 +00:00
Russell Keith-Magee c38d66a216 Fixed #12112 -- Made the colors used by syntax highlighting customizable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-28 06:48:47 +00:00
Jannis Leidel 9233d04265 Fixed #7980 - Improved i18n framework to support locale aware formatting (dates and numbers) and form processing. 
Thanks to Marc Garcia for working on this during his Google Summer of Code 2009!

Additionally fixes #1061, #2203, #3940, #5526, #6449, #6231, #6693, #6783, #9366 and #10891.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 17:58:49 +00:00