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

mig/server/grid_ftps.py

@@ -20,7 +20,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 # -- END_HEADER ---
 #
@@ -316,7 +316,7 @@
             self.authenticated_user = username
             return True
         else:
             # Must raise AuthenticationFailed exception since version 1.0.0 instead
             # of returning bool
             self.authenticated_user = None
             raise AuthenticationFailed()
@@ -333,7 +333,7 @@
 
     def _acceptable_chmod(self, ftps_path, mode):
         """Wrap helper"""
         #logger.debug("acceptable_chmod: %s" % ftps_path)
         reply = acceptable_chmod(ftps_path, mode, self.chmod_exceptions)
         if not reply:
             logger.warning("acceptable_chmod failed: %s %s %s" %
@@ -352,7 +352,7 @@
         try:
             get_fs_path(configuration, path, self.root,
                         daemon_conf['chroot_exceptions'])
             #logger.debug("accepted access to %s" % path)
             return True
         except ValueError as err:
             logger.warning("rejected illegal access to %s :: %s" % (path, err))
@@ -385,7 +385,7 @@
         return [i for i in AbstractedFS.listdir(self, path) if not
                 invisible_path(i)]
 
     ### Force symlinks to look like real dirs to avoid client confusion ###
     def lstat(self, path):
         """Modified to always return real stat to hide symlinks"""
         return self.stat(path)
@@ -403,7 +403,7 @@
         try:
             self.stat(path)
             return True
         except:
             return False
 
     def rmdir(self, path):
@@ -441,7 +441,7 @@
         ftp_old_path = self.fs2ftp(old_path)
         ftp_new_path = self.fs2ftp(new_path)
         # Prevent rename of special files
         if in_vgrid_share(configuration, old_path) == ftp_old_path.lstrip(os.sep):
             logger.error("rename on vgrid share root %s :: %s" %
                          (ftp_old_path, old_path))
             raise FilesystemError("requested rename not allowed")
@@ -510,7 +510,7 @@
     handler.authorizer = authorizer
     handler.abstracted_fs = MiGRestrictedFilesystem
     # TODO: masqueraded ftps fails from fireftp - maybe this would help?
     # if configuration.user_ftps_show_address != configuration.user_ftps_address:
     #    handler.masquerade_address = socket.gethostbyname(
     #        configuration.user_ftps_show_address)
     handler.passive_ports = conf.user_ftps_pasv_ports
@@ -619,3 +619,4 @@
     info_msg = "Leaving with no more workers active"
     logger.info(info_msg)
     print(info_msg)
+

mig/server/grid_openid.py

@@ -20,7 +20,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 # -- END_HEADER ---
 #
@@ -1792,3 +1792,4 @@
     info_msg = "Leaving with no more workers active"
     logger.info(info_msg)
     print(info_msg)
+

mig/server/grid_script.py

@@ -279,29 +279,29 @@
     scheduler = FirstFitScheduler(logger, configuration)
 elif configuration.sched_alg == 'BestFit':
     from mig.server.bestfitscheduler import BestFitScheduler
     scheduler = BestFitScheduler(logger, configuration)
 elif configuration.sched_alg == 'FairFit':
     from mig.server.fairfitscheduler import FairFitScheduler
     scheduler = FairFitScheduler(logger, configuration)
 elif configuration.sched_alg == 'MaxThroughput':
     from mig.server.maxthroughputscheduler import MaxThroughputScheduler
     scheduler = MaxThroughputScheduler(logger, configuration)
 elif configuration.sched_alg == 'Random':
     from mig.server.randomscheduler import RandomScheduler
     scheduler = RandomScheduler(logger, configuration)
 elif configuration.sched_alg == 'FIFO':
     from mig.server.fifoscheduler import FIFOScheduler
     scheduler = FIFOScheduler(logger, configuration)
 else:
     from mig.server.firstfitscheduler import FirstFitScheduler
     print('Unknown sched_alg %s - using FirstFit scheduler'
           % configuration.sched_alg)
     scheduler = FirstFitScheduler(logger, configuration)
 
 scheduler.attach_job_queue(job_queue)
 scheduler.attach_done_queue(done_queue)
 if schedule_cache:
     scheduler.set_cache(schedule_cache)
 
 # redirect grid_stdin to sys.stdin
 
@@ -424,8 +424,8 @@
 
         # Update list of users - create user if new
 
         scheduler.update_users(user_dict)
         user_dict = scheduler.find_user(user_dict)
         user_dict['QUEUE_HIST'].pop(0)
         user_dict['QUEUE_HIST'].append(dict_userjob)
         scheduler.update_seen(user_dict)
@@ -1594,3 +1594,4 @@
     sys.stdout.flush()
     loop_counter += 1
     logger.debug('loop ended')
+

mig/server/grid_sftp.py

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

mig/server/grid_webdavs-3.x.py

@@ -2139,3 +2139,4 @@ def run(configuration):
     except Exception as exc:
         logger.error("exiting on unexpected exception: %s" % exc)
         logger.info(traceback.format_exc())
+