Branch: refs/heads/master
Home: https://github.com/django/django
Commit: 865cd35c9b357e20994f6c6a51f2ae000ba0a3ee
https://github.com/django/django/commit/865cd35c9b357e20994f6c6a51f2ae000ba0a3ee
Author: Claude Paroz <cla...@2xlibre.net>
Date: 2012-05-05 (Sat, 05 May 2012)
Changed paths:
M django/bin/unique-messages.py
M django/contrib/gis/db/backends/spatialite/creation.py
M django/contrib/gis/geos/factory.py
M django/contrib/sessions/backends/file.py
M django/core/cache/backends/filebased.py
M django/core/files/locks.py
M django/core/files/move.py
M django/core/mail/message.py
M django/core/management/commands/compilemessages.py
M django/core/management/commands/makemessages.py
M django/core/management/sql.py
M django/core/servers/fastcgi.py
M django/template/defaulttags.py
M django/template/loaders/app_directories.py
M django/template/loaders/filesystem.py
M django/test/_doctest.py
M django/utils/feedgenerator.py
M django/views/debug.py
M docs/_ext/applyxrefs.py
M docs/_ext/djangodocs.py
M docs/_ext/literals_to_xrefs.py
M docs/ref/utils.txt
M docs/topics/http/file-uploads.txt
M docs/topics/serialization.txt
M docs/topics/testing.txt
M extras/csrf_migration_helper.py
M tests/modeltests/model_forms/tests.py
M tests/regressiontests/admin_scripts/tests.py
M tests/regressiontests/bug639/tests.py
M tests/regressiontests/file_uploads/tests.py
M tests/regressiontests/mail/tests.py
M tests/regressiontests/views/tests/static.py
M tests/runtests.py
Log Message:
-----------
Made more extensive usage of context managers with open.
diff --git a/django/bin/unique-messages.py b/django/bin/unique-messages.py
index fbc74f8..d893291 100755
--- a/django/bin/unique-messages.py
+++ b/django/bin/unique-messages.py
@@ -22,7 +22,8 @@ def unique_messages():
cmd = 'msguniq "%s.po"' % pf
stdout = os.popen(cmd)
msg = stdout.read()
- open('%s.po' % pf, 'w').write(msg)
+ with open('%s.po' % pf, 'w') as fp:
+ fp.write(msg)
if __name__ == "__main__":
unique_messages()
diff --git a/django/contrib/gis/db/backends/spatialite/creation.py
b/django/contrib/gis/db/backends/spatialite/creation.py
index aab03e8..7efab3e 100644
--- a/django/contrib/gis/db/backends/spatialite/creation.py
+++ b/django/contrib/gis/db/backends/spatialite/creation.py
@@ -120,12 +120,9 @@ def load_spatialite_sql(self):
# Opening up the SpatiaLite SQL initialization file and executing
# as a script.
- sql_fh = open(spatialite_sql, 'r')
- try:
+ with open(spatialite_sql, 'r') as sql_fh:
cur = self.connection._cursor()
cur.executescript(sql_fh.read())
- finally:
- sql_fh.close()
def spatialite_init_file(self):
# SPATIALITE_SQL may be placed in settings to tell GeoDjango
diff --git a/django/contrib/gis/geos/factory.py
b/django/contrib/gis/geos/factory.py
index df29976..ee33f14 100644
--- a/django/contrib/gis/geos/factory.py
+++ b/django/contrib/gis/geos/factory.py
@@ -7,10 +7,10 @@ def fromfile(file_h):
"""
# If given a file name, get a real handle.
if isinstance(file_h, basestring):
- file_h = open(file_h, 'rb')
-
- # Reading in the file's contents,
- buf = file_h.read()
+ with open(file_h, 'rb') as file_h:
+ buf = file_h.read()
+ else:
+ buf = file_h.read()
# If we get WKB need to wrap in buffer(), so run through regexes.
if wkt_regex.match(buf) or hex_regex.match(buf):
diff --git a/django/contrib/sessions/backends/file.py
b/django/contrib/sessions/backends/file.py
index cb81534..0f86908 100644
--- a/django/contrib/sessions/backends/file.py
+++ b/django/contrib/sessions/backends/file.py
@@ -47,18 +47,15 @@ def _key_to_file(self, session_key=None):
def load(self):
session_data = {}
try:
- session_file = open(self._key_to_file(), "rb")
- try:
+ with open(self._key_to_file(), "rb") as session_file:
file_data = session_file.read()
- # Don't fail if there is no data in the session file.
- # We may have opened the empty placeholder file.
- if file_data:
- try:
- session_data = self.decode(file_data)
- except (EOFError, SuspiciousOperation):
- self.create()
- finally:
- session_file.close()
+ # Don't fail if there is no data in the session file.
+ # We may have opened the empty placeholder file.
+ if file_data:
+ try:
+ session_data = self.decode(file_data)
+ except (EOFError, SuspiciousOperation):
+ self.create()
except IOError:
self.create()
return session_data
diff --git a/django/core/cache/backends/filebased.py
b/django/core/cache/backends/filebased.py
index 57bb63e..7f9f717 100644
--- a/django/core/cache/backends/filebased.py
+++ b/django/core/cache/backends/filebased.py
@@ -31,16 +31,13 @@ def get(self, key, default=None, version=None):
fname = self._key_to_file(key)
try:
- f = open(fname, 'rb')
- try:
+ with open(fname, 'rb') as f:
exp = pickle.load(f)
now = time.time()
if exp < now:
self._delete(fname)
else:
return pickle.load(f)
- finally:
- f.close()
except (IOError, OSError, EOFError, pickle.PickleError):
pass
return default
@@ -61,13 +58,10 @@ def set(self, key, value, timeout=None, version=None):
if not os.path.exists(dirname):
os.makedirs(dirname)
- f = open(fname, 'wb')
- try:
+ with open(fname, 'wb') as f:
now = time.time()
pickle.dump(now + timeout, f, pickle.HIGHEST_PROTOCOL)
pickle.dump(value, f, pickle.HIGHEST_PROTOCOL)
- finally:
- f.close()
except (IOError, OSError):
pass
@@ -94,17 +88,14 @@ def has_key(self, key, version=None):
self.validate_key(key)
fname = self._key_to_file(key)
try:
- f = open(fname, 'rb')
- try:
+ with open(fname, 'rb') as f:
exp = pickle.load(f)
- now = time.time()
- if exp < now:
- self._delete(fname)
- return False
- else:
- return True
- finally:
- f.close()
+ now = time.time()
+ if exp < now:
+ self._delete(fname)
+ return False
+ else:
+ return True
except (IOError, OSError, EOFError, pickle.PickleError):
return False
diff --git a/django/core/files/locks.py b/django/core/files/locks.py
index 7f187ef..e6fec4d 100644
--- a/django/core/files/locks.py
+++ b/django/core/files/locks.py
@@ -9,10 +9,9 @@
Example Usage::
>>> from django.core.files import locks
- >>> f = open('./file', 'wb')
- >>> locks.lock(f, locks.LOCK_EX)
- >>> f.write('Django')
- >>> f.close()
+ >>> with open('./file', 'wb') as f:
+ >>> locks.lock(f, locks.LOCK_EX)
+ >>> f.write('Django')
"""
__all__ = ('LOCK_EX','LOCK_SH','LOCK_NB','lock','unlock')
diff --git a/django/core/files/move.py b/django/core/files/move.py
index 4778228..f9060fd 100644
--- a/django/core/files/move.py
+++ b/django/core/files/move.py
@@ -59,8 +59,7 @@ def file_move_safe(old_file_name, new_file_name, chunk_size =
1024*64, allow_ove
pass
# first open the old file, so that it won't go away
- old_file = open(old_file_name, 'rb')
- try:
+ with open(old_file_name, 'rb') as old_file:
# now open the new file, not forgetting allow_overwrite
fd = os.open(new_file_name, os.O_WRONLY | os.O_CREAT | getattr(os,
'O_BINARY', 0) |
(not allow_overwrite and os.O_EXCL or 0))
@@ -73,8 +72,6 @@ def file_move_safe(old_file_name, new_file_name, chunk_size =
1024*64, allow_ove
finally:
locks.unlock(fd)
os.close(fd)
- finally:
- old_file.close()
copystat(old_file_name, new_file_name)
try:
diff --git a/django/core/mail/message.py b/django/core/mail/message.py
index 7347391..a01832c 100644
--- a/django/core/mail/message.py
+++ b/django/core/mail/message.py
@@ -265,7 +265,8 @@ def attach(self, filename=None, content=None,
mimetype=None):
def attach_file(self, path, mimetype=None):
"""Attaches a file from the filesystem."""
filename = os.path.basename(path)
- content = open(path, 'rb').read()
+ with open(path, 'rb') as f:
+ content = f.read()
self.attach(filename, content, mimetype)
def _create_message(self, msg):
diff --git a/django/core/management/commands/compilemessages.py
b/django/core/management/commands/compilemessages.py
index 4118fd0..354787e 100644
--- a/django/core/management/commands/compilemessages.py
+++ b/django/core/management/commands/compilemessages.py
@@ -5,8 +5,8 @@
from django.core.management.base import BaseCommand, CommandError
def has_bom(fn):
- f = open(fn, 'r')
- sample = f.read(4)
+ with open(fn, 'r') as f:
+ sample = f.read(4)
return sample[:3] == '\xef\xbb\xbf' or \
sample.startswith(codecs.BOM_UTF16_LE) or \
sample.startswith(codecs.BOM_UTF16_BE)
diff --git a/django/core/management/commands/makemessages.py
b/django/core/management/commands/makemessages.py
index b21cbce..046ffb4 100644
--- a/django/core/management/commands/makemessages.py
+++ b/django/core/management/commands/makemessages.py
@@ -112,7 +112,8 @@ def copy_plural_forms(msgs, locale, domain, verbosity,
stdout=sys.stdout):
for domain in domains:
django_po = os.path.join(django_dir, 'conf', 'locale', locale,
'LC_MESSAGES', '%s.po' % domain)
if os.path.exists(django_po):
- m = plural_forms_re.search(open(django_po, 'rU').read())
+ with open(django_po, 'rU') as fp:
+ m = plural_forms_re.search(fp.read())
if m:
if verbosity > 1:
stdout.write("copying plural forms: %s\n" %
m.group('value'))
@@ -141,11 +142,8 @@ def write_pot_file(potfile, msgs, file, work_file,
is_templatized):
msgs = '\n'.join(dropwhile(len, msgs.split('\n')))
else:
msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8')
- f = open(potfile, 'ab')
- try:
- f.write(msgs)
- finally:
- f.close()
+ with open(potfile, 'ab') as fp:
+ fp.write(msgs)
def process_file(file, dirpath, potfile, domain, verbosity,
extensions, wrap, location, stdout=sys.stdout):
@@ -164,15 +162,13 @@ def process_file(file, dirpath, potfile, domain,
verbosity,
if domain == 'djangojs' and file_ext in extensions:
is_templatized = True
orig_file = os.path.join(dirpath, file)
- src_data = open(orig_file).read()
+ with open(orig_file) as fp:
+ src_data = fp.read()
src_data = prepare_js_for_gettext(src_data)
thefile = '%s.c' % file
work_file = os.path.join(dirpath, thefile)
- f = open(work_file, "w")
- try:
- f.write(src_data)
- finally:
- f.close()
+ with open(work_file, "w") as fp:
+ fp.write(src_data)
cmd = (
'xgettext -d %s -L C %s %s --keyword=gettext_noop '
'--keyword=gettext_lazy --keyword=ngettext_lazy:1,2 '
@@ -184,14 +180,12 @@ def process_file(file, dirpath, potfile, domain,
verbosity,
orig_file = os.path.join(dirpath, file)
is_templatized = file_ext in extensions
if is_templatized:
- src_data = open(orig_file, "rU").read()
+ with open(orig_file, "rU") as fp:
+ src_data = fp.read()
thefile = '%s.py' % file
content = templatize(src_data, orig_file[2:])
- f = open(os.path.join(dirpath, thefile), "w")
- try:
- f.write(content)
- finally:
- f.close()
+ with open(os.path.join(dirpath, thefile), "w") as fp:
+ fp.write(content)
work_file = os.path.join(dirpath, thefile)
cmd = (
'xgettext -d %s -L Python %s %s --keyword=gettext_noop '
@@ -232,11 +226,8 @@ def write_po_file(pofile, potfile, domain, locale,
verbosity, stdout,
os.unlink(potfile)
raise CommandError("errors happened while running msguniq\n%s" %
errors)
if os.path.exists(pofile):
- f = open(potfile, 'w')
- try:
- f.write(msgs)
- finally:
- f.close()
+ with open(potfile, 'w') as fp:
+ fp.write(msgs)
msgs, errors = _popen('msgmerge %s %s -q "%s" "%s"' %
(wrap, location, pofile, potfile))
if errors:
@@ -247,11 +238,8 @@ def write_po_file(pofile, potfile, domain, locale,
verbosity, stdout,
msgs = copy_plural_forms(msgs, locale, domain, verbosity, stdout)
msgs = msgs.replace(
"#. #-#-#-#-# %s.pot (PACKAGE VERSION) #-#-#-#-#\n" % domain, "")
- f = open(pofile, 'wb')
- try:
- f.write(msgs)
- finally:
- f.close()
+ with open(pofile, 'wb') as fp:
+ fp.write(msgs)
os.unlink(potfile)
if no_obsolete:
msgs, errors = _popen('msgattrib %s %s -o "%s" --no-obsolete "%s"' %
diff --git a/django/core/management/sql.py b/django/core/management/sql.py
index 83c17d9..53d9736 100644
--- a/django/core/management/sql.py
+++ b/django/core/management/sql.py
@@ -157,13 +157,12 @@ def custom_sql_for_model(model, style, connection):
os.path.join(app_dir, "%s.sql" % opts.object_name.lower())]
for sql_file in sql_files:
if os.path.exists(sql_file):
- fp = open(sql_file, 'U')
- for statement in
statements.split(fp.read().decode(settings.FILE_CHARSET)):
- # Remove any comments from the file
- statement = re.sub(ur"--.*([\n\Z]|$)", "", statement)
- if statement.strip():
- output.append(statement + u";")
- fp.close()
+ with open(sql_file, 'U') as fp:
+ for statement in
statements.split(fp.read().decode(settings.FILE_CHARSET)):
+ # Remove any comments from the file
+ statement = re.sub(ur"--.*([\n\Z]|$)", "", statement)
+ if statement.strip():
+ output.append(statement + u";")
return output
diff --git a/django/core/servers/fastcgi.py b/django/core/servers/fastcgi.py
index 750bff7..2ae1fa5 100644
--- a/django/core/servers/fastcgi.py
+++ b/django/core/servers/fastcgi.py
@@ -176,9 +176,8 @@ def runfastcgi(argset=[], **kwargs):
become_daemon(our_home_dir=options["workdir"], **daemon_kwargs)
if options["pidfile"]:
- fp = open(options["pidfile"], "w")
- fp.write("%d\n" % os.getpid())
- fp.close()
+ with open(options["pidfile"], "w") as fp:
+ fp.write("%d\n" % os.getpid())
WSGIServer(get_internal_wsgi_application(), **wsgi_opts).run()
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 5644c17..c962380 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -328,9 +328,8 @@ def render(self, context):
else:
return '' # Fail silently for invalid includes.
try:
- fp = open(filepath, 'r')
- output = fp.read()
- fp.close()
+ with open(filepath, 'r') as fp:
+ output = fp.read()
except IOError:
output = ''
if self.parsed:
diff --git a/django/template/loaders/app_directories.py
b/django/template/loaders/app_directories.py
index 1ddb18e..d6b3a17 100644
--- a/django/template/loaders/app_directories.py
+++ b/django/template/loaders/app_directories.py
@@ -52,11 +52,8 @@ def get_template_sources(self, template_name,
template_dirs=None):
def load_template_source(self, template_name, template_dirs=None):
for filepath in self.get_template_sources(template_name,
template_dirs):
try:
- file = open(filepath)
- try:
- return (file.read().decode(settings.FILE_CHARSET),
filepath)
- finally:
- file.close()
+ with open(filepath) as fp:
+ return (fp.read().decode(settings.FILE_CHARSET), filepath)
except IOError:
pass
raise TemplateDoesNotExist(template_name)
diff --git a/django/template/loaders/filesystem.py
b/django/template/loaders/filesystem.py
index 51025ac..8352406 100644
--- a/django/template/loaders/filesystem.py
+++ b/django/template/loaders/filesystem.py
@@ -34,11 +34,8 @@ def load_template_source(self, template_name,
template_dirs=None):
tried = []
for filepath in self.get_template_sources(template_name,
template_dirs):
try:
- file = open(filepath)
- try:
- return (file.read().decode(settings.FILE_CHARSET),
filepath)
- finally:
- file.close()
+ with open(filepath) as fp:
+ return (fp.read().decode(settings.FILE_CHARSET), filepath)
except IOError:
tried.append(filepath)
if tried:
diff --git a/django/test/_doctest.py b/django/test/_doctest.py
index b078293..ab8f034 100644
--- a/django/test/_doctest.py
+++ b/django/test/_doctest.py
@@ -226,7 +226,8 @@ def _load_testfile(filename, package, module_relative):
# get_data() opens files as 'rb', so one must do the equivalent
# conversion as universal newlines would do.
return file_contents.replace(os.linesep, '\n'), filename
- return open(filename).read(), filename
+ with open(filename) as fp:
+ return fp.read(), filename
def _indent(s, indent=4):
"""
@@ -2519,9 +2520,8 @@ def debug_script(src, pm=False, globs=None):
# docs say, a file so created cannot be opened by name a second time
# on modern Windows boxes, and execfile() needs to open it.
srcfilename = tempfile.mktemp(".py", "doctestdebug")
- f = open(srcfilename, 'w')
- f.write(src)
- f.close()
+ with open(srcfilename, 'w') as fp:
+ fp.write(src)
try:
if globs:
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
index 592d787..f4c7318 100644
--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@@ -15,9 +15,8 @@
... link=u"http://www.holovaty.com/test/";,
... description="Testing."
... )
->>> fp = open('test.rss', 'w')
->>> feed.write(fp, 'utf-8')
->>> fp.close()
+>>> with open('test.rss', 'w') as fp:
+>>> feed.write(fp, 'utf-8')
For definitions of the different versions of RSS, see:
http://diveintomark.org/archives/2004/02/04/incompatible-rss
diff --git a/django/views/debug.py b/django/views/debug.py
index 14a151f..418b2ba 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -333,11 +333,8 @@ def _get_lines_from_file(self, filename, lineno,
context_lines, loader=None, mod
source = source.splitlines()
if source is None:
try:
- f = open(filename)
- try:
- source = f.readlines()
- finally:
- f.close()
+ with open(filename) as fp:
+ source = fp.readlines()
except (OSError, IOError):
pass
if source is None:
diff --git a/docs/_ext/applyxrefs.py b/docs/_ext/applyxrefs.py
index 14d18bd..7181480 100644
--- a/docs/_ext/applyxrefs.py
+++ b/docs/_ext/applyxrefs.py
@@ -18,33 +18,18 @@ def process_file(fn, lines):
lines.insert(0, '\n')
lines.insert(0, '.. %s:\n' % target_name(fn))
try:
- f = open(fn, 'w')
+ with open(fn, 'w') as fp:
+ fp.writelines(lines)
except IOError:
print("Can't open %s for writing. Not touching it." % fn)
- return
- try:
- f.writelines(lines)
- except IOError:
- print("Can't write to %s. Not touching it." % fn)
- finally:
- f.close()
def has_target(fn):
try:
- f = open(fn, 'r')
+ with open(fn, 'r') as fp:
+ lines = fp.readlines()
except IOError:
- print("Can't open %s. Not touching it." % fn)
+ print("Can't open or read %s. Not touching it." % fn)
return (True, None)
- readok = True
- try:
- lines = f.readlines()
- except IOError:
- print("Can't read %s. Not touching it." % fn)
- readok = False
- finally:
- f.close()
- if not readok:
- return (True, None)
#print fn, len(lines)
if len(lines) < 1:
@@ -82,7 +67,7 @@ def main(argv=None):
print("Adding xref to %s" % fn)
process_file(fn, lines)
else:
- print "Skipping %s: already has a xref" % fn
+ print("Skipping %s: already has a xref" % fn)
if __name__ == '__main__':
sys.exit(main())
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index d4b0b43..3d85147 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -210,8 +210,7 @@ def finish(self):
if t == "templatefilter" and l ==
"ref/templates/builtins"],
}
outfilename = os.path.join(self.outdir, "templatebuiltins.js")
- f = open(outfilename, 'wb')
- f.write('var django_template_builtins = ')
- json.dump(templatebuiltins, f)
- f.write(';\n')
- f.close();
+ with open(outfilename, 'wb') as fp:
+ fp.write('var django_template_builtins = ')
+ json.dump(templatebuiltins, fp)
+ fp.write(';\n')
diff --git a/docs/_ext/literals_to_xrefs.py b/docs/_ext/literals_to_xrefs.py
index d1487ca..d7b3cfc 100644
--- a/docs/_ext/literals_to_xrefs.py
+++ b/docs/_ext/literals_to_xrefs.py
@@ -38,7 +38,8 @@
]
def fixliterals(fname):
- data = open(fname).read()
+ with open(fname) as fp:
+ data = fp.read()
last = 0
new = []
@@ -101,7 +102,8 @@ def fixliterals(fname):
lastvalues[m.group(1)] = replace_value
new.append(data[last:])
- open(fname, "w").write("".join(new))
+ with open(fname, "w") as fp:
+ fp.write("".join(new))
storage["lastvalues"] = lastvalues
storage.close()
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index 2525690..f045f4b 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -239,9 +239,8 @@ Sample usage::
... link=u"http://www.holovaty.com/test/";,
... description="Testing."
... )
- >>> fp = open('test.rss', 'w')
- >>> feed.write(fp, 'utf-8')
- >>> fp.close()
+ >>> with open('test.rss', 'w') as fp:
+ >>> feed.write(fp, 'utf-8')
For simplifying the selection of a generator use ``feedgenerator.DefaultFeed``
which is currently ``Rss201rev2Feed``
diff --git a/docs/topics/http/file-uploads.txt
b/docs/topics/http/file-uploads.txt
index 1c1ef77..877d3b4 100644
--- a/docs/topics/http/file-uploads.txt
+++ b/docs/topics/http/file-uploads.txt
@@ -101,10 +101,9 @@ objects; see `UploadedFile objects`_ for a complete
reference.
Putting it all together, here's a common way you might handle an uploaded
file::
def handle_uploaded_file(f):
- destination = open('some/file/name.txt', 'wb+')
- for chunk in f.chunks():
- destination.write(chunk)
- destination.close()
+ with open('some/file/name.txt', 'wb+') as destination:
+ for chunk in f.chunks():
+ destination.write(chunk)
Looping over ``UploadedFile.chunks()`` instead of using ``read()`` ensures that
large files don't overwhelm your system's memory.
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index 6bda32d..73239cb 100644
--- a/docs/topics/serialization.txt
+++ b/docs/topics/serialization.txt
@@ -36,8 +36,8 @@ You can also use a serializer object directly::
This is useful if you want to serialize data directly to a file-like object
(which includes an :class:`~django.http.HttpResponse`)::
- out = open("file.xml", "w")
- xml_serializer.serialize(SomeModel.objects.all(), stream=out)
+ with open("file.xml", "w") as out:
+ xml_serializer.serialize(SomeModel.objects.all(), stream=out)
.. note::
diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
index 7287b04..3971958 100644
--- a/docs/topics/testing.txt
+++ b/docs/topics/testing.txt
@@ -770,9 +770,8 @@ arguments at time of construction:
wish to upload as a value. For example::
>>> c = Client()
- >>> f = open('wishlist.doc')
- >>> c.post('/customers/wishes/', {'name': 'fred', 'attachment': f})
- >>> f.close()
+ >>> with open('wishlist.doc') as fp:
+ >>> c.post('/customers/wishes/', {'name': 'fred',
'attachment': fp})
(The name ``attachment`` here is not relevant; use whatever name your
file-processing code expects.)
diff --git a/extras/csrf_migration_helper.py b/extras/csrf_migration_helper.py
index 067580c..62a8fb9 100755
--- a/extras/csrf_migration_helper.py
+++ b/extras/csrf_migration_helper.py
@@ -170,14 +170,13 @@ def content(self):
try:
return self._content
except AttributeError:
- fd = open(self.absolute_filename)
- try:
- content = fd.read().decode(TEMPLATE_ENCODING)
- except UnicodeDecodeError as e:
- message = '%s in %s' % (
- e[4], self.absolute_filename.encode('UTF-8', 'ignore'))
- raise UnicodeDecodeError(*(e.args[:4] + (message,)))
- fd.close()
+ with open(self.absolute_filename) as fd:
+ try:
+ content = fd.read().decode(TEMPLATE_ENCODING)
+ except UnicodeDecodeError as e:
+ message = '%s in %s' % (
+ e[4], self.absolute_filename.encode('UTF-8', 'ignore'))
+ raise UnicodeDecodeError(*(e.args[:4] + (message,)))
self._content = content
return content
content = property(content)
@@ -271,9 +270,8 @@ def get_python_code(paths):
for f in filenames:
if len([True for e in PYTHON_SOURCE_EXTENSIONS if
f.endswith(e)]) > 0:
fn = os.path.join(dirpath, f)
- fd = open(fn)
- content = [l.decode(PYTHON_ENCODING) for l in
fd.readlines()]
- fd.close()
+ with open(fn) as fd:
+ content = [l.decode(PYTHON_ENCODING) for l in
fd.readlines()]
retval.append((fn, content))
return retval
diff --git a/tests/modeltests/model_forms/tests.py
b/tests/modeltests/model_forms/tests.py
index fe20d79..47902f3 100644
--- a/tests/modeltests/model_forms/tests.py
+++ b/tests/modeltests/model_forms/tests.py
@@ -1242,8 +1242,10 @@ def test_image_field(self):
# it comes to validation. This specifically tests that #6302 is fixed
for
# both file fields and image fields.
- image_data = open(os.path.join(os.path.dirname(__file__), "test.png"),
'rb').read()
- image_data2 = open(os.path.join(os.path.dirname(__file__),
"test2.png"), 'rb').read()
+ with open(os.path.join(os.path.dirname(__file__), "test.png"), 'rb')
as fp:
+ image_data = fp.read()
+ with open(os.path.join(os.path.dirname(__file__), "test2.png"), 'rb')
as fp:
+ image_data2 = fp.read()
f = ImageFileForm(
data={'description': u'An image'},
diff --git a/tests/regressiontests/admin_scripts/tests.py
b/tests/regressiontests/admin_scripts/tests.py
index 4c4edbb..98492ff 100644
--- a/tests/regressiontests/admin_scripts/tests.py
+++ b/tests/regressiontests/admin_scripts/tests.py
@@ -27,32 +27,32 @@ def write_settings(self, filename, apps=None, is_dir=False,
sdict=None):
if is_dir:
settings_dir = os.path.join(test_dir, filename)
os.mkdir(settings_dir)
- settings_file = open(os.path.join(settings_dir, '__init__.py'),
'w')
+ settings_file_path = os.path.join(settings_dir, '__init__.py')
else:
- settings_file = open(os.path.join(test_dir, filename), 'w')
- settings_file.write('# Settings file automatically generated by
regressiontests.admin_scripts test case\n')
- exports = [
- 'DATABASES',
- 'ROOT_URLCONF',
- 'SECRET_KEY',
- ]
- for s in exports:
- if hasattr(settings, s):
- o = getattr(settings, s)
- if not isinstance(o, dict):
- o = "'%s'" % o
- settings_file.write("%s = %s\n" % (s, o))
-
- if apps is None:
- apps = ['django.contrib.auth', 'django.contrib.contenttypes',
'regressiontests.admin_scripts']
-
- settings_file.write("INSTALLED_APPS = %s\n" % apps)
-
- if sdict:
- for k, v in sdict.items():
- settings_file.write("%s = %s\n" % (k, v))
-
- settings_file.close()
+ settings_file_path = os.path.join(test_dir, filename)
+
+ with open(settings_file_path, 'w') as settings_file:
+ settings_file.write('# Settings file automatically generated by
regressiontests.admin_scripts test case\n')
+ exports = [
+ 'DATABASES',
+ 'ROOT_URLCONF',
+ 'SECRET_KEY',
+ ]
+ for s in exports:
+ if hasattr(settings, s):
+ o = getattr(settings, s)
+ if not isinstance(o, dict):
+ o = "'%s'" % o
+ settings_file.write("%s = %s\n" % (s, o))
+
+ if apps is None:
+ apps = ['django.contrib.auth', 'django.contrib.contenttypes',
'regressiontests.admin_scripts']
+
+ settings_file.write("INSTALLED_APPS = %s\n" % apps)
+
+ if sdict:
+ for k, v in sdict.items():
+ settings_file.write("%s = %s\n" % (k, v))
def remove_settings(self, filename, is_dir=False):
full_name = os.path.join(test_dir, filename)
@@ -989,13 +989,12 @@ def write_settings_with_import_error(self, filename,
apps=None, is_dir=False, sd
if is_dir:
settings_dir = os.path.join(test_dir, filename)
os.mkdir(settings_dir)
- settings_file = open(os.path.join(settings_dir, '__init__.py'),
'w')
+ settings_file_path = os.path.join(settings_dir, '__init__.py')
else:
- settings_file = open(os.path.join(test_dir, filename), 'w')
- settings_file.write('# Settings file automatically generated by
regressiontests.admin_scripts test case\n')
- settings_file.write('# The next line will cause an import
error:\nimport foo42bar\n')
-
- settings_file.close()
+ settings_file_path = os.path.join(test_dir, filename)
+ with open(settings_file_path, 'w') as settings_file:
+ settings_file.write('# Settings file automatically generated by
regressiontests.admin_scripts test case\n')
+ settings_file.write('# The next line will cause an import
error:\nimport foo42bar\n')
def test_builtin_command(self):
"import error: manage.py builtin commands shows useful diagnostic info
when settings with import errors is provided"
diff --git a/tests/regressiontests/bug639/tests.py
b/tests/regressiontests/bug639/tests.py
index 9d30517..b754769 100644
--- a/tests/regressiontests/bug639/tests.py
+++ b/tests/regressiontests/bug639/tests.py
@@ -24,7 +24,8 @@ def testBug639(self):
"""
# Grab an image for testing.
filename = os.path.join(os.path.dirname(__file__), "test.jpg")
- img = open(filename, "rb").read()
+ with open(filename, "rb") as fp:
+ img = fp.read()
# Fake a POST QueryDict and FILES MultiValueDict.
data = {'title': 'Testing'}
diff --git a/tests/regressiontests/file_uploads/tests.py
b/tests/regressiontests/file_uploads/tests.py
index b9ce3c2..de552d8 100644
--- a/tests/regressiontests/file_uploads/tests.py
+++ b/tests/regressiontests/file_uploads/tests.py
@@ -24,11 +24,12 @@
class FileUploadTests(TestCase):
def test_simple_upload(self):
- post_data = {
- 'name': 'Ringo',
- 'file_field': open(__file__),
- }
- response = self.client.post('/file_uploads/upload/', post_data)
+ with open(__file__) as fp:
+ post_data = {
+ 'name': 'Ringo',
+ 'file_field': fp,
+ }
+ response = self.client.post('/file_uploads/upload/', post_data)
self.assertEqual(response.status_code, 200)
def test_large_upload(self):
@@ -87,17 +88,16 @@ def test_unicode_file_name(self):
tdir = tempfile.gettempdir()
# This file contains chinese symbols and an accented char in the name.
- file1 = open(os.path.join(tdir, UNICODE_FILENAME.encode('utf-8')),
'w+b')
- file1.write('b' * (2 ** 10))
- file1.seek(0)
+ with open(os.path.join(tdir, UNICODE_FILENAME.encode('utf-8')), 'w+b')
as file1:
+ file1.write('b' * (2 ** 10))
+ file1.seek(0)
- post_data = {
- 'file_unicode': file1,
- }
+ post_data = {
+ 'file_unicode': file1,
+ }
- response = self.client.post('/file_uploads/unicode_name/', post_data)
+ response = self.client.post('/file_uploads/unicode_name/',
post_data)
- file1.close()
try:
os.unlink(file1.name)
except:
@@ -294,10 +294,6 @@ def handle_uncaught_exception(self, request, resolver,
exc_info):
p = request.POST
return ret
- post_data = {
- 'name': 'Ringo',
- 'file_field': open(__file__),
- }
# Maybe this is a little more complicated that it needs to be; but if
# the django.test.client.FakePayload.read() implementation changes then
# this test would fail. So we need to know exactly what kind of error
@@ -310,16 +306,21 @@ def handle_uncaught_exception(self, request, resolver,
exc_info):
# install the custom handler that tries to access request.POST
self.client.handler = POSTAccessingHandler()
- try:
- response = self.client.post('/file_uploads/upload_errors/',
post_data)
- except reference_error.__class__ as err:
- self.assertFalse(
- str(err) == str(reference_error),
- "Caught a repeated exception that'll cause an infinite loop in
file uploads."
- )
- except Exception as err:
- # CustomUploadError is the error that should have been raised
- self.assertEqual(err.__class__, uploadhandler.CustomUploadError)
+ with open(__file__) as fp:
+ post_data = {
+ 'name': 'Ringo',
+ 'file_field': fp,
+ }
+ try:
+ response = self.client.post('/file_uploads/upload_errors/',
post_data)
+ except reference_error.__class__ as err:
+ self.assertFalse(
+ str(err) == str(reference_error),
+ "Caught a repeated exception that'll cause an infinite
loop in file uploads."
+ )
+ except Exception as err:
+ # CustomUploadError is the error that should have been raised
+ self.assertEqual(err.__class__,
uploadhandler.CustomUploadError)
def test_filename_case_preservation(self):
"""
@@ -382,8 +383,7 @@ def test_readonly_root(self):
def test_not_a_directory(self):
"""The correct IOError is raised when the upload directory name exists
but isn't a directory"""
# Create a file with the upload directory name
- fd = open(UPLOAD_TO, 'w')
- fd.close()
+ open(UPLOAD_TO, 'w').close()
try:
self.obj.testfile.save('foo.txt', SimpleUploadedFile('foo.txt',
'x'))
except IOError as err:
diff --git a/tests/regressiontests/mail/tests.py
b/tests/regressiontests/mail/tests.py
index ed85918..a4cefd8 100644
--- a/tests/regressiontests/mail/tests.py
+++ b/tests/regressiontests/mail/tests.py
@@ -517,7 +517,8 @@ def flush_mailbox(self):
def get_mailbox_content(self):
messages = []
for filename in os.listdir(self.tmp_dir):
- session = open(os.path.join(self.tmp_dir,
filename)).read().split('\n' + ('-' * 79) + '\n')
+ with open(os.path.join(self.tmp_dir, filename)) as fp:
+ session = fp.read().split('\n' + ('-' * 79) + '\n')
messages.extend(email.message_from_string(m) for m in session if m)
return messages
@@ -528,7 +529,8 @@ def test_file_sessions(self):
connection.send_messages([msg])
self.assertEqual(len(os.listdir(self.tmp_dir)), 1)
- message = email.message_from_file(open(os.path.join(self.tmp_dir,
os.listdir(self.tmp_dir)[0])))
+ with open(os.path.join(self.tmp_dir, os.listdir(self.tmp_dir)[0])) as
fp:
+ message = email.message_from_file(fp)
self.assertEqual(message.get_content_type(), 'text/plain')
self.assertEqual(message.get('subject'), 'Subject')
self.assertEqual(message.get('from'), 'f...@example.com')
diff --git a/tests/regressiontests/views/tests/static.py
b/tests/regressiontests/views/tests/static.py
index 3088a86..6cabf64 100644
--- a/tests/regressiontests/views/tests/static.py
+++ b/tests/regressiontests/views/tests/static.py
@@ -29,7 +29,8 @@ def test_serve(self):
for filename in media_files:
response = self.client.get('/views/%s/%s' % (self.prefix,
filename))
file_path = path.join(media_dir, filename)
- self.assertEqual(open(file_path).read(), response.content)
+ with open(file_path) as fp:
+ self.assertEqual(fp.read(), response.content)
self.assertEqual(len(response.content),
int(response['Content-Length']))
self.assertEqual(mimetypes.guess_type(file_path)[1],
response.get('Content-Encoding', None))
@@ -40,15 +41,15 @@ def test_unknown_mime_type(self):
def test_copes_with_empty_path_component(self):
file_name = 'file.txt'
response = self.client.get('/views/%s//%s' % (self.prefix, file_name))
- file = open(path.join(media_dir, file_name))
- self.assertEqual(file.read(), response.content)
+ with open(path.join(media_dir, file_name)) as fp:
+ self.assertEqual(fp.read(), response.content)
def test_is_modified_since(self):
file_name = 'file.txt'
response = self.client.get('/views/%s/%s' % (self.prefix, file_name),
HTTP_IF_MODIFIED_SINCE='Thu, 1 Jan 1970 00:00:00 GMT')
- file = open(path.join(media_dir, file_name))
- self.assertEqual(file.read(), response.content)
+ with open(path.join(media_dir, file_name)) as fp:
+ self.assertEqual(fp.read(), response.content)
def test_not_modified_since(self):
file_name = 'file.txt'
@@ -70,8 +71,8 @@ def test_invalid_if_modified_since(self):
invalid_date = 'Mon, 28 May 999999999999 28:25:26 GMT'
response = self.client.get('/views/%s/%s' % (self.prefix, file_name),
HTTP_IF_MODIFIED_SINCE=invalid_date)
- file = open(path.join(media_dir, file_name))
- self.assertEqual(file.read(), response.content)
+ with open(path.join(media_dir, file_name)) as fp:
+ self.assertEqual(fp.read(), response.content)
self.assertEqual(len(response.content),
int(response['Content-Length']))
@@ -85,8 +86,8 @@ def test_invalid_if_modified_since2(self):
invalid_date = ': 1291108438, Wed, 20 Oct 2010 14:05:00 GMT'
response = self.client.get('/views/%s/%s' % (self.prefix, file_name),
HTTP_IF_MODIFIED_SINCE=invalid_date)
- file = open(path.join(media_dir, file_name))
- self.assertEqual(file.read(), response.content)
+ with open(path.join(media_dir, file_name)) as fp:
+ self.assertEqual(fp.read(), response.content)
self.assertEqual(len(response.content),
int(response['Content-Length']))
diff --git a/tests/runtests.py b/tests/runtests.py
index f1edc5d..5074412 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -61,6 +61,7 @@ def get_test_modules():
for f in os.listdir(dirpath):
if (f.startswith('__init__') or
f.startswith('.') or
+ f == '__pycache__' or
f.startswith('sql') or
os.path.basename(f) in REGRESSION_SUBDIRS_TO_SKIP):
continue
================================================================
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
