Django

Code

Changeset 6783

Show
Ignore:
Timestamp:
11/30/07 17:48:35 (7 months ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [6782].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /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 to /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

  • django/branches/newforms-admin/django/contrib/admin/templates/admin/includes/fieldset.html

    r6122 r6783  
    1111              {{ field.label_tag }}{{ field.field }} 
    1212          {% endif %} 
    13           {% if field.field.field.help_text %}<p class="help">{{ field.field.field.help_text }}</p>{% endif %} 
     13          {% if field.field.field.help_text %}<p class="help">{{ field.field.field.help_text|safe }}</p>{% endif %} 
    1414      {% endfor %} 
    1515      </div> 

  • django/branches/newforms-admin/django/core/servers/basehttp.py

    r6656 r6783  
    99 
    1010from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer 
    11 from types import ListType, StringType 
    1211import mimetypes 
    1312import os 
    …… 
    7372    """Manage a collection of HTTP response headers""" 
    7473    def __init__(self,headers): 
    75         if type(headers) is not ListType: 
     74        if not isinstance(headers, list): 
    7675            raise TypeError("Headers must be a list of name/value tuples") 
    7776        self._headers = headers 
    …… 
    328327        try: 
    329328            blocks = len(self.result) 
    330         except (TypeError,AttributeError,NotImplementedError): 
     329        except (TypeError, AttributeError, NotImplementedError): 
    331330            pass 
    332331        else: 
    …… 
    357356            raise AssertionError("Headers already set!") 
    358357 
    359         assert type(status) is StringType,"Status must be a string" 
     358        assert isinstance(status, str),"Status must be a string" 
    360359        assert len(status)>=4,"Status must be at least 4 characters" 
    361360        assert int(status[:3]),"Status message must begin w/3-digit code" 
    …… 
    363362        if __debug__: 
    364363            for name,val in headers: 
    365                 assert type(name) is StringType,"Header names must be strings" 
    366                 assert type(val) is StringType,"Header values must be strings" 
     364                assert isinstance(name, str),"Header names must be strings" 
     365                assert isinstance(val, str),"Header values must be strings" 
    367366                assert not is_hop_by_hop(name),"Hop-by-hop headers not allowed" 
    368367        self.status = status 
    …… 
    387386        """'write()' callable as specified by PEP 333""" 
    388387 
    389         assert type(data) is StringType,"write() argument must be string" 
     388        assert isinstance(data, str), "write() argument must be string" 
    390389 
    391390        if not self.status: 

  • django/branches/newforms-admin/django/template/__init__.py

    r6777 r6783  
    805805            else: 
    806806                bits.append(node) 
    807         return ''.join([force_unicode(b) for b in bits]) 
     807        return mark_safe(''.join([force_unicode(b) for b in bits])) 
    808808 
    809809    def get_nodes_by_type(self, nodetype): 

  • django/branches/newforms-admin/tests/regressiontests/templates/unicode.py

    r5918 r6783  
    44Templates can be created from unicode strings. 
    55>>> from django.template import * 
     6>>> from django.utils.safestring import SafeData 
    67>>> t1 = Template(u'ŠĐĆŜćşšđ {{ var }}') 
    78 
    …… 
    2526 
    2627Since both templates and all four contexts represent the same thing, they all 
    27 render the same (and are returned as unicode objects). 
     28render the same (and are returned as unicode objects and "safe" objects as 
     29well, for auto-escaping purposes). 
    2830 
    2931>>> t1.render(c3) == t2.render(c3) 
    3032True 
    31 >>> type(t1.render(c3)) 
    32 <type 'unicode'> 
     33>>> isinstance(t1.render(c3), unicode) 
     34True 
     35>>> isinstance(t1.render(c3), SafeData) 
     36True 
    3337"""