Backwards-compatible signature of _proptree method

Author: schlatterbeck

roundup/backends/rdbms_common.py

@@ -2428,7 +2428,7 @@ def _filter_sql (self, search_matches, filterspec, srt=[], grp=[], retr=0,
         # figure the WHERE clause from the filterspec
         mlfilt = 0      # are we joining with Multilink tables?
         sortattr = self._sortattr (group = grp, sort = srt)
-        proptree = self._proptree(exact_match_spec, filterspec, sortattr, retr)
+        proptree = self._proptree(filterspec, exact_match_spec, sortattr, retr)
         mlseen = 0
         for pt in reversed(proptree.sortattr):
             p = pt

roundup/hyperdb.py

@@ -1302,7 +1302,8 @@ def _filter(self, search_matches, filterspec, sort=(None,None),
         """
         raise NotImplementedError
 
-    def _proptree(self, exact_match_spec, filterspec, sortattr=[], retr=False):
+    def _proptree(self, filterspec, exact_match_spec={}, sortattr=[],
+                  retr=False):
         """Build a tree of all transitive properties in the given
         exact_match_spec/filterspec.
         If we retrieve (retr is True) linked items we don't follow
@@ -1458,7 +1459,7 @@ def filter(self, search_matches, filterspec, sort=[], group=[],
         override the filter method instead of implementing _filter.
         """
         sortattr = self._sortattr(sort = sort, group = group)
-        proptree = self._proptree(exact_match_spec, filterspec, sortattr)
+        proptree = self._proptree(filterspec, exact_match_spec, sortattr)
         proptree.search(search_matches, retired=retired)
         if offset is not None or limit is not None:
             items = proptree.sort()