Skip to content

Commit 4b2231b

Browse files
author
Richard Jones
committed
fixed documentation of filter()...
...in the case of multiple values in a String search [SF#1373396]
1 parent c456698 commit 4b2231b

File tree

5 files changed

+26
-16
lines changed

5 files changed

+26
-16
lines changed

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Fixed:
2323
are highlighted as required fields (sf bug 1392364)
2424
- french translation updated by Patrick Decat (sf patch 1397059)
2525
- HTTP authorization takes precedence over session cookie (sf bug 1396134)
26+
- fixed documentation of filter() in the case of multiple values in a
27+
String search (sf bug 1373396)
2628

2729

2830
2005-10-07 0.9.0b1

roundup/backends/back_anydbm.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
#$Id: back_anydbm.py,v 1.190 2005-10-07 05:35:03 richard Exp $
18+
#$Id: back_anydbm.py,v 1.191 2006-01-13 00:05:46 richard Exp $
1919
'''This module defines a backend that saves the hyperdatabase in a
2020
database chosen by anydbm. It is guaranteed to always be available in python
2121
versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -1574,9 +1574,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
15741574
15751575
"search_matches" is {nodeid: marker} or None
15761576
1577-
The filter must match all properties specificed - but if the
1578-
property value to match is a list, any one of the values in the
1579-
list may match for that property to match.
1577+
The filter must match all properties specificed. If the property
1578+
value to match is a list:
1579+
1580+
1. String properties must match all elements in the list, and
1581+
2. Other properties must match any of the elements in the list.
15801582
"""
15811583
if __debug__:
15821584
start_t = time.time()

roundup/backends/back_mysql.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#$Id: back_mysql.py,v 1.60 2005-10-24 03:37:11 richard Exp $
1+
#$Id: back_mysql.py,v 1.61 2006-01-13 00:05:46 richard Exp $
22
#
33
# Copyright (c) 2003 Martynas Sklyzmantas, Andrey Lebedev <[email protected]>
44
#
@@ -508,9 +508,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
508508
509509
"search_matches" is {nodeid: marker} or None
510510
511-
The filter must match all properties specificed - but if the
512-
property value to match is a list, any one of the values in the
513-
list may match for that property to match.
511+
The filter must match all properties specificed. If the property
512+
value to match is a list:
513+
514+
1. String properties must match all elements in the list, and
515+
2. Other properties must match any of the elements in the list.
514516
'''
515517
# we can't match anything if search_matches is empty
516518
if search_matches == {}:

roundup/backends/rdbms_common.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: rdbms_common.py,v 1.159 2005-10-07 05:35:04 richard Exp $
1+
# $Id: rdbms_common.py,v 1.160 2006-01-13 00:05:46 richard Exp $
22
''' Relational database (SQL) backend common code.
33
44
Basics:
@@ -2050,9 +2050,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
20502050
20512051
"search_matches" is {nodeid: marker} or None
20522052
2053-
The filter must match all properties specificed - but if the
2054-
property value to match is a list, any one of the values in the
2055-
list may match for that property to match.
2053+
The filter must match all properties specificed. If the property
2054+
value to match is a list:
2055+
2056+
1. String properties must match all elements in the list, and
2057+
2. Other properties must match any of the elements in the list.
20562058
'''
20572059
# we can't match anything if search_matches is empty
20582060
if search_matches == {}:

roundup/hyperdb.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: hyperdb.py,v 1.111 2005-07-18 02:35:18 richard Exp $
18+
# $Id: hyperdb.py,v 1.112 2006-01-13 00:05:46 richard Exp $
1919

2020
"""Hyperdatabase implementation, especially field types.
2121
"""
@@ -648,9 +648,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
648648
649649
"search_matches" is {nodeid: marker}
650650
651-
The filter must match all properties specificed - but if the
652-
property value to match is a list, any one of the values in the
653-
list may match for that property to match.
651+
The filter must match all properties specificed. If the property
652+
value to match is a list:
653+
654+
1. String properties must match all elements in the list, and
655+
2. Other properties must match any of the elements in the list.
654656
"""
655657
raise NotImplementedError
656658

0 commit comments

Comments
 (0)