From ad421e42c6cb4892313b245be5455e7c4132a62e Mon Sep 17 00:00:00 2001
From: ilvalle <paolo.valleri@gmail.com>
Date: Mon, 6 Mar 2017 18:28:37 +0100
Subject: [PATCH 1/2] added tests for py36

---
 .travis.yml                | 1 +
 gluon/rewrite.py           | 2 +-
 gluon/tests/test_router.py | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3bc79dcc..74198cea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ python:
   - '2.7'
   - 'pypy'
   - '3.5'
+  - '3.6'
 
 install:
   - pip install -e .
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index 1fef465a..0b19777d 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -317,7 +317,7 @@ def load(routes='routes.py', app=None, data=None, rdict=None):
 
         symbols = dict(app=app)
         try:
-            exec(data + '\n', symbols)
+            exec(data, symbols)
         except SyntaxError as e:
             logger.error(
                 '%s has a syntax error and will not be loaded\n' % path
diff --git a/gluon/tests/test_router.py b/gluon/tests/test_router.py
index ad454fcb..132f8a04 100644
--- a/gluon/tests/test_router.py
+++ b/gluon/tests/test_router.py
@@ -95,14 +95,14 @@ class TestRouter(unittest.TestCase):
         """ Test router syntax error """
         level = logger.getEffectiveLevel()
         logger.setLevel(logging.CRITICAL)  # disable logging temporarily
-        self.assertRaises(SyntaxError, load, data='x:y')
+        self.assertRaises(SyntaxError, load, data='x::y')
         self.assertRaises(
             SyntaxError, load, rdict=dict(BASE=dict(badkey="value")))
         self.assertRaises(SyntaxError, load, rdict=dict(
             BASE=dict(), app=dict(default_application="name")))
 
         self.myassertRaisesRegex(SyntaxError, "invalid syntax",
-                                load, data='x:y')
+                                load, data='x::y')
         self.myassertRaisesRegex(SyntaxError, "unknown key",
                                 load, rdict=dict(BASE=dict(badkey="value")))
         self.myassertRaisesRegex(SyntaxError, "BASE-only key",

From ca9198a26e33249d73555c3a45a13c9f6b5003f5 Mon Sep 17 00:00:00 2001
From: ilvalle <paolo.valleri@gmail.com>
Date: Tue, 7 Mar 2017 21:11:05 +0100
Subject: [PATCH 2/2] updated to latest dal

---
 gluon/packages/dal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gluon/packages/dal b/gluon/packages/dal
index e49dd9bf..9dcd4246 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit e49dd9bf97c10cbaa90908cbb3ca1957c4a7e385
+Subproject commit 9dcd4246029509e6394271a038fa412dedfbbbbe