Skip to content

Commit

Permalink
Added documentation about model serializing
Browse files Browse the repository at this point in the history
  • Loading branch information
Relrin committed Nov 30, 2016
1 parent 09d6578 commit 1f693ba
Show file tree
Hide file tree
Showing 5 changed files with 329 additions and 31 deletions.
16 changes: 8 additions & 8 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ Project Leader:

- Valeryi Savich <relrin78@gmail.com>

Contributors of code for aiorest-ws are:
Contributors:

- Dmitry Vechorko <vechorkodima@gmail.com>

The serializers, field classes and exception style was taken from the Django
REST Framework. The original code is BSD licensed. The following copyrights
apply:
The serializers, field, exception classes and documentation for them was
taken from the Django REST Framework. The original code is BSD licensed. The
following copyrights apply:

- (c) 2015 Tom Christie
- (c) 2016 Tom Christie

The to_xml() function was taken from the django-rest-framework-xml module.
The original code is BSD licensed with the following copyrights from that
Expand All @@ -24,21 +24,21 @@ module:
The routing classes and URL parser code originally placed in aiohttp library.
The original code is Apache 2.0 licensed. The following copyrights apply:

- (c) 2015 Andrew Svetlov <andrew.svetlov@gmail.com>
- (c) 2016 Andrew Svetlov <andrew.svetlov@gmail.com>

The View, MethodViewMeta, MethodBasedView classes are partly modified,
and the base implementation was taken from the Flask project (views module).
The original code is BSD licensed with the following copyrights from
that module:

- (c) 2015 Armin Ronacher <armin.ronacher@active-4.com>
- (c) 2016 Armin Ronacher <armin.ronacher@active-4.com>

The idea for the "global" settings with further overriding, some util modules
for processing requests and accessing to fields was taken from the Django
Framework. The original code is BSD licensed with the following copyrights
from that module:

- (c) 2015 Django Software Foundation
- (c) 2016 Django Software Foundation

The nice_repr (renamed to humanize_timedelta), iso8601_repr and parse
(renamed to parse_timedelta) functions for processing timedelta objects and
Expand Down
2 changes: 1 addition & 1 deletion aiorest_ws/db/orm/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from aiorest_ws.exceptions import ImproperlyConfigured
from aiorest_ws.db.orm.abstract import AbstractSerializer, AbstractField, \
empty, SkipField
from aiorest_ws.db.orm.fields import HiddenField
from aiorest_ws.db.orm.fields import * # NOQA
from aiorest_ws.db.orm.exceptions import ValidationError
from aiorest_ws.utils.fields import set_value, get_attribute
from aiorest_ws.utils.functional import cached_property
Expand Down
3 changes: 1 addition & 2 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ Client example (Python):
from autobahn.asyncio.websocket import WebSocketClientProtocol, \
WebSocketClientFactory
class HelloClientProtocol(WebSocketClientProtocol):
def onOpen(self):
Expand Down Expand Up @@ -157,7 +156,7 @@ Contents:
---------

.. toctree::
:maxdepth: 3
:maxdepth: 4

auth
app
Expand Down
Loading

0 comments on commit 1f693ba

Please sign in to comment.