Update to 5.4

tools/cleanup_amavisd_db.py

@@ -31,13 +31,13 @@
 import os
 import sys
 import time
-import web
 
 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

tools/cleanup_db.py

@@ -27,13 +27,13 @@
 import os
 import sys
 import time
-import web
 
 os.environ['LC_ALL'] = 'C'
 
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 import settings
 from tools.ira_tool_lib import debug, logger, sql_dbn, get_db_conn, sql_count_id
 

tools/delete_mailboxes.py

@@ -40,13 +40,13 @@ import time
 import logging
 import shutil
 import pwd
-import web
 
 os.environ['LC_ALL'] = 'C'
 
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 from libs import iredutils
 from tools import ira_tool_lib
 import settings

tools/delete_sessions.py

@@ -6,13 +6,13 @@
 
 import os
 import sys
-import web
 
 os.environ['LC_ALL'] = 'C'
 
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 from tools import ira_tool_lib
 
 web.config.debug = ira_tool_lib.debug

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':

tools/dump_quarantined_mails.py

@@ -9,7 +9,6 @@
 import os
 import sys
 import time
-import web
 
 output_dir = sys.argv[1]
 if not os.path.isdir(output_dir):
@@ -20,6 +19,7 @@ os.environ['LC_ALL'] = 'C'
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 from tools.ira_tool_lib import debug, get_db_conn
 
 web.config.debug = debug

tools/export_last_login.py

@@ -14,13 +14,13 @@ Usage:
 import os
 import sys
 import time
-import web
 
 os.environ['LC_ALL'] = 'C'
 
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 import settings
 from tools import ira_tool_lib
 from libs.iredutils import epoch_seconds_to_gmt

tools/ira_tool_lib.py

@@ -5,21 +5,21 @@
 import os
 import sys
 import logging
-import web
 
 debug = False
 
-# Set True to print SQL queries.
-web.config.debug = debug
-
 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
 
+# Set True to print SQL queries.
+web.config.debug = debug
+
 backend = settings.backend
 if backend in ['ldap', 'mysql']:
     sql_dbn = 'mysql'

tools/migrate_cluebringer_wblist_to_amavisd.py

@@ -8,13 +8,13 @@
 
 import os
 import sys
-import web
 
 os.environ['LC_ALL'] = 'C'
 
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 import settings
 from libs.iredutils import is_valid_amavisd_address
 from libs.amavisd import wblist

tools/notify_quarantined_recipients.py

@@ -93,7 +93,6 @@ import time
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.header import Header
-import web
 
 os.environ['LC_ALL'] = 'C'
 
@@ -103,6 +102,7 @@ sys.path.insert(0, rootdir)
 
 now = int(time.time())
 
+import web
 import settings
 from libs import iredutils
 from libs.ireddate import utc_to_timezone

tools/promote_user_to_global_admin.py

@@ -15,13 +15,13 @@ def usage():
 
 import os
 import sys
-import web
 
 os.environ['LC_ALL'] = 'C'
 
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 import settings
 from tools.ira_tool_lib import debug, get_db_conn
 from libs.iredutils import is_email

tools/reset_user_password.py

@@ -14,13 +14,13 @@ def usage():
 
 import os
 import sys
-import web
 
 os.environ['LC_ALL'] = 'C'
 
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 import settings
 from tools.ira_tool_lib import debug, get_db_conn
 from libs.iredutils import is_email

tools/update_mailbox_quota.py

@@ -32,13 +32,13 @@ def usage():
 
 import os
 import sys
-import web
 
 os.environ['LC_ALL'] = 'C'
 
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 import settings
 from tools.ira_tool_lib import debug, logger, get_db_conn
 from libs.iredutils import is_email

tools/update_password_in_csv.py

@@ -5,7 +5,6 @@
 
 import os
 import sys
-import web
 
 
 def usage():
@@ -33,6 +32,7 @@ os.environ['LC_ALL'] = 'C'
 rootdir = os.path.abspath(os.path.dirname(__file__)) + '/../'
 sys.path.insert(0, rootdir)
 
+import web
 import settings
 from tools.ira_tool_lib import debug, logger, get_db_conn
 from libs.iredutils import is_email