Author: phd
Date: 2010-03-22 10:16:34 -0600 (Mon, 22 Mar 2010)
New Revision: 4144
Modified:
SQLObject/trunk/docs/News.txt
SQLObject/trunk/sqlobject/col.py
Log:
Renamed db_encoding to dbEncoding in UnicodeStringValidator.
Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt 2010-03-22 16:14:25 UTC (rev 4143)
+++ SQLObject/trunk/docs/News.txt 2010-03-22 16:16:34 UTC (rev 4144)
@@ -35,6 +35,8 @@
* Better handling of circular dependencies in sqlobject-admin -
do not include the class in the list of other classes.
+* Renamed db_encoding to dbEncoding in UnicodeStringValidator.
+
SQLObject 0.12.2
================
Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py 2010-03-22 16:14:25 UTC (rev 4143)
+++ SQLObject/trunk/sqlobject/col.py 2010-03-22 16:16:34 UTC (rev 4144)
@@ -554,9 +554,9 @@
if isinstance(value, (unicode, sqlbuilder.SQLExpression)):
return value
if isinstance(value, str):
- return unicode(value, self.db_encoding)
+ return unicode(value, self.dbEncoding)
if isinstance(value, array): # MySQL
- return unicode(value.tostring(), self.db_encoding)
+ return unicode(value.tostring(), self.dbEncoding)
raise validators.Invalid("expected a str or a unicode in the UnicodeCol '%s', got %s %r instead" % \
(self.name, type(value), value), value, state)
@@ -566,7 +566,7 @@
if isinstance(value, (unicode, sqlbuilder.SQLExpression)):
return value
if isinstance(value, str):
- return unicode(value, self.db_encoding)
+ return unicode(value, self.dbEncoding)
raise validators.Invalid("expected a str or a unicode in the UnicodeCol '%s', got %s %r instead" % \
(self.name, type(value), value), value, state)
@@ -577,7 +577,7 @@
def createValidators(self):
return [UnicodeStringValidator(name=self.name,
- db_encoding=self.dbEncoding)] + \
+ dbEncoding=self.dbEncoding)] + \
super(SOUnicodeCol, self).createValidators()
class UnicodeCol(Col):
|
