merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -3,7 +3,8 @@ are given with the most recent entry first.
 
 2004-05-?? 0.7.2
 Fixed:
-- fixed anydbm sorting with None values (sf bug 952853)
+- anydbm sorting with None values (sf bug 952853)
+- roundup-server -g option not recognised (sf bug 952310)
 
 
 2004-05-07 0.7.1

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.146 2004-05-05 01:52:34 richard Exp $
+#$Id: back_anydbm.py,v 1.146.2.1 2004-05-12 22:28:21 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -1766,6 +1766,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                             entry.insert(0, v)
                             continue
 
+                        # missing (None) values are always sorted first
+                        if v is None:
+                            entry.insert(0, v)
+                            continue
+
                         if isinstance(propclass, String):
                             # it might be a string that's really an integer
                             try: tv = int(v)

roundup/scripts/roundup_server.py

@@ -17,7 +17,7 @@
 
 """Command-line script that runs a server over roundup.cgi.client.
 
-$Id: roundup_server.py,v 1.46.2.1 2004-05-09 23:41:13 richard Exp $
+$Id: roundup_server.py,v 1.46.2.2 2004-05-12 22:31:37 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -434,7 +434,7 @@ def run(port=PORT, success_message=None):
 
     try:
         # handle the command-line args
-        options = 'n:p:u:d:l:hNv'
+        options = 'n:p:g:u:d:l:hNv'
         if RoundupService:
             options += 'c'