python 2.6 compatibility

Author: Richard Jones

CHANGES.txt

@@ -53,6 +53,9 @@ Fixed:
   committing clenup in the sessions database
 - translate titles of "show all" and "unassigned" issue lists
   in classic template (sf patch 1424576)
+- "as" is a keyword in Python 2.6
+- "from __future__" statments need to be first line of file in Python 2.6
+
 
 2006-04-27 1.1.2
 Feature:

roundup/cgi/templating.py

@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """Implements the API used in the HTML templating for the web interface.
 """
 
@@ -17,7 +19,6 @@
 
 __docformat__ = 'restructuredtext'
 
-from __future__ import nested_scopes
 
 import sys, cgi, urllib, os, re, os.path, time, errno, mimetypes, csv
 import calendar, textwrap

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.87 2006-05-06 16:43:29 a1s Exp $
+# $Id: date.py,v 1.88 2006-09-09 05:50:17 richard Exp $
 
 """Date, time and time interval handling.
 """
@@ -732,10 +732,10 @@ def __add__(self, other):
         elif isinstance(other, Interval):
             # add the other Interval to this one
             a = self.get_tuple()
-            as = a[0]
+            asgn = a[0]
             b = other.get_tuple()
-            bs = b[0]
-            i = [as*x + bs*y for x,y in zip(a[1:],b[1:])]
+            bsgn = b[0]
+            i = [asgn*x + bsgn*y for x,y in zip(a[1:],b[1:])]
             i.insert(0, 1)
             i = fixTimeOverflow(i)
             return Interval(i, translator=self.translator)
@@ -752,10 +752,10 @@ def __sub__(self, other):
         elif isinstance(other, Interval):
             # add the other Interval to this one
             a = self.get_tuple()
-            as = a[0]
+            asgn = a[0]
             b = other.get_tuple()
-            bs = b[0]
-            i = [as*x - bs*y for x,y in zip(a[1:],b[1:])]
+            bsgn = b[0]
+            i = [asgn*x - bsgn*y for x,y in zip(a[1:],b[1:])]
             i.insert(0, 1)
             i = fixTimeOverflow(i)
             return Interval(i, translator=self.translator)

roundup/roundupdb.py

@@ -1,3 +1,4 @@
+from __future__ import nested_scopes
 #
 # Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
 # This module is free software, and you may redistribute it and/or modify
@@ -15,14 +16,12 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: roundupdb.py,v 1.124 2006-05-06 17:19:58 a1s Exp $
+# $Id: roundupdb.py,v 1.125 2006-09-09 05:50:17 richard Exp $
 
 """Extending hyperdb with types specific to issue-tracking.
 """
 __docformat__ = 'restructuredtext'
 
-from __future__ import nested_scopes
-
 import re, os, smtplib, socket, time, random
 import cStringIO, base64, quopri, mimetypes