Skip to content

Commit

Permalink
[1.2.X] Fixed wrong import introduced in r15697.
Browse files Browse the repository at this point in the history
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
jezdez committed Mar 3, 2011
1 parent 0516b99 commit a973969
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions tests/regressiontests/conditional_processing/models.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from datetime import datetime from datetime import datetime


from django.test import TestCase from django.test import TestCase
from django.utils import unittest
from django.utils.http import parse_etags, quote_etag, parse_http_date from django.utils.http import parse_etags, quote_etag, parse_http_date


FULL_RESPONSE = 'Test conditional get response' FULL_RESPONSE = 'Test conditional get response'
Expand Down Expand Up @@ -127,7 +126,7 @@ def testInvalidETag(self):
self.assertFullResponse(response, check_last_modified=False) self.assertFullResponse(response, check_last_modified=False)




class ETagProcessing(unittest.TestCase): class ETagProcessing(TestCase):
def testParsing(self): def testParsing(self):
etags = parse_etags(r'"", "etag", "e\"t\"ag", "e\\tag", W/"weak"') etags = parse_etags(r'"", "etag", "e\"t\"ag", "e\\tag", W/"weak"')
self.assertEquals(etags, ['', 'etag', 'e"t"ag', r'e\tag', 'weak']) self.assertEquals(etags, ['', 'etag', 'e"t"ag', r'e\tag', 'weak'])
Expand All @@ -137,7 +136,7 @@ def testQuoting(self):
self.assertEquals(quoted_etag, r'"e\\t\"ag"') self.assertEquals(quoted_etag, r'"e\\t\"ag"')




class HttpDateProcessing(unittest.TestCase): class HttpDateProcessing(TestCase):
def testParsingRfc1123(self): def testParsingRfc1123(self):
parsed = parse_http_date('Sun, 06 Nov 1994 08:49:37 GMT') parsed = parse_http_date('Sun, 06 Nov 1994 08:49:37 GMT')
self.assertEqual(datetime.utcfromtimestamp(parsed), self.assertEqual(datetime.utcfromtimestamp(parsed),
Expand Down

0 comments on commit a973969

Please sign in to comment.