Django

Code

Show
Ignore:
Timestamp:
06/19/08 11:04:52 (7 months ago)
Author:
brosner
Message:

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

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-7668 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-7706

  • django/branches/newforms-admin/django/contrib/formtools/tests.py

    r7351 r7707  
    2424 
    2525    def setUp(self): 
     26        self._old_root_urlconf = settings.ROOT_URLCONF 
    2627        settings.ROOT_URLCONF = 'django.contrib.formtools.test_urls' 
    2728        # Create a FormPreview instance to share between tests 
    …… 
    3031        self.input = input_template % (self.preview.unused_name('stage'), "%d") 
    3132 
     33    def tearDown(self): 
     34        settings.ROOT_URLCONF = self._old_root_urlconf 
     35         
    3236    def test_unused_name(self): 
    3337        """