merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -1,7 +1,17 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
-2005-??-?? 0.8.5
+2006-??-?? 0.8.6
+Fixed:
+- french translation updated by Patrick Decat (sf patch 1397059)
+- tighten up Date parsing to not allow 'M/D/YY' (or 'D/M/YY) (sf bug
+  1290550)
+- handle "schema" being reserved word in MySQL 5+ (sf bug 1397569)
+- fixed documentation of filter() in the case of multiple values in a
+  String search (sf bug 1373396)
+
+
+2005-10-07 0.8.5
 Feature:
 - Argentinian Spanish translation by Ramiro Morales
 
@@ -11,7 +21,6 @@ Fixed:
 - Fix missing merge of fix to sf bug 1177057
 - Fix RDBMS indexer indexing UTF-8 words that encode to > 30 chars
 - Handle invalidly-specified charsets in incoming email
-- french translation updated by Patrick Decat (sf patch 1397059)
 
 
 2005-07-18 0.8.4

doc/index.txt

@@ -153,6 +153,7 @@ Martin Uzak,
 Darryl VanDorp,
 J Vickroy,
 William (Wilk),
+Tue Wennerberg,
 Matt Wilbert,
 Chris Withers.
 

roundup/__init__.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.31.2.6 2005-07-27 22:54:12 richard Exp $
+# $Id: __init__.py,v 1.31.2.7 2006-01-13 01:29:44 richard Exp $
 
 '''Roundup - issue tracking for knowledge workers.
 
@@ -68,6 +68,6 @@
 '''
 __docformat__ = 'restructuredtext'
 
-__version__ = '0.8.4'
+__version__ = '0.8.6'
 
 # vim: set filetype=python ts=4 sw=4 et si

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.179.2.9 2005-07-18 01:42:26 richard Exp $
+#$Id: back_anydbm.py,v 1.179.2.10 2006-01-13 01:29:46 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
@@ -1569,9 +1569,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
 
         "search_matches" is {nodeid: marker} or None
 
-        The filter must match all properties specificed - but if the
-        property value to match is a list, any one of the values in the
-        list may match for that property to match.
+        The filter must match all properties specificed. If the property
+        value to match is a list:
+        
+        1. String properties must match all elements in the list, and
+        2. Other properties must match any of the elements in the list.
         """
         if __debug__:
             start_t = time.time()

roundup/backends/back_mysql.py

@@ -172,6 +172,16 @@ def open_connection(self):
             self.sql('create index ids_name_idx on ids(name)')
             self.create_version_2_tables()
 
+    def load_dbschema(self):
+        ''' Load the schema definition that the database currently implements
+        '''
+        self.cursor.execute('select `schema` from `schema`')
+        schema = self.cursor.fetchone()
+        if schema:
+            self.database_schema = eval(schema[0])
+        else:
+            self.database_schema = {}
+
     def create_version_2_tables(self):
         # OTK store
         self.sql('''CREATE TABLE otks (otk_key VARCHAR(255),
@@ -507,9 +517,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
 
         "search_matches" is {nodeid: marker} or None
 
-        The filter must match all properties specificed - but if the
-        property value to match is a list, any one of the values in the
-        list may match for that property to match.
+        The filter must match all properties specificed. If the property
+        value to match is a list:
+
+        1. String properties must match all elements in the list, and
+        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 == {}:

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.142.2.11 2005-07-18 02:30:00 richard Exp $
+# $Id: rdbms_common.py,v 1.142.2.12 2006-01-13 01:29:46 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2039,9 +2039,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
 
         "search_matches" is {nodeid: marker} or None
 
-        The filter must match all properties specificed - but if the
-        property value to match is a list, any one of the values in the
-        list may match for that property to match.
+        The filter must match all properties specificed. If the property
+        value to match is a list:
+
+        1. String properties must match all elements in the list, and
+        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 == {}:

roundup/date.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: date.py,v 1.77.2.4 2005-03-03 04:47:35 richard Exp $
+# $Id: date.py,v 1.77.2.5 2006-01-13 01:29:45 richard Exp $
 
 """Date, time and time interval handling.
 """
@@ -40,6 +40,19 @@ def _add_granularity(src, order, value = 1):
             src[gran] = int(src[gran]) + value
             break
 
+# no, I don't know why we must anchor the date RE when we only ever use it
+# in a match()
+date_re = re.compile(r'''^
+    ((?P<y>\d\d\d\d)([/-](?P<m>\d\d?)([/-](?P<d>\d\d?))?)? # yyyy[-mm[-dd]]
+    |(?P<a>\d\d?)[/-](?P<b>\d\d?))?              # or mm-dd
+    (?P<n>\.)?                                   # .
+    (((?P<H>\d?\d):(?P<M>\d\d))?(:(?P<S>\d\d(\.\d+)?))?)?  # hh:mm:ss
+    (?P<o>[\d\smyd\-+]+)?                        # offset
+$''', re.VERBOSE)
+serialised_date_re = re.compile(r'''
+    (\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d?(\.\d+)?)
+''', re.VERBOSE)
+
 class Date:
     '''
     As strings, date-and-time stamps are specified with the date in
@@ -154,15 +167,8 @@ def __init__(self, spec='.', offset=0, add_granularity=0, translator=i18n):
         except:
             raise ValueError, 'Unknown spec %r' % (spec,)
 
-    def set(self, spec, offset=0, date_re=re.compile(r'''
-            ((?P<y>\d\d\d\d)([/-](?P<m>\d\d?)([/-](?P<d>\d\d?))?)? # yyyy[-mm[-dd]]
-            |(?P<a>\d\d?)[/-](?P<b>\d\d?))?              # or mm-dd
-            (?P<n>\.)?                                     # .
-            (((?P<H>\d?\d):(?P<M>\d\d))?(:(?P<S>\d\d(\.\d+)?))?)?  # hh:mm:ss
-            (?P<o>.+)?                                     # offset
-            ''', re.VERBOSE), serialised_re=re.compile(r'''
-            (\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d?(\.\d+)?)
-            ''', re.VERBOSE), add_granularity=0):
+    def set(self, spec, offset=0, date_re=date_re,
+            serialised_re=serialised_date_re, add_granularity=0):
         ''' set the date to the value in spec
         '''
 

roundup/hyperdb.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: hyperdb.py,v 1.107.2.4 2005-07-18 02:30:00 richard Exp $
+# $Id: hyperdb.py,v 1.107.2.5 2006-01-13 01:29:46 richard Exp $
 
 """Hyperdatabase implementation, especially field types.
 """
@@ -647,9 +647,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
 
         "search_matches" is {nodeid: marker}
 
-        The filter must match all properties specificed - but if the
-        property value to match is a list, any one of the values in the
-        list may match for that property to match.
+        The filter must match all properties specificed. If the property
+        value to match is a list:
+
+        1. String properties must match all elements in the list, and
+        2. Other properties must match any of the elements in the list.
         """
         raise NotImplementedError
 

setup.py

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: setup.py,v 1.77.2.10 2005-07-27 22:54:10 richard Exp $
+# $Id: setup.py,v 1.77.2.11 2006-01-13 01:29:44 richard Exp $
 
 from distutils.core import setup, Extension
 from distutils.util import get_platform
@@ -348,35 +348,15 @@ def main():
 command-line, web and e-mail interfaces. It is based on the winning design
 from Ka-Ping Yee in the Software Carpentry "Track" design competition.
 
-This 0.8.4 release fixes some bugs:
+This 0.8.5 release includes an Argentinian Spanish translation by Ramiro
+Morales and fixes some bugs:
 
 Fixed:
-
-- extra CRs in CSV export files on Windows platform (sf bug 1195742)
-- activity RDBMS columns were being reported in changes
-- fix name collision in roundup.cgi script (sf bug 1203795)
-- fix handling of invalid interval input
-- search locale files relative ro roundup installation path (sf bug 1219689)
-- use translation for boolean property rendering (sf bug 1225152)
-- enabled disabling of REMOTE_USER for when it's not a valid username (sf
-  bug 1190187)
-- fix invocation of hasPermission from templating code (sf bug 1224172)
-- have 'roundup-admin security' display property restrictions (sf bug
-  1222135)
-- fixed templating menu() sort_on handling (sf bug 1221936)
-- allow specification of pagesize, sorting and filtering in "classhelp"
-  popups (sf bug 1211800)
-- handle dropped properies in rdbms/metakit journal export (sf bug 1203569)
-- handle missing Subject lines better (sf bug 1198729)
-- sort/group by missing values correctly (sf bugs 1198623, 1176897)
-- discard, don't bounce messages to the mailgw when the messages's sender
-  is invalid (ie. when we try to bounce, we get a 550 "unknown user
-  account" response from the SMTP server) (sf bug 1190906)
-- removed debugging code from cgi/actions.py
-- refactored hyperdb.rawToHyperdb, allowing a number of improvements
-  (thanks Ralf Schlatterbeck)
-- don't try to set a timeout for IMAPS (thanks Paul Jimenez)
-- present Reject exception messages to web users (sf bug 1237685)
+- Display of Multilinks where linked Class labelprop values are None
+- Fix references to the old * Registration Permissions
+- Fix missing merge of fix to sf bug 1177057
+- Fix RDBMS indexer indexing UTF-8 words that encode to > 30 chars
+- Handle invalidly-specified charsets in incoming email
 
 If you're upgrading from an older version of Roundup you *must* follow
 the "Software Upgrade" guidelines given in the maintenance documentation.

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.55.2.5 2005-03-29 16:39:14 a1s Exp $
+# $Id: db_test_base.py,v 1.55.2.6 2006-01-13 01:29:48 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -260,7 +260,7 @@ def testDateChange(self):
             b = self.db.issue.get(nid, "deadline")
             if commit: self.db.commit()
             self.assertNotEqual(a, b)
-            self.assertNotEqual(b, date.Date('1970-1-1 00:00:00'))
+            self.assertNotEqual(b, date.Date('1970-1-1.00:00:00'))
 
     def testDateUnset(self):
         for commit in (0,1):