Merge pull request #451 from will-moore/django-4-0

django 4.0
ome · Jun 15, 2023 · d30fa0a · d30fa0a
2 parents f7e917b + b8d0005
commit d30fa0a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 33 deletions.
diff --git a/plugin/ol3-viewer/urls.py b/plugin/ol3-viewer/urls.py
@@ -16,14 +16,15 @@
 #
 
 from django.conf.urls import patterns
-from django.conf.urls import url
+from django.urls import re_path
 
 import views
 
 urlpatterns = patterns('django.views.generic.simple',
-                       url(r'^(?P<iid>[0-9]+)?/?$', views.index,
-                           name='ol3-viewer-index'),
-                       url(r'^plugin/(?P<iid>[0-9]+)?/?$', views.plugin,
-                           name='ol3-viewer-plugin'),
-                       url(r'^plugin-debug/(?P<iid>[0-9]+)?/?$',
-                           views.plugin_debug, name='ol3-viewer-plugin-debug'))
+                       re_path(r'^(?P<iid>[0-9]+)?/?$', views.index,
+                               name='ol3-viewer-index'),
+                       re_path(r'^plugin/(?P<iid>[0-9]+)?/?$', views.plugin,
+                               name='ol3-viewer-plugin'),
+                       re_path(r'^plugin-debug/(?P<iid>[0-9]+)?/?$',
+                               views.plugin_debug,
+                               name='ol3-viewer-plugin-debug'))
diff --git a/plugin/omero_iviewer/urls.py b/plugin/omero_iviewer/urls.py
@@ -15,38 +15,38 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from omero_iviewer import views
 
 urlpatterns = [
     # general entry point for iviewer app
-    url(r'^$', views.index, name='omero_iviewer_index'),
-    url(r'^persist_rois/?$', views.persist_rois,
-        name='omero_iviewer_persist_rois'),
-    url(r'^image_data/(?P<image_id>[0-9]+)/$', views.image_data,
-        name='omero_iviewer_image_data'),
-    url(r'^image_data/(?P<image_id>[0-9]+)/delta_t/$', views.delta_t_data,
-        name='omero_iviewer_image_data_deltat'),
+    re_path(r'^$', views.index, name='omero_iviewer_index'),
+    re_path(r'^persist_rois/?$', views.persist_rois,
+            name='omero_iviewer_persist_rois'),
+    re_path(r'^image_data/(?P<image_id>[0-9]+)/$', views.image_data,
+            name='omero_iviewer_image_data'),
+    re_path(r'^image_data/(?P<image_id>[0-9]+)/delta_t/$', views.delta_t_data,
+            name='omero_iviewer_image_data_deltat'),
     # load image_data for image linked to an ROI or Shape
-    url(r'^(?P<obj_type>(roi|shape))/(?P<obj_id>[0-9]+)/image_data/$',
-        views.roi_image_data, name='omero_iviewer_roi_image_data'),
-    url(r'^save_projection/?$', views.save_projection,
-        name='omero_iviewer_save_projection'),
-    url(r'^well_images/?$', views.well_images,
-        name='omero_iviewer_well_images'),
-    url(r'^get_intensity/?$', views.get_intensity,
-        name='omero_iviewer_get_intensity'),
-    url(r'^shape_stats/?$', views.shape_stats,
-        name='omero_iviewer_shape_stats'),
+    re_path(r'^(?P<obj_type>(roi|shape))/(?P<obj_id>[0-9]+)/image_data/$',
+            views.roi_image_data, name='omero_iviewer_roi_image_data'),
+    re_path(r'^save_projection/?$', views.save_projection,
+            name='omero_iviewer_save_projection'),
+    re_path(r'^well_images/?$', views.well_images,
+            name='omero_iviewer_well_images'),
+    re_path(r'^get_intensity/?$', views.get_intensity,
+            name='omero_iviewer_get_intensity'),
+    re_path(r'^shape_stats/?$', views.shape_stats,
+            name='omero_iviewer_shape_stats'),
     # optional z or t range e.g. iid/0-10/2-5/
-    url(r'^rois_by_plane/(?P<image_id>[0-9]+)/'
-        r'(?P<the_z>[0-9]+)(?:-(?P<z_end>[0-9]+))?/'
-        r'(?P<the_t>[0-9:]+)(?:-(?P<t_end>[0-9]+))?/$',
-        views.rois_by_plane, name='omero_iviewer_rois_by_plane'),
-    url(r'^plane_shape_counts/(?P<image_id>[0-9]+)/$',
-        views.plane_shape_counts, name='omero_iviewer_plane_shape_counts'),
+    re_path(r'^rois_by_plane/(?P<image_id>[0-9]+)/'
+            r'(?P<the_z>[0-9]+)(?:-(?P<z_end>[0-9]+))?/'
+            r'(?P<the_t>[0-9:]+)(?:-(?P<t_end>[0-9]+))?/$',
+            views.rois_by_plane, name='omero_iviewer_rois_by_plane'),
+    re_path(r'^plane_shape_counts/(?P<image_id>[0-9]+)/$',
+            views.plane_shape_counts, name='omero_iviewer_plane_shape_counts'),
     # Find the index of an ROI within all ROIs for the Image (for pagination)
-    url(r'^(?P<obj_type>(roi|shape))/(?P<obj_id>[0-9]+)/page_data/$',
-        views.roi_page_data, name='omero_iviewer_roi_page_data'),
+    re_path(r'^(?P<obj_type>(roi|shape))/(?P<obj_id>[0-9]+)/page_data/$',
+            views.roi_page_data, name='omero_iviewer_roi_page_data'),
 ]