diff --git a/kallithea/lib/paster_commands/install_iis.py b/kallithea/lib/paster_commands/install_iis.py --- a/kallithea/lib/paster_commands/install_iis.py +++ b/kallithea/lib/paster_commands/install_iis.py @@ -75,7 +75,7 @@ class Command(BasePasterCommand): dispatchfile = os.path.join(os.getcwd(), 'dispatch.py') print 'Writing %s' % dispatchfile - with file(dispatchfile, 'w') as f: + with open(dispatchfile, 'w') as f: f.write(dispath_py_template % { 'inifile': config_file.replace('\\', '\\\\'), 'virtualdir': args.virtualdir, diff --git a/kallithea/tests/models/test_notifications.py b/kallithea/tests/models/test_notifications.py --- a/kallithea/tests/models/test_notifications.py +++ b/kallithea/tests/models/test_notifications.py @@ -283,9 +283,9 @@ class TestNotifications(TestController): outfn = os.path.join(os.path.dirname(__file__), 'test_dump_html_mails.out.html') reffn = os.path.join(os.path.dirname(__file__), 'test_dump_html_mails.ref.html') - with file(outfn, 'w') as f: + with open(outfn, 'w') as f: f.write(out) - with file(reffn) as f: + with open(reffn) as f: ref = f.read() assert ref == out # copy test_dump_html_mails.out.html to test_dump_html_mails.ref.html to update expectations os.unlink(outfn) diff --git a/scripts/docs-headings.py b/scripts/docs-headings.py --- a/scripts/docs-headings.py +++ b/scripts/docs-headings.py @@ -32,7 +32,7 @@ headermatch = re.compile(r'''\n*(.+)\n([ def main(): for fn in subprocess.check_output(['hg', 'loc', 'set:**.rst+kallithea/i18n/how_to']).splitlines(): print 'processing %s:' % fn - s = file(fn).read() + s = open(fn).read() # find levels and their styles lastpos = 0 @@ -71,7 +71,7 @@ def main(): s = s.strip() + '\n' s = re.sub(r'''\n+((?:\.\. _[^\n]*\n)+)$''', r'\n\n\n\1', s) - file(fn, 'w').write(s) + open(fn, 'w').write(s) print subprocess.check_output(['hg', 'diff', fn]) print diff --git a/scripts/generate-ini.py b/scripts/generate-ini.py --- a/scripts/generate-ini.py +++ b/scripts/generate-ini.py @@ -90,12 +90,12 @@ ini_files = [ def main(): # make sure all mako lines starting with '#' (the '##' comments) are marked up as print 'reading:', makofile - mako_org = file(makofile).read() + mako_org = open(makofile).read() mako_no_text_markup = re.sub(r'', '', mako_org) mako_marked_up = re.sub(r'\n(##.*)', r'\n<%text>\1', mako_no_text_markup, flags=re.MULTILINE) if mako_marked_up != mako_org: print 'writing:', makofile - file(makofile, 'w').write(mako_marked_up) + open(makofile, 'w').write(mako_marked_up) # select the right mako conditionals for the other less sophisticated formats def sub_conditionals(m): @@ -149,7 +149,7 @@ def main(): lines = re.sub(r'^([^#\n].*) = ?(.*)', process_line, lines, flags=re.MULTILINE) return sectionname + '\n' + lines ini_lines = re.sub(r'^(\[.*\])\n((?:(?:[^[\n].*)?\n)*)', process_section, ini_lines, flags=re.MULTILINE) - file(fn, 'w').write(ini_lines) + open(fn, 'w').write(ini_lines) if __name__ == '__main__': main() diff --git a/scripts/logformat.py b/scripts/logformat.py --- a/scripts/logformat.py +++ b/scripts/logformat.py @@ -33,7 +33,7 @@ res = [ ] for f in sys.argv[1:]: - s = file(f).read() + s = open(f).read() for r, t in res: s = r.sub(t, s) - file(f, 'w').write(s) + open(f, 'w').write(s) diff --git a/scripts/update-copyrights.py b/scripts/update-copyrights.py --- a/scripts/update-copyrights.py +++ b/scripts/update-copyrights.py @@ -197,10 +197,10 @@ def insert_entries( for name, years in name_years.items()] l.sort(key=sortkey) - with file(filename) as f: + with open(filename) as f: pre, post = re.split(split_re, f.read()) - with file(filename, 'w') as f: + with open(filename, 'w') as f: f.write(pre + ''.join(format_f(years, name) for years, name in l) + post)