mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 10:19:20 +00:00
Code Issues 32 Releases Wiki Activity

[1.2.X] Fixed wrong import introduced in r15697.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-03-03 13:47:46 +00:00
parent 0516b99875
commit a97396948b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/regressiontests/conditional_processing/models.py
View File

@ -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'
@ -127,7 +126,7 @@ class ConditionalGet(TestCase):
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'])
@ -137,7 +136,7 @@ class ETagProcessing(unittest.TestCase):
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),