Skip to content

Commit

Permalink
Replace ReferenceError with umongo NoneReferenceError
Browse files Browse the repository at this point in the history
  • Loading branch information
lafrech committed Apr 24, 2020
1 parent f92379a commit 8a3a67f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 6 deletions.
2 changes: 2 additions & 0 deletions umongo/__init__.py
Expand Up @@ -22,6 +22,7 @@
DeleteError,
NotCreatedError,
FieldNotLoadedError,
NoneReferenceError,
UnknownFieldInDBError,
)
from . import fields, validate
Expand Down Expand Up @@ -58,6 +59,7 @@
'DeleteError',
'NotCreatedError',
'FieldNotLoadedError',
'NoneReferenceError',
'UnknownFieldInDBError',

'fields',
Expand Down
4 changes: 4 additions & 0 deletions umongo/exceptions.py
Expand Up @@ -46,5 +46,9 @@ class FieldNotLoadedError(UMongoError):
"""Accessing a field not loaded after partial load"""


class NoneReferenceError(UMongoError):
"""Retrieving a None reference"""


class UnknownFieldInDBError(UMongoError):
"""Data from database contains unknown field"""
6 changes: 4 additions & 2 deletions umongo/frameworks/motor_asyncio.py
Expand Up @@ -9,7 +9,9 @@
from ..document import DocumentImplementation
from ..data_proxy import missing
from ..data_objects import Reference
from ..exceptions import NotCreatedError, UpdateError, ValidationError, DeleteError
from ..exceptions import (
NotCreatedError, UpdateError, DeleteError, ValidationError, NoneReferenceError
)
from ..fields import ReferenceField, ListField, EmbeddedField
from ..query_mapper import map_query

Expand Down Expand Up @@ -356,7 +358,7 @@ def __init__(self, *args, **kwargs):
async def fetch(self, no_data=False, force_reload=False):
if not self._document or force_reload:
if self.pk is None:
raise ReferenceError('Cannot retrieve a None Reference')
raise NoneReferenceError('Cannot retrieve a None Reference')
self._document = await self.document_cls.find_one(self.pk)
if not self._document:
raise ValidationError(self.error_messages['not_found'].format(
Expand Down
6 changes: 4 additions & 2 deletions umongo/frameworks/pymongo.py
Expand Up @@ -6,7 +6,9 @@
from ..document import DocumentImplementation
from ..data_proxy import missing
from ..data_objects import Reference
from ..exceptions import NotCreatedError, UpdateError, DeleteError, ValidationError
from ..exceptions import (
NotCreatedError, UpdateError, DeleteError, ValidationError, NoneReferenceError
)
from ..fields import ReferenceField, ListField, EmbeddedField
from ..query_mapper import map_query

Expand Down Expand Up @@ -291,7 +293,7 @@ def __init__(self, *args, **kwargs):
def fetch(self, no_data=False, force_reload=False):
if not self._document or force_reload:
if self.pk is None:
raise ReferenceError('Cannot retrieve a None Reference')
raise NoneReferenceError('Cannot retrieve a None Reference')
self._document = self.document_cls.find_one(self.pk)
if not self._document:
raise ValidationError(self.error_messages['not_found'].format(
Expand Down
6 changes: 4 additions & 2 deletions umongo/frameworks/txmongo.py
Expand Up @@ -8,7 +8,9 @@
from ..document import DocumentImplementation
from ..data_proxy import missing
from ..data_objects import Reference
from ..exceptions import NotCreatedError, UpdateError, DeleteError, ValidationError
from ..exceptions import (
NotCreatedError, UpdateError, DeleteError, ValidationError, NoneReferenceError
)
from ..fields import ReferenceField, ListField, EmbeddedField
from ..query_mapper import map_query

Expand Down Expand Up @@ -297,7 +299,7 @@ def __init__(self, *args, **kwargs):
def fetch(self, no_data=False, force_reload=False):
if not self._document or force_reload:
if self.pk is None:
raise ReferenceError('Cannot retrieve a None Reference')
raise NoneReferenceError('Cannot retrieve a None Reference')
self._document = yield self.document_cls.find_one(self.pk)
if not self._document:
raise ValidationError(self.error_messages['not_found'].format(
Expand Down

0 comments on commit 8a3a67f

Please sign in to comment.