From 26081782c8576da29ffe3aa7d763251a6d7ccf43 Mon Sep 17 00:00:00 2001
From: ilvalle <paolo.valleri@gmail.com>
Date: Sat, 18 Nov 2017 12:44:46 +0100
Subject: [PATCH 1/2] testing development environments

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e7c88e7e..644e6211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,16 @@ python:
   - '2.7'
   - '3.5'
   - '3.6'
+  - '3.6-dev'
+  - '3.7-dev'
   - 'pypy-5.3.1'
   - 'pypy3.5-5.7.1-beta'
 
 matrix:
   allow_failures:
     - python: 'pypy3.5-5.7.1-beta'
+    - python: '3.6-dev'
+    - python: '3.7-dev'
 
 install:
   - pip install -e .

From 622b29366adec20e1b9b6aaca274757e63b994e7 Mon Sep 17 00:00:00 2001
From: ilvalle <paolo.valleri@gmail.com>
Date: Sat, 2 Dec 2017 10:12:45 +0100
Subject: [PATCH 2/2] fix include_meta for py35, added tests. close #1816

---
 gluon/globals.py            |  2 +-
 gluon/tests/test_globals.py | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gluon/globals.py b/gluon/globals.py
index f9f5013b..ea1c46c9 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -459,7 +459,7 @@ class Response(Storage):
         for meta in iteritems((self.meta or {})):
             k, v = meta
             if isinstance(v, dict):
-                s += '<meta' + ''.join(' %s="%s"' % (xmlescape(key),
+                s += '<meta' + ''.join(' %s="%s"' % (to_native(xmlescape(key)),
                                                      to_native(xmlescape(v[key]))) for key in v) + ' />\n'
             else:
                 s += '<meta name="%s" content="%s" />\n' % (k, to_native(xmlescape(v)))
diff --git a/gluon/tests/test_globals.py b/gluon/tests/test_globals.py
index da403dbe..666249fa 100644
--- a/gluon/tests/test_globals.py
+++ b/gluon/tests/test_globals.py
@@ -230,3 +230,14 @@ class testResponse(unittest.TestCase):
         current.session._fixup_before_save()
         cookie = str(current.response.cookies)
         self.assertTrue('httponly' not in cookie.lower())
+
+    def test_include_meta(self):
+        response = Response()
+        response.meta[u'web2py'] = 'web2py'
+        response.include_meta()
+        self.assertEqual(response.body.getvalue(), '\n<meta name="web2py" content="web2py" />\n')
+        response = Response()
+        response.meta[u'meta_dict'] = {u'tag_name':'tag_value'}
+        response.include_meta()
+        self.assertEqual(response.body.getvalue(), '\n<meta tag_name="tag_value" />\n')
+