merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -13,6 +13,7 @@ Fixed:
 - more documentation of security mechanisms (incl. sf patches 1117932,
   1117860)
 - better unit tests for security mechanisms
+- code cleanup (sf patch 1115329 and additional)
 
 
 2005-01-13 0.8.0b2

doc/whatsnew-0.8.txt

@@ -43,7 +43,7 @@ Logging of internal messages
 Roundup's previously ad-hoc logging of events has been cleaned up and is
 now configured in a single place in the tracker configuration file.
 
-The `customisation documentation`_ has more details on how this is
+The `customization documentation`_ has more details on how this is
 configured.
 
 
@@ -102,22 +102,22 @@ In both cases, the value is a valid charset name (eg. ``utf-8`` or
 
 Inside Roundup, all strings are stored and processed in utf-8.
 Unfortunately, some older browsers do not work properly with
-utf8-encoded pages (e.g. Netscape Navigator 4 displays wrong
+utf-8-encoded pages (e.g. Netscape Navigator 4 displays wrong
 characters in form fields).  This version allows to change
 the character set for http transfers.  To do so, you may add
 the following code to your ``page.html`` template::
 
  <tal:block define="uri string:${request/base}${request/env/PATH_INFO}">
-  <a tal:attributes="href python:request.indexargs_href(uri,
+  <a tal:attributes="href python:request.indexargs_url(uri,
    {'@charset':'utf-8'})">utf-8</a>
-  <a tal:attributes="href python:request.indexargs_href(uri,
+  <a tal:attributes="href python:request.indexargs_url(uri,
    {'@charset':'koi8-r'})">koi8-r</a>
  </tal:block>
 
-(substitute ``koi8-r`` with appropriate charset for your language).
+(substitute ``koi8-r`` with the appropriate charset for your language).
 Charset preference is kept in the browser cookie ``roundup_charset``.
 
-Lines ``meta http-equiv`` added to the tracker templates in version 0.6.0
+``meta http-equiv`` lines added to the tracker templates in version 0.6.0
 should be changed to include actual character set name::
 
  <meta http-equiv="Content-Type"
@@ -154,4 +154,4 @@ Web server
   The builtin web server may now perform HTTP Basic Authentication by
   itself.
 
-.. _`customisation documentation`: customizing.html
+.. _`customization documentation`: customizing.html

roundup/cgi/actions.py

@@ -1,4 +1,4 @@
-#$Id: actions.py,v 1.40.2.2 2005-01-05 22:13:28 richard Exp $
+#$Id: actions.py,v 1.40.2.3 2005-02-12 00:54:36 richard Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random
 
@@ -151,7 +151,7 @@ def handle(self):
 
             # The [1:] strips off the '?' character, it isn't part of the
             # query string.
-            url = req.indexargs_href('', {})[1:]
+            url = req.indexargs_url('', {})[1:]
 
             key = self.db.query.getkey()
             if key:
@@ -556,7 +556,7 @@ def handle(self):
             urllib.quote(self.template))
         if self.nodeid is None:
             req = templating.HTMLRequest(self.client)
-            url += '&' + req.indexargs_href('', {})[1:]
+            url += '&' + req.indexargs_url('', {})[1:]
         raise exceptions.Redirect, url
 
 class NewItemAction(EditCommon):

roundup/roundupdb.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: roundupdb.py,v 1.117 2004-11-12 04:07:03 richard Exp $
+# $Id: roundupdb.py,v 1.117.2.1 2005-02-12 00:59:47 richard Exp $
 
 """Extending hyperdb with types specific to issue-tracking.
 """
@@ -433,9 +433,9 @@ def generateCreateNote(self, nodeid):
 
         # list the values
         m = []
-        l = props.items()
-        l.sort()
-        for propname, prop in l:
+        prop_items = props.items()
+        prop_items.sort()
+        for propname, prop in prop_items:
             value = cl.get(nodeid, propname, None)
             # skip boring entries
             if not value:
@@ -500,9 +500,9 @@ def generateChangeNote(self, nodeid, oldvalues):
 
         # list the changes
         m = []
-        l = changed.items()
-        l.sort()
-        for propname, oldvalue in l:
+        changed_items = changed.items()
+        changed_items.sort()
+        for propname, oldvalue in changed_items:
             prop = props[propname]
             value = cl.get(nodeid, propname, None)
             if isinstance(prop, hyperdb.Link):

templates/classic/html/_generic.help.html

@@ -39,7 +39,7 @@
       <tr class="navigation">
        <th>
         <a tal:define="prev batch/previous" tal:condition="prev"
-           tal:attributes="href python:request.indexargs_href(request.classname,
+           tal:attributes="href python:request.indexargs_url(request.classname,
            {'@template':'help', 'property': request.form['property'].value,
             'properties': request.form['properties'].value,
             '@startwith':prev.first, '@pagesize':prev.size})"
@@ -53,7 +53,7 @@
        </th>
        <th>
         <a tal:define="next batch/next" tal:condition="next"
-           tal:attributes="href python:request.indexargs_href(request.classname,
+           tal:attributes="href python:request.indexargs_url(request.classname,
            {'@template':'help', 'property': request.form['property'].value,
             'properties': request.form['properties'].value,
             '@startwith':next.first, '@pagesize':next.size})"

templates/classic/html/issue.index.html

@@ -64,7 +64,7 @@
     <tr class="navigation">
      <th>
       <a tal:define="prev batch/previous" tal:condition="prev"
-         tal:attributes="href python:request.indexargs_href(request.classname,
+         tal:attributes="href python:request.indexargs_url(request.classname,
          {'@startwith':prev.first, '@pagesize':prev.size})"
          i18n:translate="">&lt;&lt; previous</a>
       &nbsp;
@@ -75,7 +75,7 @@
      /></th>
      <th>
       <a tal:define="next batch/next" tal:condition="next"
-         tal:attributes="href python:request.indexargs_href(request.classname,
+         tal:attributes="href python:request.indexargs_url(request.classname,
          {'@startwith':next.first, '@pagesize':next.size})"
          i18n:translate="">next &gt;&gt;</a>
       &nbsp;

templates/classic/html/page.html

@@ -114,7 +114,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
    <a tal:attributes="href string:issue?@sort=-activity&@group=priority&@filter=status,assignedto&@columns=id,activity,title,creator,status&status=-1,1,2,3,4,5,6,7&assignedto=${request/user/id}" i18n:translate="">Your Issues</a><br>
    <a tal:attributes="href string:user${request/user/id}"
     i18n:translate="">Your Details</a><br>
-   <a tal:attributes="href python:request.indexargs_href('',
+   <a tal:attributes="href python:request.indexargs_url('',
        {'@action':'logout'})" i18n:translate="">Logout</a>
   </p>
   <p class="userblock">

templates/classic/initial_data.py

@@ -24,7 +24,7 @@
     address=admin_email, roles='Admin')
 user.create(username="anonymous", roles='Anonymous')
 
-# add any additional database create steps here - but only if you
+# add any additional database creation steps here - but only if you
 # haven't initialised the database with the admin "initialise" command
 
 

templates/minimal/html/page.html

@@ -39,7 +39,7 @@
     tal:content="request/user/username">username</span></b><br>
    <a tal:attributes="href string:user${request/user/id}"
     i18n:translate="">Your Details</a><br>
-   <a tal:attributes="href python:request.indexargs_href('',
+   <a tal:attributes="href python:request.indexargs_url('',
        {'@action':'logout'})" i18n:translate="">Logout</a>
   </p>
 

templates/minimal/initial_data.py

@@ -8,7 +8,7 @@
     address=admin_email, roles='Admin')
 user.create(username="anonymous", roles='Anonymous')
 
-# add any additional database create steps here - but only if you
+# add any additional database creation steps here - but only if you
 # haven't initialised the database with the admin "initialise" command
 
 # vim: set et sts=4 sw=4 :