diff --git a/gluon/contrib/hypermedia.py b/gluon/contrib/hypermedia.py
index 898a594e..e6901f1a 100644
--- a/gluon/contrib/hypermedia.py
+++ b/gluon/contrib/hypermedia.py
@@ -283,7 +283,7 @@ class Collection(object):
                 # ADD validate fields and return error
                 try:
                     (query, limitby, orderby) = self.request2query(table, request.get_vars)
-                    fields = filter(lambda (fn,value):table[fn].writable,data.items())
+                    fields = filter(lambda fn_value:table[fn_value[0]].writable,data.items())
                     res = db(query).validate_and_update(**dict(fields)) # MAY FAIL
                     if res.errors:
                         return self.error(400,'BAD REQUEST','Validation Error',res.errors)
@@ -296,7 +296,7 @@ class Collection(object):
             else: # create
                 # ADD validate fields and return error
                 try:
-                    fields = filter(lambda (fn,value):table[fn].writable,data.items())
+                    fields = filter(lambda fn_value1:table[fn_value1[0]].writable,data.items())
                     res = table.validate_and_insert(**dict(fields)) # MAY FAIL
                     if res.errors:
                         return self.error(400,'BAD REQUEST','Validation Error',res.errors)
diff --git a/gluon/html.py b/gluon/html.py
index 8fa4212f..00082c17 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -41,8 +41,7 @@ regex_crlf = re.compile('\r|\n')
 join = ''.join
 
 # name2codepoint is incomplete respect to xhtml (and xml): 'apos' is missing.
-entitydefs = dict(map(lambda (
-    k, v): (k, unichr(v).encode('utf-8')), name2codepoint.iteritems()))
+entitydefs = dict(map(lambda k_v: (k_v[0], unichr(k_v[1]).encode('utf-8')), name2codepoint.iteritems()))
 entitydefs.setdefault('apos', u"'".encode('utf-8'))