Fixed several places where files were not being closed. Commit ready for merge.

 - Legacy-Id: 8209

Author: rjsparks

ietf/iesg/agenda.py

@@ -3,6 +3,7 @@
 import codecs
 import datetime
 from collections import OrderedDict
+from contextlib import closing
 
 from django.conf import settings
 from django.http import Http404
@@ -140,7 +141,7 @@ def fill_in_agenda_administrivia(date, sections):
 
     for s, key, filename in extra_info_files:
         try:
-            with codecs.open(filename, 'r', 'utf-8', 'replace') as f:
+            with closing(codecs.open(filename, 'r', 'utf-8', 'replace')) as f:
                 t = f.read().strip()
         except IOError:
             t = u"(Error reading %s)" % filename

ietf/ipr/search.py

@@ -35,7 +35,7 @@ def patent_file_search(url, q):
             #print "*** Found file", fpath            
             file = codecs.open(fpath, mode='r', encoding='utf-8', errors='replace')
             text = file.read()
-            file.close
+            file.close()
             return q in text
     return False
 

ietf/meeting/views.py

@@ -9,6 +9,8 @@
 
 import debug                            # pyflakes:ignore
 
+from contextlib import closing
+
 from django import forms
 from django.shortcuts import render_to_response, redirect
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
@@ -362,7 +364,7 @@ def read_agenda_file(num, doc):
     #  DOC_PATH_FORMAT = { "agenda": "/foo/bar/agenda-{meeting.number}/agenda-{meeting-number}-{doc.group}*", }
     path = os.path.join(settings.AGENDA_PATH, "%s/agenda/%s" % (num, doc.external_url))
     if os.path.exists(path):
-        with open(path) as f:
+        with closing(open(path)) as f:
             return f.read()
     else:
         return None
@@ -401,6 +403,7 @@ def convert_to_pdf(doc_name):
         return
 
     t,tempname = mkstemp()
+    os.close(t)
     tempfile = open(tempname, "w")
 
     pageend = 0;
@@ -431,6 +434,7 @@ def convert_to_pdf(doc_name):
     infile.close()
     tempfile.close()
     t,psname = mkstemp()
+    os.close(t)
     pipe("enscript --margins 76::76: -B -q -p "+psname + " " +tempname)
     os.unlink(tempname)
     pipe("ps2pdf "+psname+" "+outpath)
@@ -473,6 +477,7 @@ def session_draft_tarfile(request, num, session):
     response['Content-Disposition'] = 'attachment; filename=%s-drafts.tgz'%(session)
     tarstream = tarfile.open('','w:gz',response)
     mfh, mfn = mkstemp()
+    os.close(mfh)
     manifest = open(mfn, "w")
 
     for doc_name in drafts:
@@ -512,6 +517,7 @@ def session_draft_pdf(request, num, session):
     drafts = session_draft_list(num, session);
     curr_page = 1
     pmh, pmn = mkstemp()
+    os.close(pmh)
     pdfmarks = open(pmn, "w")
     pdf_list = ""
 
@@ -528,6 +534,7 @@ def session_draft_pdf(request, num, session):
 
     pdfmarks.close()
     pdfh, pdfn = mkstemp()
+    os.close(pdfh)
     pipe("gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=" + pdfn + " " + pdf_list + " " + pmn)
 
     pdf = open(pdfn,"r")