|
From: Oleg B. <no...@so...> - 2015-02-21 12:35:33
|
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 8f575d4bd33876da5e9f4f5c913c63f07ed2a312 (commit)
via 68a58ca651ebe3d32c327f1d3b2d659e9d125d9f (commit)
via 1f7dbbf59ba9cf1d408d9a571a0cef60e95cac90 (commit)
via c3223bc65a4bf26578527e3f93807a615a597098 (commit)
via abb802e6d632eb546785041cba93bba4ef0dd035 (commit)
via 55bf16c3f11649919d7013bb20e7b5270d497c6d (commit)
from a680896169d936ed7cd366463ba5548f0ed7c10e (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/8f575d4bd33876da5e9f4f5c913c63f07ed2a312
commit 8f575d4bd33876da5e9f4f5c913c63f07ed2a312
Merge: 68a58ca 1f7dbbf
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 21 15:33:48 2015 +0300
Merge pull request #88 from drnlm/dont_encode_python_3
Don't encode strings back to bytes in python 3
http://sourceforge.net/p/sqlobject/sqlobject/ci/68a58ca651ebe3d32c327f1d3b2d659e9d125d9f
commit 68a58ca651ebe3d32c327f1d3b2d659e9d125d9f
Merge: a680896 c3223bc
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 21 03:42:30 2015 +0300
Merge pull request #87 from drnlm/py3k_fixes_3
Py3k fixes 3
http://sourceforge.net/p/sqlobject/sqlobject/ci/1f7dbbf59ba9cf1d408d9a571a0cef60e95cac90
commit 1f7dbbf59ba9cf1d408d9a571a0cef60e95cac90
Author: Neil <drn...@gm...>
Date: Fri Feb 20 17:32:21 2015 +0200
Don't encode strings back to bytes in python 3
diff --git a/sqlobject/col.py b/sqlobject/col.py
index b00f2a3..d8fdf78 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -564,7 +564,9 @@ class StringValidator(SOValidator):
binaryType = type(None) # Just a simple workaround
dbEncoding = self.getDbEncoding(state, default='ascii')
if isinstance(value, unicode_type):
- return value.encode(dbEncoding)
+ if sys.version_info[0] < 3:
+ return value.encode(dbEncoding)
+ return value
if self.dataType and isinstance(value, self.dataType):
return value
if isinstance(value,
http://sourceforge.net/p/sqlobject/sqlobject/ci/c3223bc65a4bf26578527e3f93807a615a597098
commit c3223bc65a4bf26578527e3f93807a615a597098
Author: Neil <drn...@gm...>
Date: Fri Feb 20 17:25:42 2015 +0200
Protect against dictionary changes in loop
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index f4d6ff0..ef34be8 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -852,7 +852,7 @@ class Transaction(object):
for sub in self.cache.allSubCachesByClassNames().items()]
subCaches.extend([(x[0], x[1]) for x in self._deletedCache.items()])
for cls, ids in subCaches:
- for id in ids:
+ for id in list(ids):
inst = self._dbConnection.cache.tryGetByName(id, cls)
if inst is not None:
inst.expire()
@@ -869,7 +869,7 @@ class Transaction(object):
self._connection.rollback()
for subCache, ids in subCaches:
- for id in ids:
+ for id in list(ids):
inst = subCache.tryGet(id)
if inst is not None:
inst.expire()
diff --git a/sqlobject/main.py b/sqlobject/main.py
index b4884b9..6b793ef 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -127,7 +127,7 @@ def unmakeProperties(obj):
delFunc = delattr
d = obj.__dict__
- for var, value in d.items():
+ for var, value in list(d.items()):
if isinstance(value, property):
for prop in [value.fget, value.fset, value.fdel]:
if prop and prop.__name__ not in d:
http://sourceforge.net/p/sqlobject/sqlobject/ci/abb802e6d632eb546785041cba93bba4ef0dd035
commit abb802e6d632eb546785041cba93bba4ef0dd035
Author: Neil <drn...@gm...>
Date: Fri Feb 20 17:21:20 2015 +0200
Don't encode logging info on python 3
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index d6934ea..f4d6ff0 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -40,7 +40,7 @@ class ConsoleWriter:
def write(self, text):
logfile = getattr(sys, self.loglevel)
- if isinstance(text, unicode_type):
+ if isinstance(text, unicode_type) and sys.version_info[0] < 3:
try:
text = text.encode(self.dbEncoding)
except UnicodeEncodeError:
http://sourceforge.net/p/sqlobject/sqlobject/ci/55bf16c3f11649919d7013bb20e7b5270d497c6d
commit 55bf16c3f11649919d7013bb20e7b5270d497c6d
Author: Neil <drn...@gm...>
Date: Fri Feb 20 17:17:07 2015 +0200
Re-add errornously dropped parameter
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 94a3a4a..d6934ea 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -837,7 +837,8 @@ class Transaction(object):
meth = types.MethodType(self._dbConnection._SO_delete.__func__,
self, self.__class__)
else:
- meth = types.MethodType(self._dbConnection._SO_delete.__func__)
+ meth = types.MethodType(self._dbConnection._SO_delete.__func__,
+ self)
return meth(inst)
def commit(self, close=False):
-----------------------------------------------------------------------
Summary of changes:
sqlobject/col.py | 4 +++-
sqlobject/dbconnection.py | 9 +++++----
sqlobject/main.py | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
