issue2551159 - cl.filter fails if filterspec is None ...

Fix case where passing None into a filter() call as the filterprop
causes a traceback. Also fix cases where sort or group are None
causing tracebacks.

Also fix typo in hyperdb filter() docstring.

Author: rouilj

roundup/hyperdb.py

@@ -1571,6 +1571,9 @@ def _proptree(self, filterspec, exact_match_spec={}, sortattr=[],
         If we retrieve (retr is True) linked items we don't follow
         across multilinks or links.
         """
+        if filterspec is None:
+            filterspec = {}
+
         proptree = Proptree(self.db, self, '', self.getprops(), retr=retr)
         for exact, spec in enumerate((filterspec, exact_match_spec)):
             for key, v in spec.items():
@@ -1647,6 +1650,11 @@ def _sortattr(self, sort=[], group=[]):
         with sanity checks (no duplicate properties) included. Always
         sort last by id -- if id is not already in sortattr.
         """
+        if sort is None:
+            sort = [(None,None)]
+        if group is None:
+            group = [(None, None)]
+
         seen = {}
         sortattr = []
         for srt in group, sort:
@@ -1695,7 +1703,7 @@ def filter(self, search_matches, filterspec, sort=[], group=[],
         is returning the first item of a sorted search by specifying
         limit=1 (i.e. the maximum or minimum depending on sort order).
 
-        The filter must match all properties specificed. If the property
+        The filter must match all properties specified. If the property
         value to match is a list:
 
         1. String properties must match all elements in the list, and

test/db_test_base.py

@@ -1807,6 +1807,23 @@ def filteringSetup(self, classname='issue'):
         self.db.commit()
         return self.iterSetup(classname)
 
+    def testFilteringNone(self):
+        ae, iiter = self.filteringSetup()
+        for filt in iiter():
+            ae(filt(None, None, ('+','id'), (None,None)), ['1', '2', '3', '4'])
+
+    def testSortingNone(self):
+        ae, iiter = self.filteringSetup()
+        for filt in iiter():
+            ae(filt(None, {'id': ['1','3','4']}, None, ('-', 'status')),
+                    ['3', '4', '1'])
+
+    def testGroupingNone(self):
+        ae, iiter = self.filteringSetup()
+        for filt in iiter():
+            ae(filt(None, {'title': ['issue']}, [('-', 'id')],
+                    None), ['3', '2', '1'])
+
     def testFilteringID(self):
         ae, iiter = self.filteringSetup()
         for filt in iiter():