|
From: Oleg B. <no...@so...> - 2015-02-09 15:54:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".
The branch, master has been updated
via 8645913850e76d4ce31774ad0f871fd1a1e169e9 (commit)
via 4ccc069f95fddcd0b977213ed6cc3834db45679e (commit)
from 272211a770b325c20197b187478a4781d61955fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/8645913850e76d4ce31774ad0f871fd1a1e169e9
commit 8645913850e76d4ce31774ad0f871fd1a1e169e9
Merge: 272211a 4ccc069
Author: Oleg Broytman <ph...@ph...>
Date: Mon Feb 9 18:53:36 2015 +0300
Merge pull request #72 from drnlm/rework_itertools_count
Replace count.next() with next(count) to be compatible with python 3
http://sourceforge.net/p/sqlobject/sqlobject/ci/4ccc069f95fddcd0b977213ed6cc3834db45679e
commit 4ccc069f95fddcd0b977213ed6cc3834db45679e
Author: Neil <drn...@gm...>
Date: Mon Feb 9 16:10:18 2015 +0200
Replace count.next() with next(count) to be compatible with python 3
diff --git a/sqlobject/col.py b/sqlobject/col.py
index cc8558c..7174fcc 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -421,7 +421,7 @@ class Col(object):
super(Col, self).__init__()
self.__dict__['_name'] = name
self.__dict__['_kw'] = kw
- self.__dict__['creationOrder'] = creationOrder.next()
+ self.__dict__['creationOrder'] = next(creationOrder)
self.__dict__['_extra_vars'] = {}
def _set_name(self, value):
diff --git a/sqlobject/declarative.py b/sqlobject/declarative.py
index e825cfa..d568fc4 100644
--- a/sqlobject/declarative.py
+++ b/sqlobject/declarative.py
@@ -108,7 +108,7 @@ class Declarative(object):
__restrict_attributes__ = None
def __classinit__(cls, new_attrs):
- cls.declarative_count = counter.next()
+ cls.declarative_count = next(counter)
for name in cls.__mutableattributes__:
if name not in new_attrs:
setattr(cls, copy.copy(getattr(cls, name)))
@@ -123,7 +123,7 @@ class Declarative(object):
for name, value in new_attrs.items():
setattr(self, name, value)
if 'declarative_count' not in new_attrs:
- self.declarative_count = counter.next()
+ self.declarative_count = next(counter)
def __init__(self, *args, **kw):
if self.__unpackargs__ and self.__unpackargs__[0] == '*':
diff --git a/sqlobject/index.py b/sqlobject/index.py
index fca8824..c1ec148 100644
--- a/sqlobject/index.py
+++ b/sqlobject/index.py
@@ -161,7 +161,7 @@ class DatabaseIndex(object):
def __init__(self, *columns, **kw):
kw['columns'] = columns
self.kw = kw
- self.creationOrder = creationOrder.next()
+ self.creationOrder = next(creationOrder)
def setName(self, value):
assert self.kw.get('name') is None, \
diff --git a/sqlobject/joins.py b/sqlobject/joins.py
index ee2ef16..63c8ec1 100644
--- a/sqlobject/joins.py
+++ b/sqlobject/joins.py
@@ -25,7 +25,7 @@ class Join(object):
kw['otherClass'] = otherClass
self.kw = kw
self._joinMethodName = self.kw.pop('joinMethodName', None)
- self.creationOrder = creationOrder.next()
+ self.creationOrder = next(creationOrder)
def _set_joinMethodName(self, value):
assert self._joinMethodName == value or self._joinMethodName is None, \
-----------------------------------------------------------------------
Summary of changes:
sqlobject/col.py | 2 +-
sqlobject/declarative.py | 4 ++--
sqlobject/index.py | 2 +-
sqlobject/joins.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
