initial django 1.9 migration

geocam · Feb 2, 2016 · b686059 · b686059
1 parent 84bbbab
commit b686059
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 64 deletions.
diff --git a/geocamTrack/templates/geocamTrack/testLive.html b/geocamTrack/templates/geocamTrack/testLive.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 
 {% block contents %}
     <span>Current Positions are:</span> <span id="live_positions_state"></span>
@@ -18,4 +17,4 @@
 	            });
 	        });
 	    </script>
-{% endblock scripts%}
+{% endblock scripts%}
diff --git a/geocamTrack/urls.py b/geocamTrack/urls.py
@@ -4,76 +4,71 @@
 # All rights reserved.
 # __END_LICENSE__
 
-from django.conf.urls import patterns
+from django.conf.urls import url
 
 from geocamTrack import views
 from django.conf import settings
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [url(r'^$', views.getIndex,
+                   {'readOnly': True}, 'geocamTrack_index'),
 
-    (r'^$', views.getIndex,
-     {'readOnly': True}, 'geocamTrack_index'),
-
-    (r'^resources.json$', views.getResourcesJson,
-     {'readOnly': True}),
-    (r'^icon/(\S+)', views.getIcon,
-     {'readOnly': True}),
-    (r'^liveMap/$', views.getLiveMap,
-     {'readOnly': True}),
-    (r'^liveMap.kml$', views.getKmlNetworkLink,
-     {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']}),
-    (r'^latest.kml$', views.getKmlLatest,
-     {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']}),
-    (r'^post/$', views.postPosition,
-     {'challenge': 'basic'  # for best support of future mobile apps
-      }),
-    (r'^tracks.kml$', views.getCurrentPosKml,
-     {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
-     'geocamTrack_tracks'),
-    (r'^recent/tracks.kml$', views.getRecentTracksKml,
-     {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
-     'geocamTrack_recentTracks'),
-    (r'^cached/tracks.kml$', views.getCachedTracksKml,
-     {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
-     'geocamTrack_cachedTracks'),
-    (r'^trackIndex.kml$', views.getTrackIndexKml,
-     {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
-     'geocamTrack_trackIndex'),
-    (r'^csvTrackIndex/$', views.getCsvTrackIndex,
-     {'readOnly': True},
-     'geocamTrack_csvTrackIndex'),
-    (r'^track/([^\./]+\.csv)$', views.getTrackCsv,
-     {'readOnly': True},
-     'geocamTrack_trackCsv'),
-    (r'^track/(?P<trackName>[\w-]+)$', views.getTrackKml,
-     {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
-     'geocamTrack_trackKml'),
-    (r'^animated/track/(?P<trackName>[\w\d\s-]+)$', views.getAnimatedTrackKml,
-#     {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
-     {'securityTags': ['kml', 'readOnly']},
-     'geocamTrack_trackKml_animated'),
-    (r'^mapJsonTrack/(?P<uuid>[\w-]+)$', views.mapJsonTrack, {'loginRequired': True}, 'geocamTrack_mapJsonTrack'),
-    (r'^mapJsonPosition/(?P<id>[\d]+)$', views.mapJsonPosition, {'loginRequired': True}, 'geocamTrack_mapJsonPosition'),
-    (r'importTrack/$', views.importTrack, {'loginRequired': True}, 'geocamTrack_importTrack'),
-)
+               url(r'^resources.json$', views.getResourcesJson,
+                   {'readOnly': True}),
+               url(r'^icon/(\S+)', views.getIcon,
+                   {'readOnly': True}),
+               url(r'^liveMap/$', views.getLiveMap,
+                   {'readOnly': True}),
+               url(r'^liveMap.kml$', views.getKmlNetworkLink,
+                   {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']}),
+               url(r'^latest.kml$', views.getKmlLatest,
+                   {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']}),
+               url(r'^post/$', views.postPosition,
+                   {'challenge': 'basic'  # for best support of future mobile apps
+                }),
+    url(r'^tracks.kml$', views.getCurrentPosKml,
+        {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
+        'geocamTrack_tracks'),
+               url(r'^recent/tracks.kml$', views.getRecentTracksKml,
+                   {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
+                   'geocamTrack_recentTracks'),
+               url(r'^cached/tracks.kml$', views.getCachedTracksKml,
+                   {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
+                   'geocamTrack_cachedTracks'),
+               url(r'^trackIndex.kml$', views.getTrackIndexKml,
+                   {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
+                   'geocamTrack_trackIndex'),
+               url(r'^csvTrackIndex/$', views.getCsvTrackIndex,
+                   {'readOnly': True},
+                   'geocamTrack_csvTrackIndex'),
+               url(r'^track/([^\./]+\.csv)$', views.getTrackCsv,
+                   {'readOnly': True},
+                   'geocamTrack_trackCsv'),
+               url(r'^track/(?P<trackName>[\w-]+)$', views.getTrackKml,
+                   {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
+                   'geocamTrack_trackKml'),
+               url(r'^animated/track/(?P<trackName>[\w\d\s-]+)$', views.getAnimatedTrackKml,
+                   #     {'readOnly': True, 'loginRequired': False, 'securityTags': ['kml', 'readOnly']},
+                   {'securityTags': ['kml', 'readOnly']},
+                   'geocamTrack_trackKml_animated'),
+               url(r'^mapJsonTrack/(?P<uuid>[\w-]+)$', views.mapJsonTrack, {'loginRequired': True}, 'geocamTrack_mapJsonTrack'),
+               url(r'^mapJsonPosition/(?P<id>[\d]+)$', views.mapJsonPosition, {'loginRequired': True}, 'geocamTrack_mapJsonPosition'),
+               url(r'importTrack/$', views.importTrack, {'loginRequired': True}, 'geocamTrack_importTrack'),
+]
 
 if settings.XGDS_SSE:
     from sse_wrapper.views import EventStreamView
-    urlpatterns += patterns('',
-                            (r'^live/test/$', views.getLiveTest, {}, 'geocamTrack_liveTest'),
-                            (r'^live/test/(?P<trackId>[\d-]+)$', views.getLiveTest, {}, 'geocamTrack_liveTest'),
-                            (r'^live/testPositions/$', views.testPositions, {}, 'geocamTrack_testPositions'),
-                            (r'^live/testPositions/(?P<trackId>[\d-]+)$', views.testPositions, {}, 'geocamTrack_testPositions'),
-                            (r'^live/startStreaming/$', views.sendActivePositions, {}, 'geocamTrack_startStreaming'),
-
-                            (r'^live/positions/(?P<trackId>[\d-]+)$', views.getActivePositionsJson, {}, 'geocamTrack_livePositions'),
-                            (r'^live/positions-stream/(?P<channel_extension>[\w]+)/$', EventStreamView.as_view(channel='live/positions'), {}, 'geocamTrack_livePositions_stream'),
+    urlpatterns += [url(r'^live/test/$', views.getLiveTest, {}, 'geocamTrack_liveTest'),
+                    url(r'^live/test/(?P<trackId>[\d-]+)$', views.getLiveTest, {}, 'geocamTrack_liveTest'),
+                    url(r'^live/testPositions/$', views.testPositions, {}, 'geocamTrack_testPositions'),
+                    url(r'^live/testPositions/(?P<trackId>[\d-]+)$', views.testPositions, {}, 'geocamTrack_testPositions'),
+                    url(r'^live/startStreaming/$', views.sendActivePositions, {}, 'geocamTrack_startStreaming'),
 
-                            (r'^live/positions/$', views.getActivePositionsJson, {}, 'geocamTrack_livePositions'),
-                            (r'^live/positions-stream/$', EventStreamView.as_view(channel='live/positions'), {}, 'geocamTrack_livePositions_stream'),
+                    url(r'^live/positions/(?P<trackId>[\d-]+)$', views.getActivePositionsJson, {}, 'geocamTrack_livePositions'),
+                    url(r'^live/positions-stream/(?P<channel_extension>[\w]+)/$', EventStreamView.as_view(channel='live/positions'), {}, 'geocamTrack_livePositions_stream'),
 
-                            (r'^mapJsonTrack/(?P<channel_extension>[\w]+)/$', EventStreamView.as_view(channel='mapJsonTrack'), {'loginRequired': True}, 'geocamTrack_mapJsonTrack_stream'),
-                            (r'^mapJsonPosition/(?P<channel_extension>[\w]+)/$', EventStreamView.as_view(channel='mapJsonPosition'), {'loginRequired': True}, 'geocamTrack_mapJsonPosition_stream'),
+                    url(r'^live/positions/$', views.getActivePositionsJson, {}, 'geocamTrack_livePositions'),
+                    url(r'^live/positions-stream/$', EventStreamView.as_view(channel='live/positions'), {}, 'geocamTrack_livePositions_stream'),
 
-                            )
+                    url(r'^mapJsonTrack/(?P<channel_extension>[\w]+)/$', EventStreamView.as_view(channel='mapJsonTrack'), {'loginRequired': True}, 'geocamTrack_mapJsonTrack_stream'),
+                    url(r'^mapJsonPosition/(?P<channel_extension>[\w]+)/$', EventStreamView.as_view(channel='mapJsonPosition'), {'loginRequired': True}, 'geocamTrack_mapJsonPosition_stream')
+]