(Merge 3.4) Tulip issue 83, Python issue #21252: Fill some XXX docstrings in asyncio

This commit is contained in:
Victor Stinner 2014-06-05 12:07:14 +02:00
commit 7088b99eb8
3 changed files with 29 additions and 18 deletions

View File

@ -64,19 +64,19 @@ An event loop policy must implement the following interface:
.. method:: get_event_loop() .. method:: get_event_loop()
Get the event loop for current context. Returns an event loop object Get the event loop for the current context. Returns an event loop object
implementing :class:`BaseEventLoop` interface, or raises an exception in case implementing the :class:`BaseEventLoop` interface, or raises an exception in case
no event loop has been set for the current context and the current policy no event loop has been set for the current context and the current policy
does not specify to create one. It should never return ``None``. does not specify to create one. It should never return ``None``.
.. method:: set_event_loop(loop) .. method:: set_event_loop(loop)
Set the event loop of the current context to *loop*. Set the event loop for the current context to *loop*.
.. method:: new_event_loop() .. method:: new_event_loop()
Create and return a new event loop object according to this policy's rules. Create and return a new event loop object according to this policy's rules.
If there's need to set this loop as the event loop of the current context, If there's need to set this loop as the event loop for the current context,
:meth:`set_event_loop` must be called explicitly. :meth:`set_event_loop` must be called explicitly.
Access to the global loop policy Access to the global loop policy

View File

@ -355,25 +355,33 @@ class AbstractEventLoopPolicy:
"""Abstract policy for accessing the event loop.""" """Abstract policy for accessing the event loop."""
def get_event_loop(self): def get_event_loop(self):
"""XXX""" """Get the event loop for the current context.
Returns an event loop object implementing the BaseEventLoop interface,
or raises an exception in case no event loop has been set for the
current context and the current policy does not specify to create one.
It should never return None."""
raise NotImplementedError raise NotImplementedError
def set_event_loop(self, loop): def set_event_loop(self, loop):
"""XXX""" """Set the event loop for the current context to loop."""
raise NotImplementedError raise NotImplementedError
def new_event_loop(self): def new_event_loop(self):
"""XXX""" """Create and return a new event loop object according to this
policy's rules. If there's need to set this loop as the event loop for
the current context, set_event_loop must be called explicitly."""
raise NotImplementedError raise NotImplementedError
# Child processes handling (Unix only). # Child processes handling (Unix only).
def get_child_watcher(self): def get_child_watcher(self):
"""XXX""" "Get the watcher for child processes."
raise NotImplementedError raise NotImplementedError
def set_child_watcher(self, watcher): def set_child_watcher(self, watcher):
"""XXX""" """Set the watcher for child processes."""
raise NotImplementedError raise NotImplementedError
@ -447,39 +455,42 @@ def _init_event_loop_policy():
def get_event_loop_policy(): def get_event_loop_policy():
"""XXX""" """Get the current event loop policy."""
if _event_loop_policy is None: if _event_loop_policy is None:
_init_event_loop_policy() _init_event_loop_policy()
return _event_loop_policy return _event_loop_policy
def set_event_loop_policy(policy): def set_event_loop_policy(policy):
"""XXX""" """Set the current event loop policy.
If policy is None, the default policy is restored."""
global _event_loop_policy global _event_loop_policy
assert policy is None or isinstance(policy, AbstractEventLoopPolicy) assert policy is None or isinstance(policy, AbstractEventLoopPolicy)
_event_loop_policy = policy _event_loop_policy = policy
def get_event_loop(): def get_event_loop():
"""XXX""" """Equivalent to calling get_event_loop_policy().get_event_loop()."""
return get_event_loop_policy().get_event_loop() return get_event_loop_policy().get_event_loop()
def set_event_loop(loop): def set_event_loop(loop):
"""XXX""" """Equivalent to calling get_event_loop_policy().set_event_loop(loop)."""
get_event_loop_policy().set_event_loop(loop) get_event_loop_policy().set_event_loop(loop)
def new_event_loop(): def new_event_loop():
"""XXX""" """Equivalent to calling get_event_loop_policy().new_event_loop()."""
return get_event_loop_policy().new_event_loop() return get_event_loop_policy().new_event_loop()
def get_child_watcher(): def get_child_watcher():
"""XXX""" """Equivalent to calling get_event_loop_policy().get_child_watcher()."""
return get_event_loop_policy().get_child_watcher() return get_event_loop_policy().get_child_watcher()
def set_child_watcher(watcher): def set_child_watcher(watcher):
"""XXX""" """Equivalent to calling
get_event_loop_policy().set_child_watcher(watcher)."""
return get_event_loop_policy().set_child_watcher(watcher) return get_event_loop_policy().set_child_watcher(watcher)

View File

@ -822,7 +822,7 @@ class _UnixDefaultEventLoopPolicy(events.BaseDefaultEventLoopPolicy):
self._watcher.attach_loop(loop) self._watcher.attach_loop(loop)
def get_child_watcher(self): def get_child_watcher(self):
"""Get the child watcher """Get the watcher for child processes.
If not yet set, a SafeChildWatcher object is automatically created. If not yet set, a SafeChildWatcher object is automatically created.
""" """
@ -832,7 +832,7 @@ class _UnixDefaultEventLoopPolicy(events.BaseDefaultEventLoopPolicy):
return self._watcher return self._watcher
def set_child_watcher(self, watcher): def set_child_watcher(self, watcher):
"""Set the child watcher""" """Set the watcher for child processes."""
assert watcher is None or isinstance(watcher, AbstractChildWatcher) assert watcher is None or isinstance(watcher, AbstractChildWatcher)