p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'django/master' into t3011

This commit is contained in:
Russell Keith-Magee 2012-09-09 08:29:51 +08:00
parent 19526563b5 5e99a3d41b
commit f2ec915b20
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/sessions/tests.py
View File

@ -304,6 +304,7 @@ class CacheDBSessionTests(SessionTestsMixin, TestCase):
def test_load_overlong_key(self): def test_load_overlong_key(self):
# Some backends might issue a warning # Some backends might issue a warning
with warnings.catch_warnings(): with warnings.catch_warnings():
warnings.simplefilter("ignore")
self.session._session_key = (string.ascii_letters + string.digits) * 20 self.session._session_key = (string.ascii_letters + string.digits) * 20
self.assertEqual(self.session.load(), {}) self.assertEqual(self.session.load(), {})
@ -353,6 +354,7 @@ class CacheSessionTests(SessionTestsMixin, unittest.TestCase):
def test_load_overlong_key(self): def test_load_overlong_key(self):
# Some backends might issue a warning # Some backends might issue a warning
with warnings.catch_warnings(): with warnings.catch_warnings():
warnings.simplefilter("ignore")
self.session._session_key = (string.ascii_letters + string.digits) * 20 self.session._session_key = (string.ascii_letters + string.digits) * 20
self.assertEqual(self.session.load(), {}) self.assertEqual(self.session.load(), {})

2
tests/regressiontests/comment_tests/urls_default.py
View File

@ -1,4 +1,4 @@
from django.conf.urls.defaults import * from django.conf.urls import patterns, include
urlpatterns = patterns('', urlpatterns = patterns('',
(r'^', include('django.contrib.comments.urls')), (r'^', include('django.contrib.comments.urls')),