|
From: Oleg B. <no...@so...> - 2015-02-23 16:25:03
|
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 bc89f66a64b910f0cb99a840ce804d458bcdddcc (commit)
via 8a6dd908d181b2f3078eb3c40f440d363b0a87b9 (commit)
from 2f4ecf9a0f8b34907fc4a71e99674f9d77f4acc2 (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/bc89f66a64b910f0cb99a840ce804d458bcdddcc
commit bc89f66a64b910f0cb99a840ce804d458bcdddcc
Merge: 2f4ecf9 8a6dd90
Author: Oleg Broytman <ph...@ph...>
Date: Mon Feb 23 19:23:33 2015 +0300
Merge pull request #95 from drnlm/fix_map_in_select
map no longer returns a list on python 3, so explicitly convert it
http://sourceforge.net/p/sqlobject/sqlobject/ci/8a6dd908d181b2f3078eb3c40f440d363b0a87b9
commit 8a6dd908d181b2f3078eb3c40f440d363b0a87b9
Author: Neil <drn...@gm...>
Date: Mon Feb 23 17:34:30 2015 +0200
map no longer returns a list on python 3, so explicitly convert it
diff --git a/sqlobject/sresults.py b/sqlobject/sresults.py
index d5ececd..9abfa89 100644
--- a/sqlobject/sresults.py
+++ b/sqlobject/sresults.py
@@ -22,7 +22,7 @@ class SelectResults(object):
ops['orderBy'] = sourceClass.sqlmeta.defaultOrder
orderBy = ops['orderBy']
if isinstance(orderBy, (tuple, list)):
- orderBy = map(self._mungeOrderBy, orderBy)
+ orderBy = list(map(self._mungeOrderBy, orderBy))
else:
orderBy = self._mungeOrderBy(orderBy)
ops['dbOrderBy'] = orderBy
-----------------------------------------------------------------------
Summary of changes:
sqlobject/sresults.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
