[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a2-4-g9b1efdf

[Oleg B. <no...@so...>]

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  9b1efdfd041d535caedd8147355cf9a2168013e3 (commit)
       via  2b1ae788855c3719daa69ed655c0392d1b4ecc9a (commit)
       via  2c6291cb3941e561590c633b5822fc1a72da4333 (commit)
       via  06decd29a52483cee0dffd44b8d2457da28d51c9 (commit)
      from  a034697c25b17b1d165fea66162f32f50235882f (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/9b1efdfd041d535caedd8147355cf9a2168013e3

commit 9b1efdfd041d535caedd8147355cf9a2168013e3
Merge: a034697 2b1ae78
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Dec 28 18:44:34 2015 +0300

    Merge branch '2.2'

diff --cc sqlobject/include/hashcol.py
index b4f1383,fa00dd5..e36b980
--- a/sqlobject/include/hashcol.py
+++ b/sqlobject/include/hashcol.py
@@@ -91,14 -49,13 +91,14 @@@ class SOHashCol(sqlobject.col.SOStringC
          else:
              self.hashMethod = kw['hashMethod']
              del kw['hashMethod']
-         super(sqlobject.col.SOStringCol, self).__init__(**kw)
 -        super( SOHashCol, self ).__init__( **kw )
++        super(SOHashCol, self).__init__(**kw)
 +
 +    def createValidators(self):
 +        return [HashValidator(name=self.name, hashMethod=self.hashMethod)] + \
 +            super(SOHashCol, self).createValidators()
  
 -    def createValidators( self ):
 -        return [HashValidator( name=self.name, hashMethod=self.hashMethod )] + \
 -            super( SOHashCol, self ).createValidators()
  
 -class HashCol( sqlobject.col.StringCol ):
 +class HashCol(sqlobject.col.StringCol):
      """ End-user HashCol class. May be instantiated with 'hashMethod', a function
      which returns the string hash of any other string (i.e. basestring). """
  

-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt                |    2 ++
 sqlobject/include/hashcol.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository