Merge remote branch 'upstream/master'

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

View File

@ -134,8 +134,8 @@ document class as the first argument::
class Page(Document): class Page(Document):
comments = ListField(EmbeddedDocumentField(Comment)) comments = ListField(EmbeddedDocumentField(Comment))
comment1 = Comment('Good work!') comment1 = Comment(content='Good work!')
comment2 = Comment('Nice article!') comment2 = Comment(content='Nice article!')
page = Page(comments=[comment1, comment2]) page = Page(comments=[comment1, comment2])
Dictionary Fields Dictionary Fields

View File

@ -67,7 +67,7 @@ class Document(BaseDocument):
:param safe: check if the operation succeeded before returning :param safe: check if the operation succeeded before returning
:param force_insert: only try to create a new document, don't allow :param force_insert: only try to create a new document, don't allow
updates of existing documents 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: if validate:
self.validate() self.validate()

View File

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