merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -3,8 +3,9 @@ are given with the most recent entry first.
 
 2004-??-?? 0.8.0b2
 Fixed:
-- note about how to run roundup demo in Windows
-- fix API for templating utils extensions - remove "utils" arg
+- note about how to run roundup demo in Windows (sf bug 1082090)
+- fix API for templating utils extensions - remove "utils" arg (sf bug 1081981)
+- back_sqlite.py is missing "import time" (sf bug 1081959)
 
 
 2004-12-08 0.8.0b1

roundup/backends/back_sqlite.py

@@ -1,4 +1,4 @@
-# $Id: back_sqlite.py,v 1.36 2004-10-31 09:57:10 a1s Exp $
+# $Id: back_sqlite.py,v 1.36.2.1 2004-12-14 23:23:35 richard Exp $
 '''Implements a backend for SQLite.
 
 See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -9,7 +9,7 @@
 '''
 __docformat__ = 'restructuredtext'
 
-import os, base64, marshal, shutil
+import os, base64, marshal, shutil, time
 
 from roundup import hyperdb, date, password
 from roundup.backends import locking