Skip to content

Commit 74e34df

Browse files
committed
Upgrade to Django 2.0(.2)
Changes needed since url library has been rewritten in this version of Django.
1 parent dacbbe3 commit 74e34df

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

django-jquery-file-upload/urls.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.conf.urls import include, url
1+
from django.urls import include, path
22
from django.http import HttpResponseRedirect
33
from django.conf import settings
44

@@ -7,9 +7,9 @@
77
admin.autodiscover()
88

99
urlpatterns = [
10-
url(r'^$', lambda x: HttpResponseRedirect('/upload/new/')),
11-
url(r'^upload/', include('fileupload.urls')),
12-
url(r'^admin/', include(admin.site.urls)),
10+
path('', lambda x: HttpResponseRedirect('/upload/new/')),
11+
path('upload/', include('fileupload.urls')),
12+
path('admin/', admin.site.urls),
1313
]
1414

1515
if settings.DEBUG:

fileupload/serialize.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# encoding: utf-8
22
import mimetypes
33
import re
4-
from django.core.urlresolvers import reverse
4+
from django.urls import reverse
55

66

77
def order_name(name):

fileupload/urls.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# encoding: utf-8
2-
from django.conf.urls import url
2+
from django.urls import path
33
from fileupload.views import (
44
BasicVersionCreateView, BasicPlusVersionCreateView,
55
jQueryVersionCreateView, AngularVersionCreateView,
66
PictureCreateView, PictureDeleteView, PictureListView,
77
)
88

99
urlpatterns = [
10-
url(r'^basic/$', BasicVersionCreateView.as_view(), name='upload-basic'),
11-
url(r'^basic/plus/$', BasicPlusVersionCreateView.as_view(), name='upload-basic-plus'),
12-
url(r'^new/$', PictureCreateView.as_view(), name='upload-new'),
13-
url(r'^angular/$', AngularVersionCreateView.as_view(), name='upload-angular'),
14-
url(r'^jquery-ui/$', jQueryVersionCreateView.as_view(), name='upload-jquery'),
15-
url(r'^delete/(?P<pk>\d+)$', PictureDeleteView.as_view(), name='upload-delete'),
16-
url(r'^view/$', PictureListView.as_view(), name='upload-view'),
10+
path('basic/', BasicVersionCreateView.as_view(), name='upload-basic'),
11+
path('basic/plus/', BasicPlusVersionCreateView.as_view(), name='upload-basic-plus'),
12+
path('new/', PictureCreateView.as_view(), name='upload-new'),
13+
path('angular/', AngularVersionCreateView.as_view(), name='upload-angular'),
14+
path('jquery-ui/', jQueryVersionCreateView.as_view(), name='upload-jquery'),
15+
path('delete/<int:pk>', PictureDeleteView.as_view(), name='upload-delete'),
16+
path('view/', PictureListView.as_view(), name='upload-view'),
1717
]

requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
django==1.9
2-
pillow==5.0.0
1+
django>=2.0.2,<2.0.99
2+
pillow==5.0.0

0 commit comments

Comments
 (0)