Merge remote branch 'hmarr/v0.4'

Conflicts:
	tests/fields.py
This commit is contained in:
Florian Schlachter 2010-08-30 14:33:04 +02:00
commit 1e1d7073c8
3 changed files with 4 additions and 2 deletions

View File

@ -626,4 +626,4 @@ class GeoPointField(BaseField):
raise ValidationError('Value must be a two-dimensional point.')
if (not isinstance(value[0], (float, int)) and
not isinstance(value[1], (float, int))):
raise ValidationError('Both values in point must be float or int.')
raise ValidationError('Both values in point must be float or int.')

View File

@ -699,7 +699,7 @@ class FieldTest(unittest.TestCase):
Event.drop_collection()
def test_ensure_unique_default_instances(self):
"""Ensure that every field has it's own unique default instance."""
"""Ensure that every document has it's own unique default instance."""
class D(Document):
data = DictField()
data2 = DictField(default=lambda: {})

View File

@ -1314,6 +1314,8 @@ class QTest(unittest.TestCase):
def test_q_with_dbref(self):
"""Ensure Q objects handle DBRefs correctly"""
connect(db='mongoenginetest')
class User(Document):
pass