Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1dbb5b0

Browse files
authoredMar 12, 2025·
autopep8 action fixes
1 parent da24a8c commit 1dbb5b0

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed
 

‎ganga/GangaCore/GPIDev/Lib/File/MassStorageFile.py

+25-8
Original file line numberDiff line numberDiff line change
@@ -387,23 +387,36 @@ def validate(self):
387387
missingKeywords.append(item)
388388

389389
if len(missingKeywords):
390-
return (False, 'Error in %s.outputfilenameformat field : missing keywords %s ' % (_getName(self), ','.join(missingKeywords)))
390+
return (
391+
False, 'Error in %s.outputfilenameformat field : missing keywords %s ' %
392+
(_getName(self), ','.join(missingKeywords)))
391393

392394
if isSplitJob is False and self.outputfilenameformat.find('{sjid}') > -1:
393-
return (False, 'Error in %s.outputfilenameformat field : job is non-split, but {\'sjid\'} keyword found' % _getName(self))
395+
return (
396+
False,
397+
'Error in %s.outputfilenameformat field : job is non-split, but {\'sjid\'} keyword found' %
398+
_getName(self))
394399

395400
if isJob is False and self.outputfilenameformat.find('{sjid}') > -1:
396-
return (False, 'Error in %s.outputfilenameformat field : no parent job, but {\'sjid\'} keyword found' % _getName(self))
401+
return (
402+
False,
403+
'Error in %s.outputfilenameformat field : no parent job, but {\'sjid\'} keyword found' %
404+
_getName(self))
397405

398406
if isJob is False and self.outputfilenameformat.find('{jid}') > -1:
399-
return (False, 'Error in %s.outputfilenameformat field : no parent job, but {\'jid\'} keyword found' % _getName(self))
407+
return (
408+
False,
409+
'Error in %s.outputfilenameformat field : no parent job, but {\'jid\'} keyword found' %
410+
_getName(self))
400411

401412
invalidUnixChars = ['"', ' ']
402413
test = self.outputfilenameformat.replace('{jid}', 'a').replace('{sjid}', 'b').replace('{fname}', 'c')
403414

404415
for invalidUnixChar in invalidUnixChars:
405416
if test.find(invalidUnixChar) > -1:
406-
return (False, 'Error in %s.outputfilenameformat field : invalid char %s found' % (_getName(self), invalidUnixChar))
417+
return (
418+
False, 'Error in %s.outputfilenameformat field : invalid char %s found' %
419+
(_getName(self), invalidUnixChar))
407420

408421
return (True, '')
409422

@@ -438,9 +451,13 @@ def getWNInjectedScript(self, outputFiles, indent, patternsToZip, postProcessLoc
438451
if outputFile.outputfilenameformat is not None and outputFile.outputfilenameformat != '':
439452
outputfilenameformat = outputFile.outputfilenameformat
440453

441-
massStorageCommands.append(['massstorage', outputFile.namePattern, outputfilenameformat,
442-
massStorageConfig['mkdir_cmd'], massStorageConfig['cp_cmd'],
443-
massStorageConfig['ls_cmd'], os.path.expanduser(os.path.expandvars(massStorageConfig['path']))])
454+
massStorageCommands.append(['massstorage',
455+
outputFile.namePattern,
456+
outputfilenameformat,
457+
massStorageConfig['mkdir_cmd'],
458+
massStorageConfig['cp_cmd'],
459+
massStorageConfig['ls_cmd'],
460+
os.path.expanduser(os.path.expandvars(massStorageConfig['path']))])
444461

445462
script_location = os.path.join(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))),
446463
'scripts/MassStorageFileWNScript.py.template')

‎ganga/GangaCore/Runtime/Repository_runtime.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def shutdown():
179179
from GangaCore.Utility.logging import getLogger
180180
logger = getLogger()
181181
logger.info('Registry Shutdown')
182-
#import traceback
182+
# import traceback
183183
# traceback.print_stack()
184184

185185
# Flush all repos before we shut them down
@@ -205,7 +205,7 @@ def shutdown():
205205
for itr, registry in enumerate(all_registries):
206206
thisName = registry.name
207207
try:
208-
if not thisName in started_registries:
208+
if thisName not in started_registries:
209209
continue
210210
# in case this is called repeatedly, only call shutdown once
211211
started_registries.remove(thisName)

0 commit comments

Comments
 (0)
Please sign in to comment.