Update to 5.4

tools/dump_disclaimer.py

@@ -26,9 +26,6 @@
 
 import os
 import sys
-import web
-
-web.config.debug = False
 
 # Directory used to store disclaimer files.
 # Default directory is /etc/postfix/disclaimer/.
@@ -43,11 +40,14 @@ os.environ['LC_ALL'] = 'C'
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 import settings
 from libs import iredutils
 from tools import ira_tool_lib
 logger = ira_tool_lib.logger
 
+web.config.debug = False
+
 if settings.backend == 'ldap':
     import ldap
 elif settings.backend == 'mysql':