Minor code tidy-up.

pytest.ini

@@ -1,2 +1,3 @@
 [pytest]
 addopts = --pylint
+norecursedirs = _work_

vasl_templates/server_settings.py

@@ -235,7 +235,7 @@ def install_server_settings( is_startup ):
     """Install the server settings."""
 
     # install the server settings
-    from vasl_templates.webapp import app as app
+    from vasl_templates.webapp import app
     for key in SERVER_SETTINGS:
         key2 = key.replace( "-", "_" ).upper()
         app.config[ key2 ] = app_settings.value( "ServerSettings/"+key )

vasl_templates/webapp/tests/test_capabilities.py

@@ -537,7 +537,8 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
     elem.send_keys( "QSU (modified)" )
 
     # delete a capability
-    ActionChains(webdriver).key_down( Keys.CONTROL ).click( elems[1] ).key_up( Keys.CONTROL ).perform()
+    ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elems[1] ).perform()
+    ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
 
     # add a new capability
     elem = find_child( "#vo_capabilities-add" )
@@ -569,7 +570,8 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
 
     # delete all capabilities
     for elem in elems:
-        ActionChains(webdriver).key_down( Keys.CONTROL ).click( elem ).key_up( Keys.CONTROL ).perform()
+        ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elem ).perform()
+        ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
     click_dialog_button( "OK" )
     check_snippet( "" )
 
@@ -659,7 +661,8 @@ def test_custom_comments( webapp, webdriver ): #pylint: disable=too-many-stateme
     elem.send_keys( "a comment (modified)" )
 
     # delete a comment
-    ActionChains(webdriver).key_down( Keys.CONTROL ).click( elems[1] ).key_up( Keys.CONTROL ).perform()
+    ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elems[1] ).perform()
+    ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
 
     # add a new comment
     elem = find_child( "#vo_comments-add" )
@@ -691,7 +694,8 @@ def test_custom_comments( webapp, webdriver ): #pylint: disable=too-many-stateme
 
     # delete all comments
     for elem in elems:
-        ActionChains(webdriver).key_down( Keys.CONTROL ).click( elem ).key_up( Keys.CONTROL ).perform()
+        ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elem ).perform()
+        ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
     click_dialog_button( "OK" )
     check_snippet( "" )
 
@@ -982,7 +986,8 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
     check_elite2( True, True )
     elems = find_children( "#vo_capabilities-sortable li" )
     webdriver.execute_script( "arguments[0].scrollIntoView(true);", elems[4] )
-    ActionChains(webdriver).key_down( Keys.CONTROL ).click( elems[4] ).key_up( Keys.CONTROL ).perform()
+    ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elems[4] ).perform()
+    ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
     click_dialog_button( "OK" )
     check_elite( True, False )
 

vasl_templates/webapp/tests/test_snippets.py

@@ -349,11 +349,8 @@ def test_snippet_images( webapp, webdriver ):
         webdriver.execute_script( "arguments[0].value = arguments[1]", ret_buffer, "" )
 
         # shift-click the snippet button
-        ActionChains( webdriver ) \
-            .key_down( Keys.SHIFT ) \
-            .click( snippet_btn ) \
-            .key_up( Keys.SHIFT ) \
-            .perform()
+        ActionChains( webdriver ).key_down( Keys.SHIFT ).click( snippet_btn ).perform()
+        ActionChains( webdriver ).key_up( Keys.SHIFT ).perform()
 
         # wait for the snippet image to be generated
         wait_for( 20, lambda: ret_buffer.get_attribute( "value" ) )

vasl_templates/webapp/tests/utils.py

@@ -470,7 +470,7 @@ def _do_select_droplist( sel, val ):
 
 def get_droplist_vals_index( sel ):
     """Get the value/text for each option in a droplist."""
-    return { k: v for k,v in get_droplist_vals(sel) }
+    return dict( get_droplist_vals( sel ) )
 
 def get_droplist_vals( sel ):
     """Get the value/text for each option in a droplist."""