[redistricter] r209 committed - fix weird problem generating solution.zip on one python2.5 environment

0 views

Skip to first unread message

redist...@googlecode.com

unread,

Mar 10, 2011, 1:31:28 PM3/10/11

to redistrict...@googlegroups.com

Revision: 209
Author: brian.olson
Date: Thu Mar 10 10:30:51 2011
Log: fix weird problem generating solution.zip on one python2.5 environment
http://code.google.com/p/redistricter/source/detail?r=209

Modified:
/trunk/analyze_submissions.py

=======================================
--- /trunk/analyze_submissions.py Thu Mar 10 09:11:01 2011
+++ /trunk/analyze_submissions.py Thu Mar 10 10:30:51 2011
@@ -681,12 +681,21 @@
solutionzip = os.path.join(sdir, 'solution.zip')
if newerthan(solutioncsvgz, solutionzip):
try:
- solutioncsv = gzip.open(solutioncsvgz, 'rb').read()
+ zin = gzip.open(solutioncsvgz, 'rb')
+ solutioncsv = zin.read()
+ zin.close()
+ zcsvname = str(cname + '.csv')
+ logging.debug('got %d bytes from %r, to zipfile entry %r',
len(solutioncsv), solutioncsvgz, zcsvname)
oz = zipfile.ZipFile(solutionzip, 'w', zipfile.ZIP_DEFLATED)
- oz.writestr(cname + '.csv', solutioncsv)
+ oz.writestr(zcsvname, solutioncsv)
oz.close()
- except IOError, e:
- logging.error('failed %s -> %s: %s', solutioncsvgz, solutionzip, e)
+ except Exception, e:
+ logging.error('failed %r -> %r: %s', solutioncsvgz, solutionzip,
traceback.format_exc())
+ if os.path.exists(solutionzip):
+ try:
+ os.unlink(solutionzip)
+ except:
+ pass