Merge remote branch 'upstream/master'

This commit is contained in:
Ross Lawley
2011-05-09 09:01:19 +01:00
3 changed files with 3 additions and 6 deletions

View File

@@ -67,7 +67,7 @@ class Document(BaseDocument):
:param safe: check if the operation succeeded before returning
:param force_insert: only try to create a new document, don't allow
updates of existing documents
:param validate: validates the document; set to ``False`` for skiping
:param validate: validates the document; set to ``False`` to skip.
"""
if validate:
self.validate()

View File

@@ -663,9 +663,6 @@ class GridFSProxy(object):
def close(self):
if self.newfile:
self.newfile.close()
else:
msg = "The close() method is only necessary after calling write()"
warnings.warn(msg)
class FileField(BaseField):