From 757ce4e76ef80d97174687f4a606b1cb37eeeafd Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Tue, 27 Jun 2017 16:43:42 -0500
Subject: [PATCH] fixes #1528

---
 applications/admin/controllers/default.py | 5 ++++-
 gluon/packages/dal                        | 2 +-
 gluon/restricted.py                       | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index 94fc91ce..ff4ac4a2 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -16,6 +16,7 @@ from gluon.tools import Config
 from gluon.compileapp import find_exposed_functions
 from glob import glob
 from gluon._compat import iteritems, PY2, pickle, xrange, urlopen, to_bytes, StringIO, to_native
+import gluon.rewrite
 import shutil
 import platform
 
@@ -249,6 +250,7 @@ def site():
                 db.app.insert(name=appname, owner=auth.user.id)
             log_progress(appname)
             session.flash = T('new application "%s" created', appname)
+            gluon.rewrite.load()
             redirect(URL('design', args=appname))
         else:
             session.flash = \
@@ -266,6 +268,7 @@ def site():
                 new_repo = git.Repo.clone_from(form_update.vars.url, target)
                 session.flash = T('new application "%s" imported',
                                   form_update.vars.name)
+                gluon.rewrite.load()
             except git.GitCommandError as err:
                 session.flash = T('Invalid git repository specified.')
             redirect(URL(r=request))
@@ -302,6 +305,7 @@ def site():
             log_progress(appname)
             session.flash = T(msg, dict(appname=appname,
                                         digest=md5_hash(installed)))
+            gluon.rewrite.load()
         else:
             msg = 'unable to install application "%(appname)s"'
             session.flash = T(msg, dict(appname=form_update.vars.name))
@@ -1861,7 +1865,6 @@ def user():
 
 def reload_routes():
     """ Reload routes.py """
-    import gluon.rewrite
     gluon.rewrite.load()
     redirect(URL('site'))
 
diff --git a/gluon/packages/dal b/gluon/packages/dal
index 38066734..0a27f4b6 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit 38066734f71f2cfe8688493ac8e08c6e654e16bc
+Subproject commit 0a27f4b6c8331895a0040733637941ea6729ec41
diff --git a/gluon/restricted.py b/gluon/restricted.py
index 95410f5c..3fe5bfb0 100644
--- a/gluon/restricted.py
+++ b/gluon/restricted.py
@@ -137,7 +137,10 @@ class RestrictedError(Exception):
         self.environment = environment
         if layer:
             try:
-                self.traceback = traceback.format_exc(limit=1)
+                try:
+                    self.traceback = traceback.format_exc()
+                except:
+                    self.traceback = traceback.format_exc(limit=1)
             except:
                 self.traceback = 'no traceback because template parsing error'
             try: