Merge lp:~fgallina/python-timeline-django/no-query-fix into lp:python-timeline-django

[Fabián Ezequiel Gallina]

Properly handle absence of query in filters

This fixes a TypeError that triggered because django-statsd db patches
caused a max recursion exception that propagated up until the filters,
rendering the query parameter of them as None. Because of this, while
the error was really passed through oops, the final error reported to
the user was related to python-timeline-django.

[James Westby (james-w)]

review: Approve

=== modified file 'timeline_django/filters.py'
--- timeline_django/filters.py	2012-02-24 20:32:10 +0000
+++ timeline_django/filters.py	2014-04-29 19:04:42 +0000
@@ -19,7 +19,7 @@
 
 
 def _filter_table(query, table, reason):
-    if table in query:
+    if query is not None and table in query:
         return query.split(" ", 1)[0] + " <%s query redacted>" % reason
     return query
 

=== modified file 'timeline_django/tests/test_filters.py'
--- timeline_django/tests/test_filters.py	2012-02-24 20:32:10 +0000
+++ timeline_django/tests/test_filters.py	2014-04-29 19:04:42 +0000
@@ -33,6 +33,10 @@
         result = filters.filter_session_info(query)
         self.assertEqual('select <session query redacted>', result)
 
+    def test_none(self):
+        result = filters.filter_session_info(None)
+        self.assertIsNone(result)
+
 
 class FilterUserInfoTests(TestCase):
 
@@ -46,6 +50,10 @@
         result = filters.filter_user_info(query)
         self.assertEqual('select <user query redacted>', result)
 
+    def test_none(self):
+        result = filters.filter_user_info(None)
+        self.assertIsNone(result)
+
 
 class FilterSessionQueryTests(TestCase):