From a3b2136b284c34fb9f675b85495f2c7951d31aff Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Sat, 8 Sep 2012 18:22:03 -0600 Subject: [PATCH 1/2] Remove an outdated import inadvertently introduced in tests. --- tests/regressiontests/comment_tests/urls_default.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/regressiontests/comment_tests/urls_default.py b/tests/regressiontests/comment_tests/urls_default.py index bfce8ffc90..e204f9ebcb 100644 --- a/tests/regressiontests/comment_tests/urls_default.py +++ b/tests/regressiontests/comment_tests/urls_default.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include urlpatterns = patterns('', (r'^', include('django.contrib.comments.urls')), From 5e99a3d41b5d7b7d8d135283fd25262fdcb1b7fd Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sat, 8 Sep 2012 20:28:31 -0400 Subject: [PATCH 2/2] Adjust d7853c5 to not show ignorable warnings when running tests. --- django/contrib/sessions/tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/django/contrib/sessions/tests.py b/django/contrib/sessions/tests.py index dbc68652ac..9aa602f416 100644 --- a/django/contrib/sessions/tests.py +++ b/django/contrib/sessions/tests.py @@ -304,6 +304,7 @@ class CacheDBSessionTests(SessionTestsMixin, TestCase): def test_load_overlong_key(self): # Some backends might issue a warning with warnings.catch_warnings(): + warnings.simplefilter("ignore") self.session._session_key = (string.ascii_letters + string.digits) * 20 self.assertEqual(self.session.load(), {}) @@ -353,6 +354,7 @@ class CacheSessionTests(SessionTestsMixin, unittest.TestCase): def test_load_overlong_key(self): # Some backends might issue a warning with warnings.catch_warnings(): + warnings.simplefilter("ignore") self.session._session_key = (string.ascii_letters + string.digits) * 20 self.assertEqual(self.session.load(), {})