merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -24,6 +24,8 @@ Fixed:
   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)
 
 
 2005-05-02 0.8.3

doc/index.txt

@@ -129,6 +129,7 @@ John P. Rouillard,
 Ollie Rutherfurd,
 Toby Sargeant,
 Giuseppe Scelsi,
+Ralf Schlatterbeck,
 Gregor Schmid,
 Florian Schulze,
 Klamer Schutte,

roundup/admin.py

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: admin.py,v 1.85.2.9 2005-07-05 06:28:35 richard Exp $
+# $Id: admin.py,v 1.85.2.10 2005-07-12 01:43:17 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
@@ -571,7 +571,7 @@ def do_get(self, args):
         return 0
 
 
-    def do_set(self, args, pwre = re.compile(r'{(\w+)}(.+)')):
+    def do_set(self, args):
         ""'''Usage: set items property=value property=value ...
         Set the given properties of one or more items(s).
 
@@ -732,7 +732,7 @@ def do_display(self, args):
                 value = cl.get(nodeid, key)
                 print _('%(key)s: %(value)r')%locals()
 
-    def do_create(self, args, pwre = re.compile(r'{(\w+)}(.+)')):
+    def do_create(self, args):
         ""'''Usage: create classname property=value ...
         Create a new entry of a given class.
 

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.7 2005-03-03 22:12:35 richard Exp $
+#$Id: back_anydbm.py,v 1.179.2.8 2005-07-12 01:43:17 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
@@ -1588,7 +1588,6 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         INTERVAL = 'spec:interval'
         OTHER = 'spec:other'
 
-        timezone = self.db.getUserTimezone()
         for k, v in filterspec.items():
             propclass = props[k]
             if isinstance(propclass, hyperdb.Link):
@@ -1619,7 +1618,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     l.append((STRING, k, re.compile(v, re.I)))
             elif isinstance(propclass, hyperdb.Date):
                 try:
-                    date_rng = date.Range(v, date.Date, offset=timezone)
+                    date_rng = propclass.range_from_raw (v, self.db)
                     l.append((DATE, k, date_rng))
                 except ValueError:
                     # If range creation fails - ignore that search parameter

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.88.2.5 2005-06-24 06:40:18 richard Exp $
+# $Id: back_metakit.py,v 1.88.2.6 2005-07-12 01:43:17 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -1209,8 +1209,6 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         if __debug__:
             start_t = time.time()
 
-        timezone = self.db.getUserTimezone()
-
         where = {'_isdel':0}
         wherehigh = {}
         mlcriteria = {}
@@ -1277,7 +1275,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
             elif isinstance(prop, hyperdb.Date):
                 try:
                     # Try to filter on range of dates
-                    date_rng = Range(value, date.Date, offset=timezone)
+                    date_rng = prop.range_from_raw (value, self.db)
                     if date_rng.from_value:
                         t = date_rng.from_value.get_tuple()
                         where[propname] = int(calendar.timegm(t))

roundup/backends/back_mysql.py

@@ -520,8 +520,6 @@ def filter(self, search_matches, filterspec, sort=(None,None),
 
         cn = self.classname
 
-        timezone = self.db.getUserTimezone()
-
         # vars to hold the components of the SQL statement
         frum = ['_'+cn] # FROM clauses
         loj = []        # LEFT OUTER JOIN clauses
@@ -616,7 +614,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                 else:
                     try:
                         # Try to filter on range of dates
-                        date_rng = Range(v, date.Date, offset=timezone)
+                        date_rng = propclass.range_from_raw (v, self.db)
                         if date_rng.from_value:
                             where.append('_%s._%s >= %s'%(cn, k, a))
                             args.append(dc(date_rng.from_value))

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.142.2.9 2005-05-18 05:18:15 richard Exp $
+# $Id: rdbms_common.py,v 1.142.2.10 2005-07-12 01:43:17 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2051,8 +2051,6 @@ def filter(self, search_matches, filterspec, sort=(None,None),
 
         cn = self.classname
 
-        timezone = self.db.getUserTimezone()
-
         # vars to hold the components of the SQL statement
         frum = []       # FROM clauses
         loj = []        # LEFT OUTER JOIN clauses
@@ -2141,7 +2139,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                 else:
                     try:
                         # Try to filter on range of dates
-                        date_rng = Range(v, date.Date, offset=timezone)
+                        date_rng = propclass.range_from_raw (v, self.db)
                         if date_rng.from_value:
                             where.append('_%s._%s >= %s'%(cn, k, a))
                             args.append(dc(date_rng.from_value))

roundup/cgi/templating.py

@@ -1396,6 +1396,8 @@ def __init__(self, client, classname, nodeid, prop, name, value,
                 isinstance(self._value, unicode)):
             self._value.setTranslator(self._client.translator)
         self._offset = offset
+        if self._offset is None :
+            self._offset = self._prop.offset (self._db)
 
     def plain(self):
         ''' Render a "plain" representation of the property
@@ -1480,8 +1482,11 @@ def field(self, size=30, default=None, format=_marker):
             else:
                 value = date.Date(raw_value).pretty(format)
         else:
-            tz = self._db.getUserTimezone()
-            value = raw_value.local(tz)
+            if self._offset is None :
+                offset = self._db.getUserTimezone()
+            else :
+                offset = self._offset
+            value = raw_value.local(offset)
             if format is not self._marker:
                 value = value.pretty(format)