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

28 Commits

Author SHA1 Message Date
Claude Paroz ebc773ada3 Replaced many smart_bytes by force_bytes 
In all those occurrences, we didn't care about preserving the
lazy status of the strings, but we really wanted to obtain a
real bytestring.
 2012-08-29 11:20:32 +02:00
Aymeric Augustin c5ef65bcf3 [py3] Ported django.utils.encoding. 
* Renamed smart_unicode to smart_text (but kept the old name under
  Python 2 for backwards compatibility).
* Renamed smart_str to smart_bytes.
* Re-introduced smart_str as an alias for smart_text under Python 3
  and smart_bytes under Python 2 (which is backwards compatible).
  Thus smart_str always returns a str objects.
* Used the new smart_str in a few places where both Python 2 and 3
  want a str.
 2012-08-07 12:00:22 +02:00
Claude Paroz 3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions. 
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
 2012-04-29 20:57:15 +02:00
Claude Paroz 749243941c Fixed #18041 -- Removed support for Markdown versions < 2.1, following the 1.5 deprecation timeline. Thanks Ramiro Morales for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-14 12:35:31 +00:00
Julien Phalip 49e7f4a229 Fixed #17908 -- Made some `contrib.markup` tests be skipped so they don't fail on old versions of Markdown. Thanks to Preston Holmes for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-16 00:36:52 +00:00
Paul McMillan 14df122f86 Fixed #17837. Improved markdown safety. 
Markdown enable_attributes is now False when safe_mode is enabled. Documented
the markdown "safe" argument. Added warnings when the safe argument is
passed to versions of markdown which cannot be made safe. Deprecated
versions of markdown < 2.1. Many thanks to ptone for the patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 19:06:23 +00:00
Carl Meyer d0f162c73c Corrected contrib.markup filter errors to not use misleading template syntax. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 19:49:19 +00:00
Aymeric Augustin d17bc72880 Fixed #17135 -- Made it possible to use decorators (like stringfilter) on template filter functions in combination with auto-escaping. Refs #16726. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-30 07:32:21 +00:00
Aymeric Augustin 52c66a21e1 Used the decorator syntax consistently to register template filters. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-29 14:51:43 +00:00
Aymeric Augustin 4cfb7632e0 Removed remains from times when tests could be run outside of runtests.py. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 21:03:18 +00:00
Carl Meyer 6df91d9539 Fixed #17086 -- Removed pollution of global template-builtins from markup and humanize tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-24 21:30:55 +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 127a25ac27 Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to timo for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 15:37:16 +00:00
Jacob Kaplan-Moss 90ce8b0c99 Fixed #10843: the textile tests now pass against the latest textile library. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-19 21:07:33 +00:00
Gary Wilson Jr 8f3d6b9404 Removed out-of-date statement in markdown templatetags docstring (refs #1204). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-26 23:56:08 +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 45b5d02279 Fixed #12495 -- Fixed broken link in django.contrib.markup docstring 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-09 19:14:13 +00:00
Malcolm Tredinnick 8453a1750f Fixed #6387 -- Updated markdown filter to handle markdown-1.7 as well as 
earlier versions. Patch from cogg, jedie and Dmitri Fedortchenko.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-15 02:00:15 +00:00
Jacob Kaplan-Moss 953e695246 Fixed #5362: markup tests no longer fail under SVN versions of docutils. Thanks, keithb. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-02 21:01:17 +00:00
Malcolm Tredinnick 4ac8ba1855 Fixed #2910 -- Added support for markdown extensions to the markdown markup 
filter (try saying that ten times quickly!). Thanks, Waylan Limberg.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-02 15:49:10 +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
Russell Keith-Magee edc0fcdf7c Moved markup tests into their contrib directory. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-20 04:08:14 +00:00
Jacob Kaplan-Moss 0ad8863692 restructuredtext filter now passes settings from {{{RESTRUCTUREDTEXT_FILTER_SETTINGS}}} into docutils. See http://docutils.sourceforge.net/docs/user/config.html#html4css1-writer for what these settings are. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-30 20:19:05 +00:00
Adrian Holovaty 5d7af7b1a9 Fixed #2246 -- Changed textile templatetag in contrib.markup to use DEFAULT_CHARSET setting 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-28 01:08:04 +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 3ede006fc9 Fixed #911 -- Made template system scoped to the parser instead of the template module. Also changed the way tags/filters are registered and added support for multiple arguments to {% load %} tag. Thanks, rjwittams. This is a backwards-incompatible change for people who've created custom template tags or filters. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for upgrade instructions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-26 22:46:31 +00:00
Jacob Kaplan-Moss 8e2d275390 Fixed #241 -- added django.contrib.markup app with markup templatetags for Textile, ReST and Markdown 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-10 18:31:33 +00:00