Fix issue2550505.

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4136 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/roundup/backends/back_anydbm.py b/roundup/backends/back_anydbm.py
index 17dfa78dfbc974766605f483a2bcc7e8ed93c770..0005f4db9ee55645a59e372cc9964657cdca6130 100644 (file)
--- a/roundup/backends/back_anydbm.py
+++ b/roundup/backends/back_anydbm.py
@@ -1561,7 +1561,7 @@ class Class(hyperdb.Class):
         "sort" and "group" are (dir, prop) where dir is '+', '-' or None
         and prop is a prop name or None
 
-        "search_matches" is {nodeid: marker} or None
+        "search_matches" is a sequence type or None
 
         The filter must match all properties specificed. If the property
         value to match is a list:
@@ -1721,7 +1721,7 @@ class Class(hyperdb.Class):
             if search_matches is not None:
                 k = []
                 for v in matches:
-                    if search_matches.has_key(v[0]):
+                    if v[0] in search_matches:
                         k.append(v)
                 matches = k
 

diff --git a/roundup/backends/rdbms_common.py b/roundup/backends/rdbms_common.py
index 4b3b480ec2e43f46007a41c1bfb4b32e32dcbde6..b5ce677cc84fa231476afc6eaa9a59a4c7f450f9 100644 (file)
--- a/roundup/backends/rdbms_common.py
+++ b/roundup/backends/rdbms_common.py
@@ -2114,7 +2114,7 @@ class Class(hyperdb.Class):
         backward-compatibility reasons a single (dir, prop) tuple is
         also allowed.
 
-        "search_matches" is {nodeid: marker} or None
+        "search_matches" is a sequence type or None
 
         The filter must match all properties specificed. If the property
         value to match is a list:
@@ -2123,7 +2123,7 @@ class Class(hyperdb.Class):
         2. Other properties must match any of the elements in the list.
         """
         # we can't match anything if search_matches is empty
-        if search_matches == {}:
+        if not search_matches and search_matches is not None:
             return []
 
         if __debug__:
@@ -2334,8 +2334,7 @@ class Class(hyperdb.Class):
 
         # add results of full text search
         if search_matches is not None:
-            v = search_matches.keys()
-            s = ','.join([a for x in v])
+            s = ','.join([a for x in search_matches])
             where.append('_%s.id in (%s)'%(icn, s))
             args = args + v
 

diff --git a/roundup/hyperdb.py b/roundup/hyperdb.py
index 637543c59405b4a68e02c9b70dc6fee9c8f8574e..b504061b003f19f37406876475f7c26533d203a8 100644 (file)
--- a/roundup/hyperdb.py
+++ b/roundup/hyperdb.py
@@ -707,7 +707,7 @@ All methods except __repr__ must be implemented by a concrete backend Database.
         raise NotImplementedError
 
     def getfile(self, classname, nodeid, property):
-        '''Store the content of the file in the database.
+        '''Get the content of the file in the database.
         '''
         raise NotImplementedError
 
@@ -1129,7 +1129,7 @@ class Class:
         backward-compatibility reasons a single (dir, prop) tuple is
         also allowed.
 
-        "search_matches" is {nodeid: marker}
+        "search_matches" is a sequence type
 
         The filter must match all properties specificed. If the property
         value to match is a list: