WiP: address a number of old linting errors in mig/server/X.py

mig/server/grid_openid.py

@@ -116,7 +116,7 @@
     from mig.shared.tlsserver import hardened_ssl_context
     from mig.shared.url import urlparse, urlencode, check_local_site_url, \
         parse_qsl
     from mig.shared.useradm import get_openid_user_dn, check_password_scramble, \
         check_hash
     from mig.shared.userdb import default_db_path
     from mig.shared.validstring import possible_user_id
@@ -135,7 +135,7 @@
 
 # NOTE: response may contain password on the form
 # (<Symbol Bare namespace>, 'password'): 'S3cr3tP4ssw0rd'
 pw_pattern = "\(<Symbol Bare namespace>, 'password'\): '(.+)'"
 pw_regexp = re.compile(pw_pattern)
 
 
@@ -158,7 +158,7 @@
 def valid_cert_fields(arg):
     """Make sure only valid cert field names are allowed"""
     valid_job_id(arg, extra_chars=',')
     if [i for i in arg.split(',') if not i in cert_field_names]:
         invalid_argument(arg)
 
 
@@ -303,7 +303,7 @@
 
         # Add our own SReg fields to list of valid fields from sreg 1.1 spec
         for (key, val) in cert_field_map.items():
             if not key in sreg.data_fields:
                 sreg.data_fields[key] = key.replace('_', ' ').title()
         # print "DEBUG: sreg fields: %s" % sreg.data_fields
         for name in cert_field_names:
@@ -475,7 +475,7 @@
             # Resolve retry url, strip password and err
 
             retry_query = {key: val for (key, val) in self.query.items()
                            if not key in ['password', 'err']}
             self.retry_url = "%s?%s" \
                 % (self.parsed_uri[2], urlencode(retry_query))
 
@@ -667,7 +667,7 @@
         # Old IE 8 does not send contents of submit buttons thus only the
         # fields login_as and password are set with the allow requests. We
         # manually add a yes here if so to avoid the else case.
         if not 'yes' in query and not 'no' in query:
             query['yes'] = 'yes'
 
         if 'yes' in query:
@@ -1301,7 +1301,7 @@
             </fieldset>
             </form>
             <p>
             <a href="%(sid_url)s/cgi-sid/reqpwreset.py?show=migoid">Forgot your password?
             </a>
             </p>
             </div>
@@ -1337,7 +1337,7 @@
               <input type="checkbox" id="remember" name="remember" value="yes"
                   /><label for="remember">Remember this
                   decision</label><br />
               Password: <input type="password" name="password" autofocus /><br />
               <input type="submit" name="yes" value="yes" />
               <input type="submit" name="no" value="no" />
             </form>
@@ -1506,7 +1506,7 @@
 
         <p>The URL for this server is
         <a href=%s><span class="verbatim">%s</span></a>.</p>
         ''' % (user_message, quoteattr(self.server.base_url), self.server.base_url))
 
     def showLoginPage(self, success_to, fail_to, query):
         """Login page provider"""
@@ -1798,3 +1798,4 @@
     info_msg = "Leaving with no more workers active"
     logger.info(info_msg)
     print(info_msg)
+

mig/server/grid_sftp.py

@@ -2105,3 +2105,4 @@ def start_service(configuration):
     info_msg = "Leaving with no more workers active"
     logger.info(info_msg)
     print(info_msg)
+

mig/server/grid_webdavs.py

@@ -82,7 +82,7 @@
 
         def is_native(x): return True
     elif wsgidav_major >= 3:
         from wsgidav.compat import is_native
         from wsgidav.debug_filter import WsgiDavDebugFilter
         # No Cors middelware here
         Cors = None
@@ -418,7 +418,7 @@
             # NOTE: we extract error reason from sys here because SSLError
             #       only started exposing that info in python >=2.7.9
             #       https://docs.python.org/2.7/library/ssl.html#ssl.SSLError
             exc = sys.exc_info()[1]
             if exc.errno == ssl.SSL_ERROR_EOF:
                 # This is almost certainly due to the cherrypy engine
                 # 'pinging' the socket to assert it's connectable;
@@ -1122,31 +1122,31 @@
             return result
         return _impl
 
     @__allow_handle
     @__gdp_log
     def handle_copy(self, dest_path, depth_infinity):
         """Handle a COPY request natively, but with our restrictions"""
         return super(MiGFileResource, self).handle_copy(
             dest_path, depth_infinity)
 
     @__allow_handle
     @__gdp_log
     def handle_move(self, dest_path):
         """Handle a MOVE request natively, but with our restrictions"""
         return super(MiGFileResource, self).handle_move(dest_path)
 
     @__allow_handle
     @__gdp_log
     def handle_delete(self):
         """Handle a DELETE request natively, but with our restrictions"""
         return super(MiGFileResource, self).handle_delete()
 
     @__gdp_log
     def get_content(self):
         """Handle a GET request natively and log for GDP"""
         return super(MiGFileResource, self).get_content()
 
     @__gdp_log
     def begin_write(self, content_type=None):
         """Handle a PUT request natively and log for GDP"""
         return super(MiGFileResource, self).begin_write()
@@ -1258,20 +1258,20 @@
             return result
         return _impl
 
     @__allow_handle
     @__gdp_log
     def handle_copy(self, dest_path, depth_infinity):
         """Handle a COPY request natively, but with our restrictions"""
         return super(MiGFolderResource, self).handle_copy(
             dest_path, depth_infinity)
 
     @__allow_handle
     @__gdp_log
     def handle_move(self, dest_path):
         """Handle a MOVE request natively, but with our restrictions"""
         return super(MiGFolderResource, self).handle_move(dest_path)
 
     @__allow_handle
     @__gdp_log
     def handle_delete(self):
         """Handle a DELETE request natively, but with our restrictions"""
@@ -2141,3 +2141,4 @@
     except Exception as exc:
         logger.error("exiting on unexpected exception: %s" % exc)
         logger.info(traceback.format_exc())
+