Skip to content

Commit 709ddf7

Browse files
committed
url patterns warning in django 1.9
1 parent bd9f28f commit 709ddf7

File tree

2 files changed

+28
-13
lines changed

2 files changed

+28
-13
lines changed

dj_elastictranscoder/urls.py

+27-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,27 @@
1-
try:
2-
from django.conf.urls import url, patterns
3-
except ImportError:
4-
from django.conf.urls.defaults import url, patterns # Support for Django < 1.4
5-
6-
urlpatterns = patterns(
7-
'dj_elastictranscoder.views',
8-
url(r'^endpoint/$', 'aws_endpoint'),
9-
url(r'^aws_endpoint/$', 'aws_endpoint', name='aws_endpoint'),
10-
url(r'^qiniu_endpoint/$', 'qiniu_endpoint', name='qiniu_endpoint'),
11-
url(r'^aliyun_endpoint', 'aliyun_endpoint', name='aliyun_endpoint'),
12-
)
1+
import django
2+
3+
4+
if django.get_version() >= '1.9':
5+
from django.conf.urls import url
6+
from dj_elastictranscoder import views
7+
8+
urlpatterns = [
9+
url(r'^endpoint/$', views.aws_endpoint),
10+
url(r'^aws_endpoint/$', views.aws_endpoint, name='aws_endpoint'),
11+
url(r'^qiniu_endpoint/$', views.qiniu_endpoint, name='qiniu_endpoint'),
12+
url(r'^aliyun_endpoint', views.aliyun_endpoint, name='aliyun_endpoint'),
13+
]
14+
15+
else:
16+
try:
17+
from django.conf.urls import url, patterns
18+
except ImportError:
19+
from django.conf.urls.defaults import url, patterns # Support for Django < 1.4
20+
21+
urlpatterns = patterns(
22+
'dj_elastictranscoder.views',
23+
url(r'^endpoint/$', 'aws_endpoint'),
24+
url(r'^aws_endpoint/$', 'aws_endpoint', name='aws_endpoint'),
25+
url(r'^qiniu_endpoint/$', 'qiniu_endpoint', name='qiniu_endpoint'),
26+
url(r'^aliyun_endpoint', 'aliyun_endpoint', name='aliyun_endpoint'),
27+
)

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get_version():
3737
zip_safe=False,
3838
install_requires=[
3939
"boto3 >= 1.1",
40-
"django >= 1.3, < 1.9",
40+
"django >= 1.3, < 1.10",
4141
"qiniu >= 7.0.8",
4242
],
4343
classifiers=[

0 commit comments

Comments
 (0)