dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix iteritems, enabled test_cache & test_dal for 3.5

Browse Source
This commit is contained in:
ilvalle
2016-06-02 17:21:36 +02:00
parent 707330accd
commit db8306b5c4
10 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/languages.py
+3 -3
View File
@@ -18,7 +18,7 @@ import pkgutil
import logging
from cgi import escape
from threading import RLock
from gluon._compat import copyreg, PY2, maketrans, iterkeys, unicodeT, to_unicode, to_bytes
from gluon._compat import copyreg, PY2, maketrans, iterkeys, unicodeT, to_unicode, to_bytes, iteritems
from gluon.portalocker import read_locked, LockedFile
from gluon.utf8 import Utf8
@@ -756,7 +756,7 @@ class translator(object):
if isinstance(symbols, dict):
symbols.update(
(key, xmlescape(value).translate(ttab_in))
for key, value in symbols.iteritems()
for key, value in iteritems(symbols)
if not isinstance(value, NUMBERS))
else:
if not isinstance(symbols, tuple):
@@ -939,7 +939,7 @@ class translator(object):
if isinstance(symbols, dict):
symbols.update(
(key, str(value).translate(ttab_in))
for key, value in symbols.iteritems()
for key, value in iteritems(symbols)
if not isinstance(value, NUMBERS))
else:
if not isinstance(symbols, tuple):