Merge pull request #819 from acdha/692-correct-override_urls-warning

Correct override_urls check in Api (closes #692)
django-tastypie · Feb 15, 2013 · c75734c · c75734c
2 parents 21c55d9 + 5cf32ca
commit c75734c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/tastypie/api.py b/tastypie/api.py
@@ -79,8 +79,7 @@ def override_urls(self):
         """
         Deprecated. Will be removed by v1.0.0. Please use ``prepend_urls`` instead.
         """
-        warnings.warn("'override_urls' is a deprecated method & will be removed by v1.0.0. Please use ``prepend_urls`` instead.")
-        return self.prepend_urls()
+        return []
 
     def prepend_urls(self):
         """
@@ -104,9 +103,10 @@ def urls(self):
 
         urlpatterns = self.prepend_urls()
 
-        if self.override_urls():
+        overridden_urls = self.override_urls()
+        if overridden_urls:
             warnings.warn("'override_urls' is a deprecated method & will be removed by v1.0.0. Please rename your method to ``prepend_urls``.")
-            urlpatterns += self.override_urls()
+            urlpatterns += overridden_urls
 
         urlpatterns += patterns('',
             *pattern_list

diff --git a/tastypie/resources.py b/tastypie/resources.py
@@ -337,9 +337,10 @@ def urls(self):
         """
         urls = self.prepend_urls()
 
-        if self.override_urls():
+        overridden_urls = self.override_urls()
+        if overridden_urls:
             warnings.warn("'override_urls' is a deprecated method & will be removed by v1.0.0. Please rename your method to ``prepend_urls``.")
-            urls += self.override_urls()
+            urls += overridden_urls
 
         urls += self.base_urls()
         urlpatterns = patterns('',