|
From: Oleg B. <no...@so...> - 2015-02-25 00:19:01
|
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 ed85db037fb956d542a14fa01c92a973941dd7b3 (commit)
via c40e7ca7fb54c3c671dbe1415e6551b25140a0a3 (commit)
from c27eead21bc8db3a923515568738b51e0d5f7adc (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/ed85db037fb956d542a14fa01c92a973941dd7b3
commit ed85db037fb956d542a14fa01c92a973941dd7b3
Merge: c27eead c40e7ca
Author: Oleg Broytman <ph...@ph...>
Date: Wed Feb 25 03:18:19 2015 +0300
Merge pull request #97 from drnlm/fix_test_auto
Only encode column names on python 2
http://sourceforge.net/p/sqlobject/sqlobject/ci/c40e7ca7fb54c3c671dbe1415e6551b25140a0a3
commit c40e7ca7fb54c3c671dbe1415e6551b25140a0a3
Author: Neil <drn...@gm...>
Date: Tue Feb 24 22:58:21 2015 +0200
Only encode column names on python 2
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 6b793ef..276ec1c 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -475,7 +475,8 @@ class sqlmeta(with_metaclass(declarative.DeclarativeMeta, object)):
conn = connection or soClass._connection
for columnDef in conn.columnsFromSchema(sqlmeta.table, soClass):
if columnDef.name not in sqlmeta.columnDefinitions:
- if isinstance(columnDef.name, unicode_type):
+ if isinstance(columnDef.name, unicode_type) and \
+ sys.version_info[0] == 2:
columnDef.name = columnDef.name.encode('ascii')
sqlmeta.addColumn(columnDef)
-----------------------------------------------------------------------
Summary of changes:
sqlobject/main.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
