Update of /cvsroot/sqlobject/SQLObject/SQLObject
In directory sc8-pr-cvs1:/tmp/cvs-serv17015/SQLObject
Modified Files:
Cache.py Col.py Constraints.py Converters.py Join.py
SQLBuilder.py SQLObject.py Style.py
Log Message:
And while we are at it, run reindent.py
Index: Cache.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Cache.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Cache.py 26 Sep 2003 20:05:14 -0000 1.10
--- Cache.py 4 Dec 2003 16:46:31 -0000 1.11
***************
*** 10,14 ****
CacheFactory caches object creation. Each object should be
referenced by a single hashable ID (note tuples of hashable
! values are also hashable).
"""
--- 10,14 ----
CacheFactory caches object creation. Each object should be
referenced by a single hashable ID (note tuples of hashable
! values are also hashable).
"""
***************
*** 34,38 ****
it will be returned.
"""
!
self.cullFrequency = cullFrequency
self.cullCount = cullFrequency
--- 34,38 ----
it will be returned.
"""
!
self.cullFrequency = cullFrequency
self.cullCount = cullFrequency
Index: Col.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Col.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Col.py 4 Dec 2003 16:44:04 -0000 1.34
--- Col.py 4 Dec 2003 16:46:31 -0000 1.35
***************
*** 90,94 ****
# if they don't give us a specific database name for
# the column, we separate the mixedCase into mixed_case
! # and assume that.
if dbName is None:
self.dbName = soClass._style.pythonAttrToDBColumn(self.name)
--- 90,94 ----
# if they don't give us a specific database name for
# the column, we separate the mixedCase into mixed_case
! # and assume that.
if dbName is None:
self.dbName = soClass._style.pythonAttrToDBColumn(self.name)
***************
*** 210,214 ****
# Ian Sparks pointed out that fb is picky about the order
# of the NOT NULL clause in a create statement. So, we handle
! # them differently for Enum columns.
if not isinstance(self, SOEnumCol):
return ' '.join([self.dbName, self._firebirdType()] + self._extraSQL())
--- 210,214 ----
# Ian Sparks pointed out that fb is picky about the order
# of the NOT NULL clause in a create statement. So, we handle
! # them differently for Enum columns.
if not isinstance(self, SOEnumCol):
return ' '.join([self.dbName, self._firebirdType()] + self._extraSQL())
***************
*** 491,493 ****
all.append(key)
__all__ = all
-
--- 491,492 ----
Index: Constraints.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Constraints.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Constraints.py 25 Sep 2003 20:40:25 -0000 1.3
--- Constraints.py 4 Dec 2003 16:46:31 -0000 1.4
***************
*** 59,62 ****
% self.length,
obj, col, value)
-
-
--- 59,60 ----
Index: Converters.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Converters.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Converters.py 22 Oct 2003 18:11:56 -0000 1.8
--- Converters.py 4 Dec 2003 16:46:31 -0000 1.9
***************
*** 171,173 ****
else:
return reprFunc(db)
-
--- 171,172 ----
Index: Join.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Join.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Join.py 4 Nov 2003 02:28:53 -0000 1.6
--- Join.py 4 Dec 2003 16:46:31 -0000 1.7
***************
*** 132,136 ****
if not self.otherColumn:
self.otherColumn = self.soClass._style.tableReference(otherClass._table)
!
def hasIntermediateTable(self):
--- 132,136 ----
if not self.otherColumn:
self.otherColumn = self.soClass._style.tableReference(otherClass._table)
!
def hasIntermediateTable(self):
***************
*** 170,172 ****
def capitalize(name):
return name[0].capitalize() + name[1:]
-
--- 170,171 ----
Index: SQLBuilder.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLBuilder.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SQLBuilder.py 4 Nov 2003 02:25:33 -0000 1.14
--- SQLBuilder.py 4 Dec 2003 16:46:31 -0000 1.15
***************
*** 484,488 ****
registerConverter(Update, SQLExprConverter)
!
class Delete(SQLExpression):
"""To be safe, this will signal an error if there is no where clause,
--- 484,488 ----
registerConverter(Update, SQLExprConverter)
!
class Delete(SQLExpression):
"""To be safe, this will signal an error if there is no where clause,
***************
*** 595,597 ****
expr = expr[4:]
print repr(eval(expr))
-
--- 595,596 ----
Index: SQLObject.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLObject.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** SQLObject.py 4 Dec 2003 16:44:04 -0000 1.65
--- SQLObject.py 4 Dec 2003 16:46:31 -0000 1.66
***************
*** 1182,1186 ****
return list(self)[:value.stop]
!
if value.start:
assert value.start >= 0
--- 1182,1186 ----
return list(self)[:value.stop]
!
if value.start:
assert value.start >= 0
Index: Style.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Style.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Style.py 15 Jul 2003 02:16:07 -0000 1.5
--- Style.py 4 Dec 2003 16:46:31 -0000 1.6
***************
*** 151,153 ****
return _underToMixedRE.sub(lambda m: m.group(0)[1].upper(),
name)
-
--- 151,152 ----
|
