Python: Model django.conf.urls.url (v 1.x)

python/ql/test/experimental/library-tests/frameworks/django-v1/routing_test.py

@@ -4,19 +4,19 @@ from django.http.response import HttpResponse
 from django.views.generic import View
 
 
-def url_match_xss(request, foo, bar, no_taint=None):  # $f-:routeHandler $f-:routedParameter=foo $f-:routedParameter=bar
+def url_match_xss(request, foo, bar, no_taint=None):  # $routeHandler $routedParameter=foo $routedParameter=bar
     return HttpResponse('url_match_xss: {} {}'.format(foo, bar))
 
 
-def get_params_xss(request):  # $f-:routeHandler
+def get_params_xss(request):  # $routeHandler
     return HttpResponse(request.GET.get("untrusted"))
 
 
-def post_params_xss(request):  # $f-:routeHandler
+def post_params_xss(request):  # $routeHandler
     return HttpResponse(request.POST.get("untrusted"))
 
 
-def http_resp_write(request):  # $f-:routeHandler
+def http_resp_write(request):  # $routeHandler
     rsp = HttpResponse()
     rsp.write(request.GET.get("untrusted"))
     return rsp
@@ -36,44 +36,44 @@ class ClassView(View, Foo):
         return HttpResponse('ClassView get: {}'.format(untrusted))
 
 
-def show_articles(request, page_number=1):  # $f-:routeHandler $f-:routedParameter=page_number
+def show_articles(request, page_number=1):  # $routeHandler $routedParameter=page_number
     page_number = int(page_number)
     return HttpResponse('articles page: {}'.format(page_number))
 
 
-def xxs_positional_arg(request, arg0, arg1, no_taint=None):  # $f-:routeHandler $f-:routedParameter=arg0 $f-:routedParameter=arg1
+def xxs_positional_arg(request, arg0, arg1, no_taint=None):  # $routeHandler $routedParameter=arg0 $routedParameter=arg1
     return HttpResponse('xxs_positional_arg: {} {}'.format(arg0, arg1))
 
 
 urlpatterns = [
-    url(r"^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)", url_match_xss),  # $f-:routeSetup="^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)"
-    url(r"^get_params", get_params_xss),  # $f-:routeSetup="^get_params"
-    url(r"^post_params", post_params_xss),  # $f-:routeSetup="^post_params"
-    url(r"^http_resp_write", http_resp_write),  # $f-:routeSetup="^http_resp_write"
-    url(r"^class_view/(?P<untrusted>.+)", ClassView.as_view()),  # $f-:routeSetup="^class_view/(?P<untrusted>.+)"
+    url(r"^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)", url_match_xss),  # $routeSetup="^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)"
+    url(r"^get_params", get_params_xss),  # $routeSetup="^get_params"
+    url(r"^post_params", post_params_xss),  # $routeSetup="^post_params"
+    url(r"^http_resp_write", http_resp_write),  # $routeSetup="^http_resp_write"
+    url(r"^class_view/(?P<untrusted>.+)", ClassView.as_view()),  # $routeSetup="^class_view/(?P<untrusted>.+)"
 
     # one pattern to support `articles/page-<n>` and ensuring that articles/ goes to page-1
-    url(r"articles/^(?:page-(?P<page_number>\d+)/)?", show_articles),  # $f-:routeSetup="articles/^(?:page-(?P<page_number>\d+)/)?"
+    url(r"articles/^(?:page-(?P<page_number>\d+)/)?", show_articles),  # $routeSetup="articles/^(?:page-(?P<page_number>\d+)/)?"
     # passing as positional argument is not the recommended way of doing things, but it is certainly
     # possible
-    url(r"^([^/]+)/(?:foo|bar)/([^/]+)", xxs_positional_arg, name='xxs_positional_arg'),  # $f-:routeSetup="^([^/]+)/(?:foo|bar)/([^/]+)"
+    url(r"^([^/]+)/(?:foo|bar)/([^/]+)", xxs_positional_arg, name='xxs_positional_arg'),  # $routeSetup="^([^/]+)/(?:foo|bar)/([^/]+)"
 ]
 
 ################################################################################
 # Using patterns() for routing
 
-def show_user(request, username):  # $f-:routeHandler $f-:routedParameter=username
+def show_user(request, username):  # $routeHandler $routedParameter=username
     return HttpResponse('show_user {}'.format(username))
 
 
-urlpatterns = patterns(url(r"^users/(?P<username>[^/]+)", show_user))  # $f-:routeSetup="^users/(?P<username>[^/]+)"
+urlpatterns = patterns(url(r"^users/(?P<username>[^/]+)", show_user))  # $routeSetup="^users/(?P<username>[^/]+)"
 
 ################################################################################
 # Show we understand the keyword arguments to django.conf.urls.url
 
-def kw_args(request):  # $f-:routeHandler
+def kw_args(request):  # $routeHandler
     return HttpResponse('kw_args')
 
 urlpatterns = [
-    url(view=kw_args, regex=r"^kw_args")  # $f-:routeSetup="^kw_args"
+    url(view=kw_args, regex=r"^kw_args")  # $routeSetup="^kw_args"
 ]

python/ql/test/experimental/library-tests/frameworks/django-v2-v3/routing_test.py

@@ -101,9 +101,9 @@ urlpatterns = [
 # This version 1.x way of defining urls is deprecated in Django 3.1, but still works
 from django.conf.urls import url
 
-def deprecated(request):  # $f-:routeHandler
+def deprecated(request):  # $routeHandler
     return HttpResponse('deprecated')
 
 urlpatterns = [
-    url(r"^deprecated/", deprecated),  # $f-:routeSetup="^deprecated/"
+    url(r"^deprecated/", deprecated),  # $routeSetup="^deprecated/"
 ]

python/ql/test/experimental/library-tests/frameworks/django-v2-v3/testapp/urls.py

@@ -11,5 +11,5 @@ urlpatterns = [
     # inline expectation tests (which thinks the `$` would mark the beginning of a new
     # line)
     re_path(r"^ba[rz]/", views.bar_baz),  # $routeSetup="^ba[rz]/"
-    url(r"^deprecated/", views.deprecated),  # $f-routeSetup="^deprecated/"
+    url(r"^deprecated/", views.deprecated),  # $routeSetup="^deprecated/"
 ]

python/ql/test/experimental/library-tests/frameworks/django-v2-v3/testapp/views.py

@@ -6,5 +6,5 @@ def foo(request: HttpRequest):  # $routeHandler
 def bar_baz(request: HttpRequest):  # $routeHandler
     return HttpResponse("bar_baz")
 
-def deprecated(request: HttpRequest):  # $f-:routeHandler
+def deprecated(request: HttpRequest):  # $routeHandler
     return HttpResponse("deprecated")