changed all config accesses...

...so they access either the instance or the config attriubute on the
db. This means that all config is obtained from instance_config
instead of the mish-mash of classes. This will make switching to a
ConfigParser setup easier too, I hope.

At a minimum, this makes migration a _little_ easier (a lot easier in the
0.5.0 switch, I hope!)

Author: Richard Jones

CHANGES.txt

@@ -13,6 +13,11 @@ Fixed:
  . #502342 ] pipe interface
  . #502437 ] rogue reactor and unittest
  . re-enabled dumbdbm when using python >2.1.1 (ie 2.1.2, 2.2)
+ . changed all config accesses so they access either the instance or the
+   config attriubute on the db. This means that all config is obtained from
+   instance_config instead of the mish-mash of classes. This will make
+   switching to a ConfigParser setup easier too, I hope.
+
 
 2002-01-08 - 0.4.0b1
 Feature:

MIGRATION.txt

@@ -27,10 +27,9 @@ If you used the extended schema, the file is in:
 
  <roundup source>/roundup/templates/extended/dbinit.py 
 
-If you have modified your dbinit.py file, you may use encoded passwords:
-
- 1. Edit the dbinit.py file in your instance home directory. Find the lines
- which define the msg class:
+If you have modified your dbinit.py file, you need to edit the dbinit.py
+file in your instance home directory. Find the lines which define the msg
+class:
 
     msg = FileClass(db, "msg",
                     author=Link("user"), recipients=Multilink("user"),
@@ -45,18 +44,24 @@ If you have modified your dbinit.py file, you may use encoded passwords:
                     files=Multilink("file"),
                     messageid=String(),  inreplyto=String())
 
+Also, configuration is being cleaned up. This means that your dbinit.py will
+also need to be changed in the open function. If you haven't changed your
+dbinit.py, the above copy will be enough. If you have, you'll need to change
+the line (round line 50):
+
+    db = Database(instance_config.DATABASE, name)
+
+to:
+
+    db = Database(instance_config, name)
+
+
 Configuration
 -------------
 INSTANCE_NAME and EMAIL_SIGNATURE_POSITION have been added to the
 instance_config.py. Simplest solution is to copy the default values from
 template in the core source.
 
-INSTANCE_NAME needs to be added to the Client class in your interfaces.py
-file. INSTANCE_NAME and ANONYMOUS_REGISTER need to be added to the MailGW
-class in your interfaces.py file. In both cases if might be easier to just
-copy the file from the core source (roundup/templates/[schema]/interfaces.py)
-where schema is "classic" or "extended".
-
 
 CGI script roundup.cgi
 ----------------------

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.21 2002-01-02 02:31:38 richard Exp $
+#$Id: back_anydbm.py,v 1.22 2002-01-14 02:20:15 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
@@ -40,9 +40,10 @@ class Database(hyperdb.Database):
         . perhaps detect write collisions (related to above)?
 
     """
-    def __init__(self, storagelocator, journaltag=None):
+    def __init__(self, config, journaltag=None):
         """Open a hyperdatabase given a specifier to some storage.
 
+        The 'storagelocator' is obtained from config.DATABASE.
         The meaning of 'storagelocator' depends on the particular
         implementation of the hyperdatabase.  It could be a file name,
         a directory path, a socket descriptor for a connection to a
@@ -53,7 +54,8 @@ def __init__(self, storagelocator, journaltag=None):
         None, the database is opened in read-only mode: the Class.create(),
         Class.set(), and Class.retire() methods are disabled.
         """
-        self.dir, self.journaltag = storagelocator, journaltag
+        self.config, self.journaltag = config, journaltag
+        self.dir = config.DATABASE
         self.classes = {}
         self.cache = {}         # cache of nodes loaded or created
         self.dirtynodes = {}    # keep track of the dirty nodes by class
@@ -404,6 +406,21 @@ def rollback(self):
 
 #
 #$Log: not supported by cvs2svn $
+#Revision 1.21  2002/01/02 02:31:38  richard
+#Sorry for the huge checkin message - I was only intending to implement #496356
+#but I found a number of places where things had been broken by transactions:
+# . modified ROUNDUPDBSENDMAILDEBUG to be SENDMAILDEBUG and hold a filename
+#   for _all_ roundup-generated smtp messages to be sent to.
+# . the transaction cache had broken the roundupdb.Class set() reactors
+# . newly-created author users in the mailgw weren't being committed to the db
+#
+#Stuff that made it into CHANGES.txt (ie. the stuff I was actually working
+#on when I found that stuff :):
+# . #496356 ] Use threading in messages
+# . detectors were being registered multiple times
+# . added tests for mailgw
+# . much better attaching of erroneous messages in the mail gateway
+#
 #Revision 1.20  2001/12/18 15:30:34  rochecompaan
 #Fixed bugs:
 # .  Fixed file creation and retrieval in same transaction in anydbm

roundup/backends/back_bsddb3.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_bsddb3.py,v 1.10 2001-11-21 02:34:18 richard Exp $
+#$Id: back_bsddb3.py,v 1.11 2002-01-14 02:20:15 richard Exp $
 
 import bsddb3, os, marshal
 from roundup import hyperdb, date, password
@@ -26,9 +26,10 @@
 class Database(hyperdb.Database):
     """A database for storing records containing flexible data types."""
 
-    def __init__(self, storagelocator, journaltag=None):
+    def __init__(self, config, journaltag=None):
         """Open a hyperdatabase given a specifier to some storage.
 
+        The 'storagelocator' is obtained from config.DATABASE.
         The meaning of 'storagelocator' depends on the particular
         implementation of the hyperdatabase.  It could be a file name,
         a directory path, a socket descriptor for a connection to a
@@ -39,7 +40,8 @@ def __init__(self, storagelocator, journaltag=None):
         None, the database is opened in read-only mode: the Class.create(),
         Class.set(), and Class.retire() methods are disabled.
         """
-        self.dir, self.journaltag = storagelocator, journaltag
+        self.config, self.journaltag = config, journaltag
+        self.dir = config.DATABASE
         self.classes = {}
 
     #
@@ -201,6 +203,9 @@ def rollback(self):
 
 #
 #$Log: not supported by cvs2svn $
+#Revision 1.10  2001/11/21 02:34:18  richard
+#Added a target version field to the extended issue schema
+#
 #Revision 1.9  2001/10/09 23:58:10  richard
 #Moved the data stringification up into the hyperdb.Class class' get, set
 #and create methods. This means that the data is also stringified for the

roundup/cgi_client.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: cgi_client.py,v 1.97 2002-01-11 23:22:29 richard Exp $
+# $Id: cgi_client.py,v 1.98 2002-01-14 02:20:14 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -44,21 +44,7 @@ class Client:
     'anonymous' user exists, the user is logged in using that user (though
     there is no cookie). This allows them to modify the database, and all
     modifications are attributed to the 'anonymous' user.
-
-
-    Customisation
-    -------------
-      FILTER_POSITION - one of 'top', 'bottom', 'top and bottom'
-      ANONYMOUS_ACCESS - one of 'deny', 'allow'
-      ANONYMOUS_REGISTER - one of 'deny', 'allow'
-
-    from the roundup class:
-      INSTANCE_NAME - defaults to 'Roundup issue tracker'
-
     '''
-    FILTER_POSITION = 'bottom'       # one of 'top', 'bottom', 'top and bottom'
-    ANONYMOUS_ACCESS = 'deny'        # one of 'deny', 'allow'
-    ANONYMOUS_REGISTER = 'deny'      # one of 'deny', 'allow'
 
     def __init__(self, instance, request, env, form=None):
         self.instance = instance
@@ -104,7 +90,7 @@ def pagehead(self, title, message=None):
             message = _('<div class="system-msg">%(message)s</div>')%locals()
         else:
             message = ''
-        style = open(os.path.join(self.TEMPLATES, 'style.css')).read()
+        style = open(os.path.join(self.instance.TEMPLATES, 'style.css')).read()
         user_name = self.user or ''
         if self.user == 'admin':
             admin_links = _(' | <a href="list_classes">Class List</a>' \
@@ -286,7 +272,7 @@ def list(self, sort=None, group=None, filter=None, columns=None,
         cn = self.classname
         cl = self.db.classes[cn]
         self.pagehead(_('%(instancename)s: Index of %(classname)s')%{
-            'classname': cn, 'instancename': self.INSTANCE_NAME})
+            'classname': cn, 'instancename': self.instance.INSTANCE_NAME})
         if sort is None: sort = self.index_arg(':sort')
         if group is None: group = self.index_arg(':group')
         if filter is None: filter = self.index_arg(':filter')
@@ -295,7 +281,7 @@ def list(self, sort=None, group=None, filter=None, columns=None,
         if show_customization is None:
             show_customization = self.customization_widget()
 
-        index = htmltemplate.IndexTemplate(self, self.TEMPLATES, cn)
+        index = htmltemplate.IndexTemplate(self, self.instance.TEMPLATES, cn)
         index.render(filterspec, filter, columns, sort, group,
             show_customization=show_customization)
         self.pagefoot()
@@ -342,7 +328,8 @@ def shownode(self, message=None):
         nodeid = self.nodeid
 
         # use the template to display the item
-        item = htmltemplate.ItemTemplate(self, self.TEMPLATES, self.classname)
+        item = htmltemplate.ItemTemplate(self, self.instance.TEMPLATES,
+            self.classname)
         item.render(nodeid)
 
         self.pagefoot()
@@ -561,7 +548,7 @@ def newnode(self, message=None):
                 self.nodeid = nid
                 self.pagehead('%s: %s'%(self.classname.capitalize(), nid),
                     message)
-                item = htmltemplate.ItemTemplate(self, self.TEMPLATES, 
+                item = htmltemplate.ItemTemplate(self, self.instance.TEMPLATES, 
                     self.classname)
                 item.render(nid)
                 self.pagefoot()
@@ -575,7 +562,7 @@ def newnode(self, message=None):
             self.classname.capitalize()}, message)
 
         # call the template
-        newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES,
+        newitem = htmltemplate.NewItemTemplate(self, self.instance.TEMPLATES,
             self.classname)
         newitem.render(self.form)
 
@@ -609,7 +596,7 @@ def newuser(self, message=None):
              self.classname.capitalize()}, message)
 
         # call the template
-        newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES,
+        newitem = htmltemplate.NewItemTemplate(self, self.instance.TEMPLATES,
             self.classname)
         newitem.render(self.form)
 
@@ -647,7 +634,7 @@ def newfile(self, message=None):
 
         self.pagehead(_('New %(classname)s')%{'classname':
              self.classname.capitalize()}, message)
-        newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES,
+        newitem = htmltemplate.NewItemTemplate(self, self.instance.TEMPLATES,
             self.classname)
         newitem.render(self.form)
         self.pagefoot()
@@ -707,7 +694,7 @@ def showuser(self, message=None):
         self.pagehead(_('User: %(user)s')%{'user': node_user}, message)
 
         # use the template to display the item
-        item = htmltemplate.ItemTemplate(self, self.TEMPLATES, 'user')
+        item = htmltemplate.ItemTemplate(self, self.instance.TEMPLATES, 'user')
         item.render(self.nodeid)
         self.pagefoot()
 
@@ -760,7 +747,7 @@ def login(self, message=None, newuser_form=None, action='index'):
     <td><input type="submit" value="Log In"></td></tr>
 </form>
 ''')%locals())
-        if self.user is None and self.ANONYMOUS_REGISTER == 'deny':
+        if self.user is None and self.instance.ANONYMOUS_REGISTER == 'deny':
             self.write('</table>')
             self.pagefoot()
             return
@@ -953,7 +940,7 @@ def main(self):
         if action == 'newuser_action':
             # if we don't have a login and anonymous people aren't allowed to
             # register, then spit up the login form
-            if self.ANONYMOUS_REGISTER == 'deny' and self.user is None:
+            if self.instance.ANONYMOUS_REGISTER == 'deny' and self.user is None:
                 if action == 'login':
                     self.login()         # go to the index after login
                 else:
@@ -968,7 +955,7 @@ def main(self):
                 action = 'index'
 
         # no login or registration, make sure totally anonymous access is OK
-        elif self.ANONYMOUS_ACCESS == 'deny' and self.user is None:
+        elif self.instance.ANONYMOUS_ACCESS == 'deny' and self.user is None:
             if action == 'login':
                 self.login()             # go to the index after login
             else:
@@ -1058,7 +1045,7 @@ def pagehead(self, title, message=None):
             message = _('<div class="system-msg">%(message)s</div>')%locals()
         else:
             message = ''
-        style = open(os.path.join(self.TEMPLATES, 'style.css')).read()
+        style = open(os.path.join(self.instance.TEMPLATES, 'style.css')).read()
         user_name = self.user or ''
         if self.user == 'admin':
             admin_links = _(' | <a href="list_classes">Class List</a>' \
@@ -1178,6 +1165,14 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.97  2002/01/11 23:22:29  richard
+#  . #502437 ] rogue reactor and unittest
+#    in short, the nosy reactor was modifying the nosy list. That code had
+#    been there for a long time, and I suspsect it was there because we
+#    weren't generating the nosy list correctly in other places of the code.
+#    We're now doing that, so the nosy-modifying code can go away from the
+#    nosy reactor.
+#
 # Revision 1.96  2002/01/10 05:26:10  richard
 # missed a parsePropsFromForm in last update
 #

roundup/htmltemplate.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: htmltemplate.py,v 1.51 2002-01-10 10:02:15 grubert Exp $
+# $Id: htmltemplate.py,v 1.52 2002-01-14 02:20:14 richard Exp $
 
 __doc__ = """
 Template engine.
@@ -506,6 +506,7 @@ def __call__(self, m, filter=None, columns=None, sort=None, group=None):
 class IndexTemplate(TemplateFunctions):
     def __init__(self, client, templates, classname):
         self.client = client
+        self.instance = client.instance
         self.templates = templates
         self.classname = classname
 
@@ -551,8 +552,8 @@ def render(self, filterspec={}, filter=[], columns=[], sort=[], group=[],
             columns = l
 
         # display the filter section
-        if (show_display_form and hasattr(self.client, 'FILTER_POSITION') and
-                self.client.FILTER_POSITION in ('top and bottom', 'top')):
+        if (show_display_form and 
+                self.instance.FILTER_POSITION in ('top and bottom', 'top')):
             w('<form action="index">\n')
             self.filter_section(filter_template, filter, columns, group,
                 all_filters, all_columns, show_customization)
@@ -633,8 +634,8 @@ def render(self, filterspec={}, filter=[], columns=[], sort=[], group=[],
         w('</table>')
 
         # display the filter section
-        if (show_display_form and hasattr(self.client, 'FILTER_POSITION') and
-                self.client.FILTER_POSITION in ('top and bottom', 'bottom')):
+        if (show_display_form and hasattr(self.instance, 'FILTER_POSITION') and
+                self.instance.FILTER_POSITION in ('top and bottom', 'bottom')):
             w('<form action="index">\n')
             self.filter_section(filter_template, filter, columns, group,
                 all_filters, all_columns, show_customization)
@@ -823,6 +824,7 @@ def __call__(self, m, filter=None, columns=None, sort=None, group=None):
 class ItemTemplate(TemplateFunctions):
     def __init__(self, client, templates, classname):
         self.client = client
+        self.instance = client.instance
         self.templates = templates
         self.classname = classname
 
@@ -855,6 +857,7 @@ def render(self, nodeid):
 class NewItemTemplate(TemplateFunctions):
     def __init__(self, client, templates, classname):
         self.client = client
+        self.instance = client.instance
         self.templates = templates
         self.classname = classname
 
@@ -886,6 +889,10 @@ def render(self, form):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.51  2002/01/10 10:02:15  grubert
+# In do_history: replace "." in date by " " so html wraps more sensible.
+# Should this be done in date's string converter ?
+#
 # Revision 1.50  2002/01/05 02:35:10  richard
 # I18N'ification
 #