diff --git a/ietf/iesg/agenda.py b/ietf/iesg/agenda.py index eb0d9f212..91bc76e4e 100644 --- a/ietf/iesg/agenda.py +++ b/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 diff --git a/ietf/ipr/search.py b/ietf/ipr/search.py index 4570b041c..b79147adb 100644 --- a/ietf/ipr/search.py +++ b/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 diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 6a34808e4..272378519 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -401,6 +401,7 @@ def convert_to_pdf(doc_name): return t,tempname = mkstemp() + os.close(t) tempfile = open(tempname, "w") pageend = 0; @@ -431,6 +432,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 +475,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 +515,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 +532,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")