You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by ma...@apache.org on 2020/11/29 09:53:33 UTC
svn commit: r1883928 - /gump/live/cron/gump.py
Author: markt
Date: Sun Nov 29 09:53:32 2020
New Revision: 1883928
URL: http://svn.apache.org/viewvc?rev=1883928&view=rev
Log:
Convert for python3
Modified:
gump/live/cron/gump.py
Modified: gump/live/cron/gump.py
URL: http://svn.apache.org/viewvc/gump/live/cron/gump.py?rev=1883928&r1=1883927&r2=1883928&view=diff
==============================================================================
--- gump/live/cron/gump.py (original)
+++ gump/live/cron/gump.py Sun Nov 29 09:53:32 2020
@@ -56,7 +56,7 @@ def runCommand(command, args = '', dir =
if not os.path.exists(cwdpath):
os.makedirs(dir)
os.chdir(cwdpath)
- except Exception, details :
+ except Exception as details :
# Log the problem and re-raise
log.write('Failed to create/change CWD [' + cwdpath + \
']. Details: ' + str(details) + '\n')
@@ -97,7 +97,7 @@ def runCommand(command, args = '', dir =
os.remove(outputFile)
if exit_code:
- log.write('Process Exit Code : ' + `exit_code` + '\n')
+ log.write('Process Exit Code : ' + repr(exit_code) + '\n')
finally:
if originalCWD:
@@ -131,8 +131,8 @@ def sendEmail(toaddr, fromaddr, subject,
server.sendmail(fromaddr, toaddr, rawdata)
server.quit()
- except Exception, details:
- print 'Failed to send mail: ' + str(details)
+ except Exception as details:
+ print ('Failed to send mail: ' + str(details))
def writeRunLogEntry(entry):
# Enable a run log
@@ -144,12 +144,12 @@ def writeRunLogEntry(entry):
try:
runlog.write(time.strftime('%d %b %Y %H:%M:%S'))
runlog.write(' : ')
- runlog.write(`os.getpid()`)
+ runlog.write(repr(os.getpid()))
runlog.write(' : ')
runlog.write(entry)
runlog.write('\n')
- except Exception, details:
- print 'Failed to write to runlog : ' + str(details)
+ except Exception as details:
+ print ('Failed to write to runlog : ' + str(details))
finally:
if runlog:
runlog.close()
@@ -180,14 +180,14 @@ def establishLock(lockFile):
writeRunLogEntry('False Start. The lock file [%s] exists%s' % \
(lockFile, info))
- print """The lock file [%s] exists%s.
+ print ("""The lock file [%s] exists%s.
Either Gump is still running, or it terminated very abnormally.
Please resolve this (waiting or removing the lock file) before retrying.
- """ % (lockFile, info)
+ """ % (lockFile, info))
sys.exit(1)
# Leave a mark...
- lock.write(`os.getpid()`)
+ lock.write(repr(os.getpid()))
lock.flush()
return lock
@@ -239,8 +239,8 @@ def tailFile(file, lines, _eol = None, _
finally:
if o:
o.close()
- except Exception, details:
- print 'Failed to tail :' + file + ' : ' + str(details)
+ except Exception as details:
+ print ('Failed to tail :' + file + ' : ' + str(details))
return taillines
@@ -317,10 +317,10 @@ def doRun():
log.write('- GUMP run @ UTC : ' + \
time.strftime('%d %b %Y %H:%M:%S',
time.gmtime()) + '\n')
- log.write('- GUMP run by Python : ' + `sys.version` + '\n')
- log.write('- GUMP run by Python : ' + `sys.executable` + '\n')
+ log.write('- GUMP run by Python : ' + repr(sys.version) + '\n')
+ log.write('- GUMP run by Python : ' + repr(sys.executable) + '\n')
log.write('- GUMP run by Gump : ' + GUMP_VERSION + '\n')
- log.write('- GUMP run on OS : ' + `os.name` + '\n')
+ log.write('- GUMP run on OS : ' + repr(os.name) + '\n')
log.write('- GUMP run in env : \n')
for envkey in os.environ.keys():
@@ -365,7 +365,7 @@ def doRun():
# LSD: this is kinda lame way to parse this
# better to just validate against a DTD
raise RuntimeError('Need one (only) <workspace> tag. Found ' + \
- ` workspaceElementList.length` + '.')
+ repr( workspaceElementList.length) + '.')
wsw = workspaceElementList.item(0)
wsName = wsw.getAttribute('name')
# Extract the base directory
@@ -498,7 +498,7 @@ def doRun():
catFile(publishedLog, logFile, logTitle)
publishedLog.close()
published = True
- except Exception, details:
+ except Exception as details:
print 'Failed to publish log file. ', str(details)
published = False
else:
@@ -557,7 +557,7 @@ def doRun():
else:
print 'Unable to mail failure report : ' + \
- `[mailserver, mailport, mailto, mailfrom]`
+ repr([mailserver, mailport, mailto, mailfrom])
writeRunLogEntry('Complete [%s svn:%s, run:%s]' % \
Re: svn commit: r1883928 - /gump/live/cron/gump.py
Posted by Mark Thomas <ma...@apache.org>.
On 29/11/2020 09:53, markt@apache.org wrote:
> Author: markt
> Date: Sun Nov 29 09:53:32 2020
> New Revision: 1883928
>
> URL: http://svn.apache.org/viewvc?rev=1883928&view=rev
> Log:
> Convert for python3
>
> Modified:
> gump/live/cron/gump.py
Grr. Just realised Puppet is running in the background and changing the
svn checkout. I've turned Puppet off and I'll get this fixed.
Mark
>
> Modified: gump/live/cron/gump.py
> URL: http://svn.apache.org/viewvc/gump/live/cron/gump.py?rev=1883928&r1=1883927&r2=1883928&view=diff
> ==============================================================================
> --- gump/live/cron/gump.py (original)
> +++ gump/live/cron/gump.py Sun Nov 29 09:53:32 2020
> @@ -56,7 +56,7 @@ def runCommand(command, args = '', dir =
> if not os.path.exists(cwdpath):
> os.makedirs(dir)
> os.chdir(cwdpath)
> - except Exception, details :
> + except Exception as details :
> # Log the problem and re-raise
> log.write('Failed to create/change CWD [' + cwdpath + \
> ']. Details: ' + str(details) + '\n')
> @@ -97,7 +97,7 @@ def runCommand(command, args = '', dir =
> os.remove(outputFile)
>
> if exit_code:
> - log.write('Process Exit Code : ' + `exit_code` + '\n')
> + log.write('Process Exit Code : ' + repr(exit_code) + '\n')
>
> finally:
> if originalCWD:
> @@ -131,8 +131,8 @@ def sendEmail(toaddr, fromaddr, subject,
> server.sendmail(fromaddr, toaddr, rawdata)
> server.quit()
>
> - except Exception, details:
> - print 'Failed to send mail: ' + str(details)
> + except Exception as details:
> + print ('Failed to send mail: ' + str(details))
>
> def writeRunLogEntry(entry):
> # Enable a run log
> @@ -144,12 +144,12 @@ def writeRunLogEntry(entry):
> try:
> runlog.write(time.strftime('%d %b %Y %H:%M:%S'))
> runlog.write(' : ')
> - runlog.write(`os.getpid()`)
> + runlog.write(repr(os.getpid()))
> runlog.write(' : ')
> runlog.write(entry)
> runlog.write('\n')
> - except Exception, details:
> - print 'Failed to write to runlog : ' + str(details)
> + except Exception as details:
> + print ('Failed to write to runlog : ' + str(details))
> finally:
> if runlog:
> runlog.close()
> @@ -180,14 +180,14 @@ def establishLock(lockFile):
> writeRunLogEntry('False Start. The lock file [%s] exists%s' % \
> (lockFile, info))
>
> - print """The lock file [%s] exists%s.
> + print ("""The lock file [%s] exists%s.
> Either Gump is still running, or it terminated very abnormally.
> Please resolve this (waiting or removing the lock file) before retrying.
> - """ % (lockFile, info)
> + """ % (lockFile, info))
> sys.exit(1)
>
> # Leave a mark...
> - lock.write(`os.getpid()`)
> + lock.write(repr(os.getpid()))
> lock.flush()
>
> return lock
> @@ -239,8 +239,8 @@ def tailFile(file, lines, _eol = None, _
> finally:
> if o:
> o.close()
> - except Exception, details:
> - print 'Failed to tail :' + file + ' : ' + str(details)
> + except Exception as details:
> + print ('Failed to tail :' + file + ' : ' + str(details))
>
> return taillines
>
> @@ -317,10 +317,10 @@ def doRun():
> log.write('- GUMP run @ UTC : ' + \
> time.strftime('%d %b %Y %H:%M:%S',
> time.gmtime()) + '\n')
> - log.write('- GUMP run by Python : ' + `sys.version` + '\n')
> - log.write('- GUMP run by Python : ' + `sys.executable` + '\n')
> + log.write('- GUMP run by Python : ' + repr(sys.version) + '\n')
> + log.write('- GUMP run by Python : ' + repr(sys.executable) + '\n')
> log.write('- GUMP run by Gump : ' + GUMP_VERSION + '\n')
> - log.write('- GUMP run on OS : ' + `os.name` + '\n')
> + log.write('- GUMP run on OS : ' + repr(os.name) + '\n')
> log.write('- GUMP run in env : \n')
>
> for envkey in os.environ.keys():
> @@ -365,7 +365,7 @@ def doRun():
> # LSD: this is kinda lame way to parse this
> # better to just validate against a DTD
> raise RuntimeError('Need one (only) <workspace> tag. Found ' + \
> - ` workspaceElementList.length` + '.')
> + repr( workspaceElementList.length) + '.')
> wsw = workspaceElementList.item(0)
> wsName = wsw.getAttribute('name')
> # Extract the base directory
> @@ -498,7 +498,7 @@ def doRun():
> catFile(publishedLog, logFile, logTitle)
> publishedLog.close()
> published = True
> - except Exception, details:
> + except Exception as details:
> print 'Failed to publish log file. ', str(details)
> published = False
> else:
> @@ -557,7 +557,7 @@ def doRun():
>
> else:
> print 'Unable to mail failure report : ' + \
> - `[mailserver, mailport, mailto, mailfrom]`
> + repr([mailserver, mailport, mailto, mailfrom])
>
>
> writeRunLogEntry('Complete [%s svn:%s, run:%s]' % \
>
>