From 552f09f7ebbb8a96e217a91ecd8c10c6035964aa Mon Sep 17 00:00:00 2001 From: SimonGreenhill Date: Thu, 14 Jan 2016 14:02:12 +1300 Subject: [PATCH 1/4] fixing DeprecationWarning --- src/watson/urls.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/watson/urls.py b/src/watson/urls.py index 5309fbd..5644227 100644 --- a/src/watson/urls.py +++ b/src/watson/urls.py @@ -4,11 +4,12 @@ from __future__ import unicode_literals from django.conf.urls import url, patterns +from watson.views import search, search_json -urlpatterns = patterns("watson.views", +urlpatterns = [ - url("^$", "search", name="search"), + url("^$", search, name="search"), - url("^json/$", "search_json", name="search_json"), + url("^json/$", search_json, name="search_json"), -) +] From 7769423b8bb4165ea0194c0b18dca598bb16e8dc Mon Sep 17 00:00:00 2001 From: SimonGreenhill Date: Thu, 14 Jan 2016 14:02:27 +1300 Subject: [PATCH 2/4] fixing NoArgs DeprecationWarning --- src/watson/management/commands/installwatson.py | 4 ++-- src/watson/management/commands/listwatson.py | 4 ++-- src/watson/management/commands/uninstallwatson.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/watson/management/commands/installwatson.py b/src/watson/management/commands/installwatson.py index f206728..96fffbf 100644 --- a/src/watson/management/commands/installwatson.py +++ b/src/watson/management/commands/installwatson.py @@ -2,12 +2,12 @@ from __future__ import unicode_literals -from django.core.management.base import NoArgsCommand +from django.core.management.base import BaseCommand from watson.search import get_backend -class Command(NoArgsCommand): +class Command(BaseCommand): help = "Creates the database indices needed by django-watson." diff --git a/src/watson/management/commands/listwatson.py b/src/watson/management/commands/listwatson.py index 6292bee..34763b2 100644 --- a/src/watson/management/commands/listwatson.py +++ b/src/watson/management/commands/listwatson.py @@ -1,9 +1,9 @@ """Exposed the watson.get_registered_models() function as management command for debugging purpose. """ -from django.core.management.base import NoArgsCommand +from django.core.management.base import BaseCommand from watson import search as watson -class Command(NoArgsCommand): +class Command(BaseCommand): help = "List all registed models by django-watson." diff --git a/src/watson/management/commands/uninstallwatson.py b/src/watson/management/commands/uninstallwatson.py index a537e24..411dbed 100644 --- a/src/watson/management/commands/uninstallwatson.py +++ b/src/watson/management/commands/uninstallwatson.py @@ -2,12 +2,12 @@ from __future__ import unicode_literals -from django.core.management.base import NoArgsCommand +from django.core.management.base import BaseCommand from watson.search import get_backend -class Command(NoArgsCommand): +class Command(BaseCommand): help = "Destroys the database indices needed by django-watson." From 8544a91947e3ac0b50051a52b1deb03a3a26b6a3 Mon Sep 17 00:00:00 2001 From: SimonGreenhill Date: Thu, 14 Jan 2016 14:19:23 +1300 Subject: [PATCH 3/4] changing method signatures --- src/watson/management/commands/uninstallwatson.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/watson/management/commands/uninstallwatson.py b/src/watson/management/commands/uninstallwatson.py index 411dbed..41a7ea2 100644 --- a/src/watson/management/commands/uninstallwatson.py +++ b/src/watson/management/commands/uninstallwatson.py @@ -11,7 +11,7 @@ class Command(BaseCommand): help = "Destroys the database indices needed by django-watson." - def handle_noargs(self, **options): + def handle(self, *args, **options): """Runs the management command.""" verbosity = int(options.get("verbosity", 1)) backend = get_backend() From 4abd966ddcb7e7a6a912d6c97981cd96008b0400 Mon Sep 17 00:00:00 2001 From: SimonGreenhill Date: Thu, 14 Jan 2016 14:19:36 +1300 Subject: [PATCH 4/4] changing method signatures --- src/watson/management/commands/installwatson.py | 2 +- src/watson/management/commands/listwatson.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/watson/management/commands/installwatson.py b/src/watson/management/commands/installwatson.py index 96fffbf..14b5586 100644 --- a/src/watson/management/commands/installwatson.py +++ b/src/watson/management/commands/installwatson.py @@ -11,7 +11,7 @@ class Command(BaseCommand): help = "Creates the database indices needed by django-watson." - def handle_noargs(self, **options): + def handle(self, *args, **options): """Runs the management command.""" verbosity = int(options.get("verbosity", 1)) backend = get_backend() diff --git a/src/watson/management/commands/listwatson.py b/src/watson/management/commands/listwatson.py index 34763b2..2bc0939 100644 --- a/src/watson/management/commands/listwatson.py +++ b/src/watson/management/commands/listwatson.py @@ -7,7 +7,7 @@ class Command(BaseCommand): help = "List all registed models by django-watson." - def handle_noargs(self, **options): + def handle(self, *args, **options): """Runs the management command.""" self.stdout.write("The following models are registed for the django-watson search engine:\n") for mdl in watson.get_registered_models():