Fixed Django deprecation warning for urls imports

apps/addons/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.views.decorators.csrf import csrf_exempt
 from django.shortcuts import redirect
 

apps/amo/urls.py

@@ -1,7 +1,7 @@
 import csp.views
 from waffle.views import wafflejs
 
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.views.decorators.cache import never_cache
 
 from . import views, install

apps/api/urls.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 
 from piston.resource import Resource
 

apps/applications/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from . import views
 

apps/bandwagon/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 
 from . import views, feeds
 

apps/blocklist/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from . import views
 

apps/browse/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 from django.shortcuts import redirect
 
 from amo.urlresolvers import reverse

apps/compat/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url
+from django.conf.urls import url
 
 from . import views
 

apps/devhub/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.shortcuts import redirect
 
 from lib.misc.urlconf_decorator import decorate

apps/discovery/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
 

apps/editors/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url
+from django.conf.urls import url
 
 from addons.urls import ADDON_ID
 from . import views

apps/files/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import include, patterns, url
 
 from files import views
 

apps/localizers/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 
 from . import views
 

apps/pages/urls.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.http import HttpResponsePermanentRedirect as perma_redirect
 
 from jingo.views import direct_to_template

apps/paypal/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.views.decorators.cache import never_cache
 
 from . import views

apps/perf/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import patterns, url
 
 from . import views
 

apps/reviews/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 from reviews.feeds import ReviewsRss
 from . import views
 

apps/search/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from . import views
 

apps/stats/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.shortcuts import redirect
 
 from . import views

apps/tags/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from search.views import search
 from . import views

apps/users/urls.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import views as auth_views
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 
 from session_csrf import anonymous_csrf
 

apps/versions/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from versions.feeds import VersionsRss
 
 from addons.urls import ADDON_ID

apps/zadmin/urls.py

@@ -1,5 +1,5 @@
 from django import http
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.contrib import admin
 from django.shortcuts import redirect
 

lib/urls_base.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.contrib import admin
 from django.shortcuts import redirect
 from django.views.i18n import javascript_catalog

mkt/account/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 
 from lib.misc.urlconf_decorator import decorate
 

mkt/api/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 
 from tastypie.api import Api
 from mkt.search.api import SearchResource

mkt/browse/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from . import views
 

mkt/detail/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 
 from mkt.purchase.urls import app_purchase_patterns
 from mkt.ratings.urls import review_patterns

mkt/developers/urls.py

@@ -1,5 +1,5 @@
 from django import http
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 
 from lib.misc.urlconf_decorator import decorate
 

mkt/downloads/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from mkt.downloads import views
 

mkt/ecosystem/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from . import views
 

mkt/inapp_pay/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from . import views
 

mkt/lookup/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 
 from . import views
 

mkt/offline/urls.py

@@ -1,12 +1,7 @@
-from django.conf import settings
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from jingo.views import direct_to_template
 
-from amo.urlresolvers import reverse
-
-from . import views
-
 
 urlpatterns = patterns('',
     url('^$', direct_to_template, {'template': 'offline/home.html'},

mkt/purchase/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 
 from . import bluevia, views
 

mkt/ratings/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 
 from mkt.ratings.feeds import RatingsRss
 from reviews.views import delete as amo_delete, flag as amo_flag

mkt/receipts/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 import waffle
 

mkt/reviewers/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, url
+from django.conf.urls import include, url
 
 import amo
 from apps.editors.views import queue_viewing, review_viewing

mkt/search/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from search.views import ajax_search_suggestions
 from . import views

mkt/site/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from jingo.views import direct_to_template
 

mkt/stats/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 import addons.views
 from . import views

mkt/submit/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 
 from lib.misc.urlconf_decorator import decorate
 

mkt/support/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from . import views
 

mkt/themes/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from . import views
 

mkt/urls.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.contrib import admin
 from django.shortcuts import redirect
 from django.views.decorators.cache import cache_page

mkt/zadmin/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from . import views