Эх сурвалжийг харах

HUE-2436 [all] Django 1.6 -> django.conf.urls.defaults -> django.conf.urls

Erick Tryzelaar 11 жил өмнө
parent
commit
6787c1d

+ 1 - 1
apps/about/src/about/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('about.views',
   url(r'^$', 'admin_wizard', name='index'),

+ 1 - 1
apps/beeswax/src/beeswax/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns('beeswax.views',

+ 1 - 1
apps/filebrowser/src/filebrowser/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 
 urlpatterns = patterns('filebrowser.views',

+ 1 - 1
apps/hbase/src/hbase/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('hbase.views',
   url(r'^$', 'app', name='index'),

+ 1 - 1
apps/help/src/help/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 urlpatterns = patterns('',
   url(r'^$', 'help.views.view', { "app": "desktop", "path": "/index.html" }),

+ 1 - 1
apps/impala/src/impala/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from beeswax.urls import urlpatterns as beeswax_urls
 

+ 1 - 1
apps/jobbrowser/src/jobbrowser/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('jobbrowser.views',
   # "Default"

+ 1 - 1
apps/jobsub/src/jobsub/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns(
   'jobsub.views',

+ 1 - 1
apps/metastore/src/metastore/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('metastore.views',
   url(r'^$', 'index', name='index'),

+ 1 - 1
apps/oozie/src/oozie/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 IS_URL_NAMESPACED = True

+ 1 - 1
apps/pig/src/pig/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('pig.views',
   url(r'^$', 'app', name='index'),

+ 1 - 1
apps/proxy/src/proxy/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('proxy',
   # Prefix the names of your views with the app name.

+ 2 - 2
apps/rdbms/src/rdbms/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 # Views
@@ -53,4 +53,4 @@ urlpatterns += patterns('beeswax.api',
   url(r'^autocomplete/$', 'autocomplete', name='api_autocomplete_databases'),
   url(r'^autocomplete/(?P<database>\w+)/$', 'autocomplete', name='api_autocomplete_tables'),
   url(r'^autocomplete/(?P<database>\w+)/(?P<table>\w+)$', 'autocomplete', name='api_autocomplete_columns')
-)
+)

+ 1 - 1
apps/search/src/search/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('search.views',
   url(r'^$', 'index', name='index'),

+ 1 - 1
apps/security/src/security/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns('security.views',

+ 1 - 1
apps/spark/src/spark/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 # Views

+ 2 - 2
apps/sqoop/src/sqoop/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('sqoop.views',
   url(r'^$', 'app', name='index')
@@ -40,4 +40,4 @@ urlpatterns += patterns('sqoop.api',
   url(r'^api/jobs/(?P<job_id>\d+)/stop/?$', 'job_stop', name='job_stop'),
   url(r'^api/jobs/(?P<job_id>\d+)/status/?$', 'job_status', name='job_status'),
   url(r'^api/submissions/?$', 'submissions', name='submissions')
-)
+)

+ 1 - 1
apps/useradmin/src/useradmin/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from desktop.lib.django_util import get_username_re_rule, get_groupname_re_rule
 
 username_re = get_username_re_rule()

+ 1 - 1
apps/zookeeper/src/zookeeper/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns('zookeeper.views',

+ 1 - 1
desktop/core/src/desktop/api_tests.py

@@ -20,7 +20,7 @@ import json
 
 from nose.tools import assert_true, assert_false, assert_equal, assert_not_equal, assert_raises
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse

+ 1 - 1
desktop/core/src/desktop/app_template/src/app_name/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('${app_name}',
   url(r'^$', 'views.index'),

+ 1 - 1
desktop/core/src/desktop/app_template_proxy/src/app_name/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('${app_name}',
   url(r'^$', 'views.index'),

+ 1 - 1
desktop/core/src/desktop/tests.py

@@ -30,7 +30,7 @@ import proxy.conf
 from nose.plugins.attrib import attr
 from nose.plugins.skip import SkipTest
 from nose.tools import assert_true, assert_false, assert_equal, assert_not_equal, assert_raises
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse

+ 2 - 2
desktop/core/src/desktop/urls.py

@@ -20,13 +20,13 @@ import os
 import re
 
 from django.conf import settings
-from django.conf.urls.defaults import include, patterns
+from django.conf.urls import include, patterns
 from django.contrib import admin
 
 from desktop import appmanager
 
 # Django expects handler404 and handler500 to be defined.
-# django.conf.urls.defaults provides them. But we want to override them.
+# django.conf.urls provides them. But we want to override them.
 # Also see http://code.djangoproject.com/ticket/5350
 handler404 = 'desktop.views.serve_404_error'
 handler500 = 'desktop.views.serve_500_error'

+ 1 - 1
desktop/libs/indexer/src/indexer/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('indexer.views',
   url(r'^$', 'collections', name='collections'),

+ 1 - 3
desktop/libs/liboauth/src/liboauth/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns(
     'liboauth.views',
@@ -23,5 +23,3 @@ urlpatterns = patterns(
        url(r'^social_login/oauth/?$', 'oauth_login', name='oauth_login'),
        url(r'^social_login/oauth_authenticated/?$', 'oauth_authenticated', name='oauth_authenticated'),
 )
-
-

+ 1 - 1
desktop/libs/libopenid/src/libopenid/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns(
     'libopenid.views',

+ 1 - 1
desktop/libs/libsaml/src/libsaml/urls.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 try:
   from djangosaml2.views import logout_service_post