Commit a9739694 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[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
parent 0516b998
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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),