Author: jkocherhans
Date: 2007-11-30 17:48:35 -0600 (Fri, 30 Nov 2007)
New Revision: 6783
Modified:
django/branches/newforms-admin/
django/branches/newforms-admin/django/contrib/admin/templates/admin/includes/fieldset.html
django/branches/newforms-admin/django/core/servers/basehttp.py
django/branches/newforms-admin/django/template/__init__.py
django/branches/newforms-admin/tests/regressiontests/templates/unicode.py
Log:
newforms-admin: Merged from trunk up to [6782].
Property changes on: django/branches/newforms-admin
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6776
+
/django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6782
Modified:
django/branches/newforms-admin/django/contrib/admin/templates/admin/includes/fieldset.html
===================================================================
---
django/branches/newforms-admin/django/contrib/admin/templates/admin/includes/fieldset.html
2007-11-30 20:55:26 UTC (rev 6782)
+++
django/branches/newforms-admin/django/contrib/admin/templates/admin/includes/fieldset.html
2007-11-30 23:48:35 UTC (rev 6783)
@@ -10,7 +10,7 @@
{% else %}
{{ field.label_tag }}{{ field.field }}
{% endif %}
- {% if field.field.field.help_text %}<p class="help">{{
field.field.field.help_text }}</p>{% endif %}
+ {% if field.field.field.help_text %}<p class="help">{{
field.field.field.help_text|safe }}</p>{% endif %}
{% endfor %}
</div>
{% endfor %}
Modified: django/branches/newforms-admin/django/core/servers/basehttp.py
===================================================================
--- django/branches/newforms-admin/django/core/servers/basehttp.py
2007-11-30 20:55:26 UTC (rev 6782)
+++ django/branches/newforms-admin/django/core/servers/basehttp.py
2007-11-30 23:48:35 UTC (rev 6783)
@@ -8,7 +8,6 @@
"""
from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
-from types import ListType, StringType
import mimetypes
import os
import re
@@ -72,7 +71,7 @@
class Headers(object):
"""Manage a collection of HTTP response headers"""
def __init__(self,headers):
- if type(headers) is not ListType:
+ if not isinstance(headers, list):
raise TypeError("Headers must be a list of name/value tuples")
self._headers = headers
@@ -327,7 +326,7 @@
"""Compute Content-Length or switch to chunked encoding if possible"""
try:
blocks = len(self.result)
- except (TypeError,AttributeError,NotImplementedError):
+ except (TypeError, AttributeError, NotImplementedError):
pass
else:
if blocks==1:
@@ -356,14 +355,14 @@
elif self.headers is not None:
raise AssertionError("Headers already set!")
- assert type(status) is StringType,"Status must be a string"
+ assert isinstance(status, str),"Status must be a string"
assert len(status)>=4,"Status must be at least 4 characters"
assert int(status[:3]),"Status message must begin w/3-digit code"
assert status[3]==" ", "Status message must have a space after code"
if __debug__:
for name,val in headers:
- assert type(name) is StringType,"Header names must be strings"
- assert type(val) is StringType,"Header values must be strings"
+ assert isinstance(name, str),"Header names must be strings"
+ assert isinstance(val, str),"Header values must be strings"
assert not is_hop_by_hop(name),"Hop-by-hop headers not allowed"
self.status = status
self.headers = self.headers_class(headers)
@@ -386,7 +385,7 @@
def write(self, data):
"""'write()' callable as specified by PEP 333"""
- assert type(data) is StringType,"write() argument must be string"
+ assert isinstance(data, str), "write() argument must be string"
if not self.status:
raise AssertionError("write() before start_response()")
Modified: django/branches/newforms-admin/django/template/__init__.py
===================================================================
--- django/branches/newforms-admin/django/template/__init__.py 2007-11-30
20:55:26 UTC (rev 6782)
+++ django/branches/newforms-admin/django/template/__init__.py 2007-11-30
23:48:35 UTC (rev 6783)
@@ -804,7 +804,7 @@
bits.append(self.render_node(node, context))
else:
bits.append(node)
- return ''.join([force_unicode(b) for b in bits])
+ return mark_safe(''.join([force_unicode(b) for b in bits]))
def get_nodes_by_type(self, nodetype):
"Return a list of all nodes of the given type"
Modified:
django/branches/newforms-admin/tests/regressiontests/templates/unicode.py
===================================================================
--- django/branches/newforms-admin/tests/regressiontests/templates/unicode.py
2007-11-30 20:55:26 UTC (rev 6782)
+++ django/branches/newforms-admin/tests/regressiontests/templates/unicode.py
2007-11-30 23:48:35 UTC (rev 6783)
@@ -3,6 +3,7 @@
unicode_tests = ur"""
Templates can be created from unicode strings.
>>> from django.template import *
+>>> from django.utils.safestring import SafeData
>>> t1 = Template(u'ŠĐĆŽćžšđ {{ var }}')
Templates can also be created from bytestrings. These are assumed by encoded
@@ -24,10 +25,13 @@
>>> c4 = Context({u'var': '\xc4\x90\xc4\x91'})
Since both templates and all four contexts represent the same thing, they all
-render the same (and are returned as unicode objects).
+render the same (and are returned as unicode objects and "safe" objects as
+well, for auto-escaping purposes).
>>> t1.render(c3) == t2.render(c3)
True
->>> type(t1.render(c3))
-<type 'unicode'>
+>>> isinstance(t1.render(c3), unicode)
+True
+>>> isinstance(t1.render(c3), SafeData)
+True
"""
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
