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

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(), {})
 

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')),