Django

Code

Changeset 5393

Show
Ignore:
Timestamp:
05/31/07 11:09:49 (1 year ago)
Author:
bouldersprinters
Message:

boulder-oracle-sprint: Merged to [5392]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/boulder-oracle-sprint/django/template/defaulttags.py

    r5100 r5393  
    238238        output = [] # list of dictionaries in the format {'grouper': 'key', 'list': [list of contents]} 
    239239        for obj in obj_list: 
    240             grouper = self.expression.resolve(Context({'var': obj}), True) 
     240            grouper = self.expression.resolve(obj, True) 
    241241            # TODO: Is this a sensible way to determine equality? 
    242242            if output and repr(output[-1]['grouper']) == repr(grouper): 
     
    848848        raise TemplateSyntaxError, "next-to-last argument to 'regroup' tag must be 'as'" 
    849849 
    850     expression = parser.compile_filter('var.%s' % lastbits_reversed[2][::-1]) 
     850    expression = parser.compile_filter(lastbits_reversed[2][::-1]) 
    851851 
    852852    var_name = lastbits_reversed[0][::-1] 
  • django/branches/boulder-oracle-sprint/django/test/simple.py

    r5183 r5393  
    1 import unittest, doctest 
     1import unittest 
    22from django.conf import settings 
     3from django.test import _doctest as doctest 
    34from django.test.utils import setup_test_environment, teardown_test_environment 
    45from django.test.utils import create_test_db, destroy_test_db 
  • django/branches/boulder-oracle-sprint/django/test/testcases.py

    r5235 r5393  
    1 import re, doctest, unittest 
     1import re, unittest 
    22from urlparse import urlparse 
    33from django.db import transaction 
    44from django.core import management, mail 
    55from django.db.models import get_apps 
     6from django.test import _doctest as doctest 
    67from django.test.client import Client 
    78 
  • django/branches/boulder-oracle-sprint/docs/testing.txt

    r5384 r5393  
    148148"pythonic". It's designed to make writing tests as easy as possible, so 
    149149there's no overhead of writing classes or methods; you simply put tests in 
    150 docstrings. This gives the added advantage of given your modules automatic 
     150docstrings. This gives the added advantage of giving your modules automatic 
    151151documentation -- well-written doctests can kill both the documentation and the 
    152152testing bird with a single stone.