[SQL-CVS] r2984 - SQLObject/trunk/sqlobject

[<sub...@co...>]

Author: phd
Date: 2007-09-24 09:26:52 -0600 (Mon, 24 Sep 2007)
New Revision: 2984

Modified:
   SQLObject/trunk/sqlobject/dbconnection.py
   SQLObject/trunk/sqlobject/declarative.py
Log:
Removed from __future__ import generators.


Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py	2007-09-24 15:18:42 UTC (rev 2983)
+++ SQLObject/trunk/sqlobject/dbconnection.py	2007-09-24 15:26:52 UTC (rev 2984)
@@ -1,5 +1,3 @@
-from __future__ import generators
-
 import threading
 from util.threadinglocal import local as threading_local
 import sys

Modified: SQLObject/trunk/sqlobject/declarative.py
===================================================================
--- SQLObject/trunk/sqlobject/declarative.py	2007-09-24 15:18:42 UTC (rev 2983)
+++ SQLObject/trunk/sqlobject/declarative.py	2007-09-24 15:26:52 UTC (rev 2984)
@@ -32,7 +32,6 @@
 or an instance method depending on where it is called.
 """
 
-from __future__ import generators
 import threading
 import events
 
@@ -40,16 +39,8 @@
 
 import copy
 
-try:
-    import itertools
-    counter = itertools.count()
-except ImportError:
-    def _counter():
-        i = 0
-        while 1:
-            i += 1
-            yield i
-    counter = _counter()
+import itertools
+counter = itertools.count()
 
 class classinstancemethod(object):
     """