diff options
| author | Jannis Leidel <jannis@leidel.info> | 2011-03-03 13:47:46 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2011-03-03 13:47:46 +0000 |
| commit | a97396948bdc68561a46229f8440b68a2ab79960 (patch) | |
| tree | bf106e9302a014b9d6f371f237ca97eab445d8bb | |
| parent | 0516b9987576a475e9767517f13d8f423f6aab4c (diff) | |
[1.2.X] Fixed wrong import introduced in r15697.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | tests/regressiontests/conditional_processing/models.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/regressiontests/conditional_processing/models.py b/tests/regressiontests/conditional_processing/models.py index 129d11b07f..b9b169633e 100644 --- a/tests/regressiontests/conditional_processing/models.py +++ b/tests/regressiontests/conditional_processing/models.py @@ -2,7 +2,6 @@ from datetime import datetime from django.test import TestCase -from django.utils import unittest from django.utils.http import parse_etags, quote_etag, parse_http_date FULL_RESPONSE = 'Test conditional get response' @@ -127,7 +126,7 @@ class ConditionalGet(TestCase): self.assertFullResponse(response, check_last_modified=False) -class ETagProcessing(unittest.TestCase): +class ETagProcessing(TestCase): def testParsing(self): etags = parse_etags(r'"", "etag", "e\"t\"ag", "e\\tag", W/"weak"') self.assertEquals(etags, ['', 'etag', 'e"t"ag', r'e\tag', 'weak']) @@ -137,7 +136,7 @@ class ETagProcessing(unittest.TestCase): self.assertEquals(quoted_etag, r'"e\\t\"ag"') -class HttpDateProcessing(unittest.TestCase): +class HttpDateProcessing(TestCase): def testParsingRfc1123(self): parsed = parse_http_date('Sun, 06 Nov 1994 08:49:37 GMT') self.assertEqual(datetime.utcfromtimestamp(parsed), |