[SQL-CVS] SQLObject development repository branch master updated. 2.1.0-240-g766863c

[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  766863cc2a0cb734ab97eb4320ec8b37bad3518a (commit)
       via  cbfb77a4415620c83477943dd484fd3783971831 (commit)
       via  cb31910b04cbcde465753d079c0ed825c007b3af (commit)
      from  8f575d4bd33876da5e9f4f5c913c63f07ed2a312 (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/766863cc2a0cb734ab97eb4320ec8b37bad3518a

commit 766863cc2a0cb734ab97eb4320ec8b37bad3518a
Merge: 8f575d4 cbfb77a
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Feb 21 17:07:56 2015 +0300

    Merge pull request #89 from drnlm/postgres_py3k
    
    Postgres py3k


http://sourceforge.net/p/sqlobject/sqlobject/ci/cbfb77a4415620c83477943dd484fd3783971831

commit cbfb77a4415620c83477943dd484fd3783971831
Author: Neil <drn...@gm...>
Date:   Fri Feb 20 17:30:23 2015 +0200

    Update postgres ErrorMessage exception

diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index 63afa14..d82d06e 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -8,7 +8,7 @@ from sqlobject.converters import registerConverter
 
 class ErrorMessage(str):
     def __new__(cls, e, append_msg=''):
-        obj = str.__new__(cls, e[0] + append_msg)
+        obj = str.__new__(cls, e.args[0] + append_msg)
         if e.__module__ == 'psycopg2':
             obj.code = getattr(e, 'pgcode', None)
             obj.error = getattr(e, 'pgerror', None)

http://sourceforge.net/p/sqlobject/sqlobject/ci/cb31910b04cbcde465753d079c0ed825c007b3af

commit cb31910b04cbcde465753d079c0ed825c007b3af
Author: Neil <drn...@gm...>
Date:   Fri Feb 20 17:29:45 2015 +0200

    Enable postgres testing with python 3

diff --git a/.travis.yml b/.travis.yml
index 900ca4f..e78ad92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ env:
   - TOXENV=py26-sqlite
   - TOXENV=py27-sqlite
   - TOXENV=py34-sqlite
+  - TOXENV=py34-postgres
   - TOXENV=py27-flake8
   - TOXENV=py34-flake8
 
@@ -17,6 +18,7 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: TOXENV=py34-sqlite
+    - env: TOXENV=py34-postgres
     - env: TOXENV=py34-flake8
 
 script: tox -e ${TOXENV}
diff --git a/tox.ini b/tox.ini
index 46c43bd..b91a30f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite,{py27,py34}-flake8
+envlist = {py26,py27}-mysql,{py26,py27,py34}-postgres,{py26,py27,py34}-sqlite,{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -61,6 +61,12 @@ commands =
 commands =
     py.test -D sqlite:///tmp/sqlobject_test.sqdb
 
+[testenv:py34-postgres]
+commands =
+    psql -c 'create database sqlobject_test;' -U postgres
+    py.test -D postgres://postgres:@localhost/sqlobject_test
+    psql -c 'drop database sqlobject_test;' -U postgres
+
 [testenv:py27-flake8]
 basepython = python2.7
 deps =

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

Summary of changes:
 .travis.yml                        |    2 ++
 sqlobject/postgres/pgconnection.py |    2 +-
 tox.ini                            |    8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
SQLObject development repository