Merge remote-tracking branch 'origin/master' into edge

jonasbardino · jonasbardino · commit 9e4e571e50e6 · 2024-06-17T16:47:11.000+02:00
diff --git a/mig/server/grid_monitor.py b/mig/server/grid_monitor.py
@@ -39,7 +39,7 @@
 from mig.shared.defaults import default_vgrid
 from mig.shared.fileio import unpickle
 from mig.shared.gridstat import GridStat
-from mig.shared.html import get_xgi_html_header, get_xgi_html_footer, \
+from mig.shared.htmlgen import get_xgi_html_header, get_xgi_html_footer, \
     themed_styles, themed_scripts
 from mig.shared.logger import daemon_logger, register_hangup_handler
 from mig.shared.output import format_timedelta
diff --git a/mig/server/grid_openid.py b/mig/server/grid_openid.py
@@ -92,7 +92,7 @@
     default_username_validator, refresh_user_creds, update_login_map, \
     login_map_lookup, hit_rate_limit, expire_rate_limit, \
     validate_auth_attempt
-from mig.shared.html import openid_page_template
+from mig.shared.htmlgen import openid_page_template
 from mig.shared.logger import daemon_logger, register_hangup_handler
 from mig.shared.pwcrypto import make_simple_hash
 from mig.shared.safeinput import valid_distinguished_name, valid_password, \
diff --git a/mig/server/indexdoi.py b/mig/server/indexdoi.py
@@ -38,7 +38,7 @@
 
 from mig.shared.conf import get_configuration_object
 from mig.shared.defaults import public_archive_doi, public_doi_index
-from mig.shared.html import get_xgi_html_header, get_xgi_html_footer, \
+from mig.shared.htmlgen import get_xgi_html_header, get_xgi_html_footer, \
     themed_styles, themed_scripts
 
 
diff --git a/mig/shared/bailout.py b/mig/shared/bailout.py
@@ -49,7 +49,7 @@ def bailout_title(configuration=None, title_text=""):
             from mig.shared.conf import get_configuration_object
             configuration = get_configuration_object()
             _logger = configuration.logger
-        from mig.shared.html import themed_styles, themed_scripts
+        from mig.shared.htmlgen import themed_styles, themed_scripts
         title['style'] = themed_styles(configuration)
         title['script'] = themed_scripts(configuration, logged_in=False)
     except Exception as exc:
diff --git a/mig/shared/configuration.py b/mig/shared/configuration.py
@@ -54,7 +54,7 @@
         keyword_file, keyword_env, DEFAULT_USER_ID_FORMAT, \
         valid_user_id_formats, valid_filter_methods, default_twofactor_auth_apps
     from mig.shared.logger import Logger, SYSLOG_GDP
-    from mig.shared.html import menu_items, vgrid_items
+    from mig.shared.htmlgen import menu_items, vgrid_items
     from mig.shared.fileio import read_file, load_json, write_file
 except ImportError as ioe:
     print("could not import migrid modules")
diff --git a/mig/shared/freezefunctions.py b/mig/shared/freezefunctions.py
@@ -50,7 +50,7 @@
     makedirs_rec, make_symlink, make_temp_dir, acquire_file_lock, \
     release_file_lock, walk, listdir
 from mig.shared.filemarks import get_filemark, update_filemark
-from mig.shared.html import get_xgi_html_header, get_xgi_html_footer, \
+from mig.shared.htmlgen import get_xgi_html_header, get_xgi_html_footer, \
     man_base_js, themed_styles, themed_scripts, \
     tablesorter_pager
 from mig.shared.pwcrypto import make_path_hash, sorted_hash_algos, default_algo
diff --git a/mig/shared/functionality/adminfreeze.py b/mig/shared/functionality/adminfreeze.py
@@ -38,7 +38,7 @@
 from mig.shared.freezefunctions import get_frozen_archive, brief_freeze
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, fancy_upload_js, \
+from mig.shared.htmlgen import man_base_js, man_base_html, fancy_upload_js, \
     fancy_upload_html, themed_styles
 from mig.shared.init import initialize_main_variables, find_entry
 
diff --git a/mig/shared/functionality/adminvgrid.py b/mig/shared/functionality/adminvgrid.py
@@ -41,7 +41,7 @@
     build_accessrequestitem_object
 from mig.shared.functional import validate_input_and_cert, REJECT_UNSET
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.sharelinks import build_sharelinkitem_object
 from mig.shared.vgrid import vgrid_add_remove_table, vgrid_list, vgrid_is_owner, \
diff --git a/mig/shared/functionality/autolaunch.py b/mig/shared/functionality/autolaunch.py
@@ -33,7 +33,7 @@
 from mig.shared import returnvalues
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.init import initialize_main_variables
-from mig.shared.html import themed_styles, themed_scripts, menu_items
+from mig.shared.htmlgen import themed_styles, themed_scripts, menu_items
 from mig.shared.settings import load_settings
 
 
diff --git a/mig/shared/functionality/cloud.py b/mig/shared/functionality/cloud.py
@@ -43,7 +43,7 @@
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
 from mig.shared.init import find_entry, initialize_main_variables
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.useradm import get_full_user_map
 
 
diff --git a/mig/shared/functionality/createfreeze.py b/mig/shared/functionality/createfreeze.py
@@ -41,7 +41,7 @@
     is_frozen_archive, get_frozen_files, default_algo
 from mig.shared.functional import validate_input_and_cert, REJECT_UNSET
 from mig.shared.handlers import safe_handler, get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.safeinput import valid_path, html_escape
 from mig.shared.validstring import valid_user_path
diff --git a/mig/shared/functionality/crontab.py b/mig/shared/functionality/crontab.py
@@ -48,7 +48,7 @@
 from mig.shared.fileio import makedirs_rec
 from mig.shared.functional import validate_input_and_cert, REJECT_UNSET
 from mig.shared.handlers import safe_handler, get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html
+from mig.shared.htmlgen import man_base_js, man_base_html
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.parseflags import verbose
 
diff --git a/mig/shared/functionality/datatransfer.py b/mig/shared/functionality/datatransfer.py
@@ -43,7 +43,7 @@
 from mig.shared.fileio import read_tail_lines
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import safe_handler, get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.parseflags import quiet
 from mig.shared.pwcrypto import make_digest, make_encrypt
diff --git a/mig/shared/functionality/fileman.py b/mig/shared/functionality/fileman.py
@@ -43,7 +43,7 @@
     advanced_editor_js_deps, lock_info, edit_file
 from mig.shared.gdp.all import get_project_from_client_id
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import themed_styles, legacy_user_interface
+from mig.shared.htmlgen import themed_styles, legacy_user_interface
 from mig.shared.init import initialize_main_variables, find_entry, extract_menu
 from mig.shared.pwcrypto import sorted_hash_algos, default_algo
 from mig.shared.sharelinks import create_share_link_form, import_share_link_form
@@ -78,7 +78,7 @@ def html_tmpl(configuration, client_id, title_entry, csrf_map={}, chroot=''):
     for (target_op, token) in csrf_map.items():
         fill_entries["%s_csrf_token" % target_op] = token
 
-    # TODO: switch to use shared fancy_upload_html from mig.shared.html!
+    # TODO: switch to use shared fancy_upload_html from mig.shared.htmlgen!
     html = '''
     <div id="fm_debug"></div>
     <div id="fm_filemanager">
diff --git a/mig/shared/functionality/freezedb.py b/mig/shared/functionality/freezedb.py
@@ -35,7 +35,7 @@
     pending_archives_update, TARGET_ARCHIVE
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 
 list_operations = ['showlist', 'list']
diff --git a/mig/shared/functionality/gdpman.py b/mig/shared/functionality/gdpman.py
@@ -45,7 +45,7 @@
     validate_user, get_project_info, get_project_from_client_id, \
     project_promote_to_owner, project_demote_owner, fill_category_meta
 from mig.shared.handlers import safe_handler, get_csrf_limit, make_csrf_token
-from mig.shared.html import twofactor_wizard_html, twofactor_wizard_js, \
+from mig.shared.htmlgen import twofactor_wizard_html, twofactor_wizard_js, \
     twofactor_token_html
 from mig.shared.httpsclient import extract_client_id, build_autologout_url
 from mig.shared.init import initialize_main_variables, find_entry
diff --git a/mig/shared/functionality/home.py b/mig/shared/functionality/home.py
@@ -38,7 +38,7 @@
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.init import initialize_main_variables, find_entry, extract_menu
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import save_settings_js, save_settings_html, render_apps, \
+from mig.shared.htmlgen import save_settings_js, save_settings_html, render_apps, \
     menu_items, legacy_user_interface, html_user_messages
 from mig.shared.settings import load_settings
 from mig.shared.settingskeywords import get_keywords_dict
diff --git a/mig/shared/functionality/jobman.py b/mig/shared/functionality/jobman.py
@@ -37,7 +37,7 @@
 from mig.shared.defaults import default_pager_entries, csrf_backends
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import themed_styles
+from mig.shared.htmlgen import themed_styles
 from mig.shared.init import initialize_main_variables, find_entry
 
 
diff --git a/mig/shared/functionality/jobstatus.py b/mig/shared/functionality/jobstatus.py
@@ -39,7 +39,7 @@
 from mig.shared.fileio import unpickle
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import html_post_helper
+from mig.shared.htmlgen import html_post_helper
 from mig.shared.init import initialize_main_variables
 from mig.shared.job import get_job_ids_with_specified_project_name
 from mig.shared.mrslparser import expand_variables
diff --git a/mig/shared/functionality/jupyter.py b/mig/shared/functionality/jupyter.py
@@ -36,7 +36,7 @@
 
 from mig.shared.init import find_entry, initialize_main_variables
 from mig.shared.functional import validate_input_and_cert
-from mig.shared.html import man_base_js
+from mig.shared.htmlgen import man_base_js
 
 
 def signature():
diff --git a/mig/shared/functionality/ls.py b/mig/shared/functionality/ls.py
@@ -41,7 +41,7 @@
 from mig.shared.defaults import seafile_ro_dirname, trash_destdir, csrf_field
 from mig.shared.functional import validate_input
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import fancy_upload_js, fancy_upload_html, confirm_js, \
+from mig.shared.htmlgen import fancy_upload_js, fancy_upload_html, confirm_js, \
     confirm_html, themed_styles
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.parseflags import all, long_list, recursive, file_info
diff --git a/mig/shared/functionality/migadmin.py b/mig/shared/functionality/migadmin.py
@@ -46,7 +46,7 @@
 from mig.shared.findtype import is_admin
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.httpsclient import detect_client_auth
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.safeeval import subprocess_popen, subprocess_pipe, \
diff --git a/mig/shared/functionality/peers.py b/mig/shared/functionality/peers.py
@@ -43,7 +43,7 @@
     pending_peers_filename, peers_fields, peer_kinds, default_pager_entries
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.serial import load
 from mig.shared.user import anon_user_id
diff --git a/mig/shared/functionality/peersaction.py b/mig/shared/functionality/peersaction.py
@@ -44,7 +44,7 @@
     keyword_auto, csrf_field
 from mig.shared.functional import validate_input, REJECT_UNSET
 from mig.shared.handlers import safe_handler, get_csrf_limit
-from mig.shared.html import html_post_helper
+from mig.shared.htmlgen import html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.notification import send_email
 from mig.shared.serial import load, dump
diff --git a/mig/shared/functionality/people.py b/mig/shared/functionality/people.py
@@ -35,7 +35,7 @@
 from mig.shared.defaults import default_pager_entries, any_vgrid, csrf_field
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.modified import pending_users_update, pending_vgrids_update
 from mig.shared.url import quote
diff --git a/mig/shared/functionality/redb.py b/mig/shared/functionality/redb.py
@@ -34,7 +34,7 @@
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.refunctions import build_reitem_object
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.refunctions import get_re_map, CONF
 from mig.shared.vgridaccess import resources_using_re, get_re_provider_map
diff --git a/mig/shared/functionality/reqpwresetaction.py b/mig/shared/functionality/reqpwresetaction.py
@@ -43,7 +43,7 @@
     default_user_abuse_hits, default_proto_abuse_hits, hit_rate_limit, \
     expire_rate_limit, validate_auth_attempt
 from mig.shared.handlers import safe_handler, get_csrf_limit
-from mig.shared.html import themed_styles, themed_scripts
+from mig.shared.htmlgen import themed_styles, themed_scripts
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.notification import send_email
 from mig.shared.pwcrypto import generate_reset_token
diff --git a/mig/shared/functionality/resadmin.py b/mig/shared/functionality/resadmin.py
@@ -43,7 +43,7 @@
 from mig.shared.defaults import default_pager_entries, csrf_field
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.output import html_link
 from mig.shared.refunctions import get_re_dict, list_runtime_environments
diff --git a/mig/shared/functionality/resman.py b/mig/shared/functionality/resman.py
@@ -36,7 +36,7 @@
 from mig.shared.defaults import default_pager_entries, csrf_field
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.modified import pending_resources_update, pending_vgrids_update
 from mig.shared.resource import anon_to_real_res_map
diff --git a/mig/shared/functionality/rmvgridowner.py b/mig/shared/functionality/rmvgridowner.py
@@ -36,7 +36,7 @@
 from mig.shared.defaults import csrf_field, keyword_members
 from mig.shared.functional import validate_input_and_cert, REJECT_UNSET
 from mig.shared.handlers import safe_handler, get_csrf_limit
-from mig.shared.html import html_post_helper
+from mig.shared.htmlgen import html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.parseflags import force
 from mig.shared.useradm import get_full_user_map
diff --git a/mig/shared/functionality/settings.py b/mig/shared/functionality/settings.py
@@ -46,7 +46,7 @@
 from mig.shared.editing import cm_css, cm_javascript, cm_options, wrap_edit_area
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, console_log_javascript, \
+from mig.shared.htmlgen import man_base_js, man_base_html, console_log_javascript, \
     twofactor_wizard_html, twofactor_wizard_js, twofactor_token_html, \
     legacy_user_interface, save_settings_js, save_settings_html, menu_items
 from mig.shared.init import initialize_main_variables, find_entry, extract_menu
diff --git a/mig/shared/functionality/setup.py b/mig/shared/functionality/setup.py
@@ -44,7 +44,7 @@
 from mig.shared.editing import cm_css, cm_javascript, cm_options, wrap_edit_area
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, console_log_javascript, \
+from mig.shared.htmlgen import man_base_js, man_base_html, console_log_javascript, \
     twofactor_wizard_html, twofactor_wizard_js, twofactor_token_html, \
     save_settings_js, save_settings_html
 from mig.shared.httpsclient import detect_client_auth, require_twofactor_setup, \
diff --git a/mig/shared/functionality/sharelink.py b/mig/shared/functionality/sharelink.py
@@ -38,7 +38,7 @@
     keyword_members, csrf_field
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import safe_handler, get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.notification import notify_user_thread
 from mig.shared.pwcrypto import make_hash
diff --git a/mig/shared/functionality/showfreeze.py b/mig/shared/functionality/showfreeze.py
@@ -38,7 +38,7 @@
     build_freezeitem_object, brief_freeze, pending_archives_update, TARGET_PATH
 from mig.shared.functional import validate_input_and_cert, REJECT_UNSET
 from mig.shared.handlers import safe_handler, get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.pwcrypto import sorted_hash_algos
 
diff --git a/mig/shared/functionality/submitjob.py b/mig/shared/functionality/submitjob.py
@@ -37,7 +37,7 @@
     keyword_all, csrf_field
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import fancy_upload_js, fancy_upload_html, \
+from mig.shared.htmlgen import fancy_upload_js, fancy_upload_html, \
     themed_styles
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.mrslkeywords import get_job_specs
diff --git a/mig/shared/functionality/twofactor.py b/mig/shared/functionality/twofactor.py
@@ -52,7 +52,7 @@
     default_user_abuse_hits, default_proto_abuse_hits, hit_rate_limit, \
     expire_rate_limit, validate_auth_attempt
 from mig.shared.init import initialize_main_variables
-from mig.shared.html import twofactor_token_html, themed_styles, themed_scripts
+from mig.shared.htmlgen import twofactor_token_html, themed_styles, themed_scripts
 from mig.shared.httpsclient import detect_client_auth, require_twofactor_setup
 from mig.shared.settings import load_twofactor
 from mig.shared.twofactorkeywords import get_keywords_dict as twofactor_defaults
diff --git a/mig/shared/functionality/vgridforum.py b/mig/shared/functionality/vgridforum.py
@@ -41,7 +41,7 @@
     search_threads, toggle_subscribe, list_subscribers
 from mig.shared.functional import validate_input_and_cert, REJECT_UNSET
 from mig.shared.handlers import safe_handler, get_csrf_limit
-from mig.shared.html import themed_styles
+from mig.shared.htmlgen import themed_styles
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.notification import notify_user_thread
 from mig.shared.vgrid import vgrid_is_owner_or_member
diff --git a/mig/shared/functionality/vgridman.py b/mig/shared/functionality/vgridman.py
@@ -35,7 +35,7 @@
     csrf_field
 from mig.shared.functional import validate_input_and_cert
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import man_base_js, man_base_html, html_post_helper
+from mig.shared.htmlgen import man_base_js, man_base_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.modified import pending_vgrids_update
 from mig.shared.useradm import get_full_user_map
diff --git a/mig/shared/functionality/vgridworkflows.py b/mig/shared/functionality/vgridworkflows.py
@@ -46,7 +46,7 @@
 from mig.shared.events import get_path_expand_map
 from mig.shared.fileio import unpickle, makedirs_rec, move_file
 from mig.shared.functional import validate_input_and_cert, REJECT_UNSET
-from mig.shared.html import man_base_js, man_base_html
+from mig.shared.htmlgen import man_base_js, man_base_html
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.parseflags import verbose
 from mig.shared.vgrid import vgrid_add_remove_table, vgrid_is_owner_or_member, \
diff --git a/mig/shared/functionality/viewuser.py b/mig/shared/functionality/viewuser.py
@@ -37,7 +37,7 @@
 from mig.shared.defaults import any_vgrid, csrf_field
 from mig.shared.functional import validate_input_and_cert, REJECT_UNSET
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
-from mig.shared.html import confirm_js, confirm_html, html_post_helper
+from mig.shared.htmlgen import confirm_js, confirm_html, html_post_helper
 from mig.shared.init import initialize_main_variables, find_entry
 from mig.shared.output import html_link
 from mig.shared.profilekeywords import get_profile_specs
diff --git a/mig/shared/functionality/vmachines.py b/mig/shared/functionality/vmachines.py
diff --git a/mig/shared/htmlgen.py b/mig/shared/htmlgen.py
diff --git a/mig/shared/init.py b/mig/shared/init.py
diff --git a/mig/shared/install.py b/mig/shared/install.py
diff --git a/mig/shared/output.py b/mig/shared/output.py
diff --git a/mig/shared/vgrid.py b/mig/shared/vgrid.py
