Django

Code

Show
Ignore:
Timestamp:
06/30/08 10:38:16 (5 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573

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-7768 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-7808
  • django/branches/newforms-admin/django/contrib/formtools/tests.py

    r7707 r7809  
    2222 
    2323class PreviewTests(TestCase): 
     24    urls = 'django.contrib.formtools.test_urls' 
    2425 
    2526    def setUp(self): 
    26         self._old_root_urlconf = settings.ROOT_URLCONF 
    27         settings.ROOT_URLCONF = 'django.contrib.formtools.test_urls' 
    2827        # Create a FormPreview instance to share between tests 
    2928        self.preview = preview.FormPreview(TestForm) 
     
    3130        self.input = input_template % (self.preview.unused_name('stage'), "%d") 
    3231 
    33     def tearDown(self): 
    34         settings.ROOT_URLCONF = self._old_root_urlconf 
    35          
    3632    def test_unused_name(self): 
    3733        """