Thread: [SQL-CVS] r4464 - SQLObject/trunk/sqlobject
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2011-10-11 17:10:25
|
Author: phd Date: Tue Oct 11 11:10:18 2011 New Revision: 4464 Log: Use styles.capword instead of capitalize. Removed unused capitalize from main. Modified: SQLObject/trunk/sqlobject/col.py SQLObject/trunk/sqlobject/joins.py SQLObject/trunk/sqlobject/main.py Modified: SQLObject/trunk/sqlobject/col.py ============================================================================== --- SQLObject/trunk/sqlobject/col.py Tue Oct 11 09:40:20 2011 (r4463) +++ SQLObject/trunk/sqlobject/col.py Tue Oct 11 11:10:18 2011 (r4464) @@ -31,6 +31,7 @@ from classregistry import findClass import constraints as constrs import sqlbuilder +from styles import capword NoDefault = sqlbuilder.NoDefault @@ -188,7 +189,7 @@ else: self.unique = unique if self.unique and alternateMethodName is None: - self.alternateMethodName = 'by' + self.name[0].capitalize() + self.name[1:] + self.alternateMethodName = 'by' + capword(self.name) else: self.alternateMethodName = alternateMethodName Modified: SQLObject/trunk/sqlobject/joins.py ============================================================================== --- SQLObject/trunk/sqlobject/joins.py Tue Oct 11 09:40:20 2011 (r4463) +++ SQLObject/trunk/sqlobject/joins.py Tue Oct 11 11:10:18 2011 (r4464) @@ -3,6 +3,7 @@ import events import styles import sqlbuilder +from styles import capword __all__ = ['MultipleJoin', 'SQLMultipleJoin', 'RelatedJoin', 'SQLRelatedJoin', 'SingleJoin', 'ManyToMany', 'OneToMany'] @@ -139,10 +140,10 @@ else: name = name + "s" self.joinMethodName = name - if not addRemoveName: - self.addRemoveName = capitalize(self.otherClassName) - else: + if addRemoveName: self.addRemoveName = addRemoveName + else: + self.addRemoveName = capword(self.otherClassName) def performJoin(self, inst): ids = inst._connection._SO_selectJoin( @@ -301,9 +302,6 @@ class SQLRelatedJoin(RelatedJoin): baseClass = SOSQLRelatedJoin -def capitalize(name): - return name[0].capitalize() + name[1:] - class SOSingleJoin(SOMultipleJoin): def __init__(self, **kw): Modified: SQLObject/trunk/sqlobject/main.py ============================================================================== --- SQLObject/trunk/sqlobject/main.py Tue Oct 11 09:40:20 2011 (r4463) +++ SQLObject/trunk/sqlobject/main.py Tue Oct 11 11:10:18 2011 (r4464) @@ -1686,9 +1686,6 @@ self.__class__._connection.cache.put(self.id, self.__class__, self) -def capitalize(name): - return name[0].capitalize() + name[1:] - def setterName(name): return '_set_%s' % name def rawSetterName(name): |