From 5cc91993369c33ea090782dba1256cce90140295 Mon Sep 17 00:00:00 2001 From: Miguel Grinberg Date: Tue, 23 Aug 2016 09:09:03 -0700 Subject: [PATCH] minor documentation fixes --- docs/index.rst | 3 +++ socketio/server.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 885cfd0..93a1eab 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -244,6 +244,9 @@ instance includes versions of several of the methods in the :class:`socketio.Server` class that default to the proper namespace when the ``namespace`` argument is not given. +Note: if an event has a handler in a class-based namespace, and also a +decorator-based function handler, the standalone function handler is invoked. + Using a Message Queue --------------------- diff --git a/socketio/server.py b/socketio/server.py index 6250474..65590ac 100644 --- a/socketio/server.py +++ b/socketio/server.py @@ -155,9 +155,9 @@ class Server(object): def register_namespace(self, namespace_handler): """Register a namespace handler object. - :param namespace_handler: A namespace subclass that handles all the - event traffic for a namespace. This method - accepts the class itself, or an instance. + :param namespace_handler: An instance of a :class:`Namespace` + subclass that handles all the event traffic + for a namespace. """ if not isinstance(namespace_handler, namespace.Namespace): raise ValueError('Not a namespace instance')