Author: phd
Date: 2007-09-24 09:18:42 -0600 (Mon, 24 Sep 2007)
New Revision: 2983
Removed:
SQLObject/trunk/sqlobject/util/backports.py
Modified:
SQLObject/trunk/sqlobject/col.py
SQLObject/trunk/sqlobject/inheritance/iteration.py
SQLObject/trunk/sqlobject/tests/test_select.py
SQLObject/trunk/sqlobject/tests/test_unicode.py
Log:
Python 2.3 has enumerate(), itertools.count().
Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py 2007-09-24 15:01:00 UTC (rev 2982)
+++ SQLObject/trunk/sqlobject/col.py 2007-09-24 15:18:42 UTC (rev 2983)
@@ -31,7 +31,7 @@
from formencode import compound
from formencode import validators
from classregistry import findClass
-from util.backports import count
+from itertools import count
NoDefault = sqlbuilder.NoDefault
Modified: SQLObject/trunk/sqlobject/inheritance/iteration.py
===================================================================
--- SQLObject/trunk/sqlobject/inheritance/iteration.py 2007-09-24 15:01:00 UTC (rev 2982)
+++ SQLObject/trunk/sqlobject/inheritance/iteration.py 2007-09-24 15:18:42 UTC (rev 2983)
@@ -14,8 +14,8 @@
# Find the index of the childName column
childNameIdx = None
columns = select.sourceClass.sqlmeta.columnList
- for i in range(len(columns)): # enumerate() is unavailable python 2.2
- if columns[i].name == "childName":
+ for i, column in enumerate(columns):
+ if column.name == "childName":
childNameIdx = i
break
self._childNameIdx = childNameIdx
Modified: SQLObject/trunk/sqlobject/tests/test_select.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_select.py 2007-09-24 15:01:00 UTC (rev 2982)
+++ SQLObject/trunk/sqlobject/tests/test_select.py 2007-09-24 15:18:42 UTC (rev 2983)
@@ -1,19 +1,9 @@
-from __future__ import generators # for enumerate
from sqlobject import *
from sqlobject.sqlbuilder import func
from sqlobject.main import SQLObjectIntegrityError
from dbtest import *
from dbtest import setSQLiteConnectionFactory
-try:
- enumerate
-except NameError:
- def enumerate(iterable):
- i = 0
- for obj in iterable:
- yield i, obj
- i += 1
-
class IterTest(SQLObject):
name = StringCol(dbName='name_col')
Modified: SQLObject/trunk/sqlobject/tests/test_unicode.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_unicode.py 2007-09-24 15:01:00 UTC (rev 2982)
+++ SQLObject/trunk/sqlobject/tests/test_unicode.py 2007-09-24 15:18:42 UTC (rev 2983)
@@ -10,12 +10,6 @@
col1 = UnicodeCol(alternateID=True)
col2 = UnicodeCol(dbEncoding='latin-1')
-try:
- enumerate
-except NameError: # Python 2.2
- def enumerate(lst):
- return [(i, lst[i]) for i in range(len(lst))]
-
data = [u'\u00f0', u'test', 'ascii test']
items = []
Deleted: SQLObject/trunk/sqlobject/util/backports.py
===================================================================
--- SQLObject/trunk/sqlobject/util/backports.py 2007-09-24 15:01:00 UTC (rev 2982)
+++ SQLObject/trunk/sqlobject/util/backports.py 2007-09-24 15:18:42 UTC (rev 2983)
@@ -1,21 +0,0 @@
-from __future__ import generators
-
-__all__ = ['count', 'enumerate']
-
-# An implementation of itertools' count()
-try:
- from itertools import count
-except ImportError:
- def count(start=0):
- while 1:
- yield start
- start += 1
-
-try:
- enumerate
-except NameError:
- def enumerate(lst):
- i = 0
- for item in lst:
- yield i, item
- i += 1
|