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

128 Commits

Author SHA1 Message Date
Jacob Kaplan-Moss 5b66c74b32 Fixed #2620: made MergeDict.get() correctly work with the two-argument form of get(). Thanks for the patch, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-25 16:37:31 +00:00
Malcolm Tredinnick 6c4757729b Revert [4485] in order to fix accidental mod_python breakage. Refs #2920. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-11 23:50:35 +00:00
Russell Keith-Magee 0e924c70b1 Refs #2920 -- Replaced implicit uses of _() with explicit imports or calls to gettext(). At some point post 0.96, we need to remove the calls that put _ into the builtins. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-11 06:20:52 +00:00
Malcolm Tredinnick 937f3190ba Fixed #2762 -- added copyright element support to RSS and Atom feeds. Patch 
from Jonathan Buchanan.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-10 08:36:39 +00:00
Malcolm Tredinnick 5a0b72a6eb Fixed #2027 -- added truncatewords_html filter that respects HTML tags whilst 
truncating. Patch from SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-10 02:51:27 +00:00
Jacob Kaplan-Moss 695302ce92 Fixed #3320: upgraded django.utils.simplejson to simplejson version 1.5. Thanks, Lawrence Oluyede. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-01-30 22:34:15 +00:00
Adrian Holovaty c770803f72 Added SortedDict.value_for_index() method in django.utils.datastructures 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-01-21 00:06:55 +00:00
Adrian Holovaty 3f4d6a2dda Changed dateformat 'M' to use MONTHS_3 instead of MONTHS, for better support of translations 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-12-18 16:16:12 +00:00
Jacob Kaplan-Moss 5efb9272e2 Vastly improved performance of django.utils.text.wrap. Thanks to GvR for the impetus and Micael Radziej for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-12-15 19:05:57 +00:00
Malcolm Tredinnick e149c8bb87 Fixed #2823 -- Fixed Python 2.3 compatibility problem pointed out by Alex Dedul. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-26 10:08:03 +00:00
Malcolm Tredinnick a27f12f388 Fixed #2265 -- Fixed problem with using iterators for "choices" attribute. 
Thanks, Alex Dedul.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-26 06:33:32 +00:00
Malcolm Tredinnick b05e5501a4 Fixed #2677 -- Removed the need to import sre and hence avoid a 
DeprecationWarning. Thanks, Tom Tobin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-24 11:44:04 +00:00
Malcolm Tredinnick 35a13d4b6b Fixed #2791 -- Added __contains__ method (for "a in dict" checks) to MergeDict. 
Thanks, Ned Batchelder.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-23 13:55:04 +00:00
Malcolm Tredinnick 4b5f0e2c87 Fixed #2657 -- Made some tweaks to Javascript quoting. Thanks, Alex Dedul. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-22 02:22:58 +00:00
Adrian Holovaty 8aa6a94e1a Renamed 'func' argument in django.utils.functional.curry to reduce possibility that it will clash with a keyword argument name. Thanks for pointing this out, Michael Spencer 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-07 18:26:00 +00:00
Adrian Holovaty 29ba3e337b Optimized django.utils.functional.curry. Thanks for the patch, Martin Glueck 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-07 04:21:11 +00:00
Adrian Holovaty 1d8db5ad89 Fixed #2441 -- Improved MultiValueDict.update() to take keyword args, like Python 2.4 built-in dict. Thanks for the patch, Pete Shinners 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-31 21:51:19 +00:00
Adrian Holovaty 1bf811e28d Fixed #2330 -- Added hack to stop KeyErrors from being thrown by the autoreloading development server if USE_I18N=False 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-28 22:13:34 +00:00
Adrian Holovaty e433e07a8d Fixed #2408 -- Added get_language_from_request() to trans_null.py. Thanks, ubernostrum 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3458 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-27 16:38:32 +00:00
Jacob Kaplan-Moss a926046ba6 Second half of little cleanup tweaks suggested by pyflakes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-21 20:39:17 +00:00
Adrian Holovaty dba1f95e12 Added check_for_language and to_locale to utils.translation.trans_null 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-14 02:55:42 +00:00
Adrian Holovaty 78adbd9434 Added get_language_bidi to django.utils.translation.trans_nuill. Refs #2203 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-11 14:08:42 +00:00
Adrian Holovaty 5ce4a56a7c Fixed bug in utils.translation.trans_null -- get_date_formats and get_partial_date_formats weren't returning tuples properly 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-10 04:08:45 +00:00
Adrian Holovaty 18eb7ecb13 Fixed #2310 -- Changed trans_null.py to use settings.LANGUAGE_CODE instead of hard-coded 'en' 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-08 13:58:33 +00:00
Adrian Holovaty de9630c60e Fixed #2258 -- Accounted for the case of a missing threading library in django.utils.synch. Thanks, scott@clued-in.co.uk 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3286 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-07 04:07:41 +00:00
Adrian Holovaty ec4a143a40 Made django/utils/translation.py into a package django/utils/translation, which is loaded lazily depending on the value of settings.USE_I18N. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-04 03:58:45 +00:00
Jacob Kaplan-Moss f44e7acb17 Added Bob Ippolito's simplejson (http://undefined.org/python/#simplejson) as {{{django.auth.simplejson}}}. This is version 1.3 of simplejson. Thanks to Bob for his code and his permission to include it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-28 20:59:49 +00:00
Malcolm Tredinnick ae1234f2a2 Fixed #2163 -- Corrected typo when handling datetimes with timezones in the timesince filter. Thanks, Alex Dedul. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-21 11:11:03 +00:00
Malcolm Tredinnick 239adf83d3 Fixed #2053 -- added an optional comparison argument to the "timesince" filter. 
Added a "timeuntil" filter that works analogously. Thanks, john@sneeu.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-21 06:56:08 +00:00
Adrian Holovaty 32228d2031 Added django/core/servers/fastcgi.py and manage.py 'runfcgi' option. Thanks, jcrasta@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-20 05:24:19 +00:00
Malcolm Tredinnick a93b1f7ac3 Fixed #1473 -- Added support for categories back into syndication feeds 
(was accidently removed in r1994). Thanks, k.shaposhnikov@gmail.com


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-19 01:38:06 +00:00
Adrian Holovaty 2abfd5dd58 Fixed #2109 -- Convert old-style classes to new-style classes throughout Django. Thanks, Nicola Larosa 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-08 05:00:13 +00:00
Adrian Holovaty 0f0560a9ac Changed django.utils.text.smart_split to return strings, not tuples 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-08 04:26:23 +00:00
Adrian Holovaty a1c9c52533 Added django.utils.text.smart_split. Thanks, ckknight 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-07 06:08:23 +00:00
Adrian Holovaty 643c7b23a9 Fixed #2079 -- Fixed bug introduced in [3070] in django.utils.datastructures 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-05 00:46:18 +00:00
Luke Plant 9b86db9bf2 Eliminated lots of mutable default arguments (since they are bugs 
waiting to happen and are memory leaks too).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-03 13:37:34 +00:00
Adrian Holovaty ab2fb1634f Fixed #2062 -- Added YEAR_MONTH_FORMAT and MONTH_DAY_FORMAT settings, and added technical message IDs of the same names. Thanks, ramiro 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-02 04:20:32 +00:00
Adrian Holovaty 56131d0fb9 Fixed #2052 -- Fixed some threading issues for FreeBSD. Thanks, scott@clued-in.co.uk 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-01 04:57:10 +00:00
Adrian Holovaty 8623bd126d Fixed #2036 -- autoreload.py no longer fails for uninstalled 'thread' module. Thanks, plmeister@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-31 14:53:23 +00:00
Adrian Holovaty d7e929a85d Fixed #2021 -- Improved Atom feed by outputting rel=alternate. Thanks, Ned Batchelder 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-30 01:12:52 +00:00
Adrian Holovaty c643e12faf Fixed #1321 -- Made DJANGO_SETTINGS_MODULE optional. You can now call django.conf.settings.configure() to set settings manually if you don't have a settings module. Thanks, Malcolm Tredinnick, Luke Plant, Fredrik Lundh 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-16 21:28:06 +00:00
Georg Bauer 25816ea383 fixed #1817: added translation hooks for 3-letter month names 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-16 07:38:23 +00:00
Georg Bauer ca197739d9 fixed #1660: added support functions and tags for bidi language support 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-16 07:35:20 +00:00
Adrian Holovaty f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-02 01:31:56 +00:00
Adrian Holovaty 00b3891524 Fixed #1626 -- Fixed a bunch of typos in comments and docs. Thanks, Dexter 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-12 13:35:31 +00:00
Adrian Holovaty 63e7f20595 Fixed #1569 -- Made streaming HttpResponse unicode-aware 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-11 13:43:29 +00:00
Adrian Holovaty bb2a38cecc Fixed syntax error in [2639] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-10 00:12:56 +00:00
Adrian Holovaty 3bb340271c Changed settings imports from [2639] to use 'from django.conf import settings', to make it easier to merge to magic-removal 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-10 00:01:59 +00:00
Adrian Holovaty bc4638d722 Fixed #1569 -- HttpResponse now accepts iterators. Thanks, Maniac 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-09 23:54:34 +00:00
Adrian Holovaty 1d64709080 Added missing file from [2579]. Refs #1442 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-03-28 17:40:19 +00:00