Skip to content

Commit 35097e3

Browse files
wrote a more verbose generic doc string for Open Named Session keywords with references to corresponding unnamed Open Session keywords
1 parent 35fdd96 commit 35097e3

1 file changed

Lines changed: 23 additions & 8 deletions

File tree

robottools/library/session/meta.py

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,10 @@ def add_opener(cls, func, close_func=None):
8989
argspec = inspect.getargspec(func)
9090

9191
def open_session(self, *args, **kwargs):
92-
"""Open an unnamed %s.
92+
"""Open an unnamed {singular}.
9393
94-
- Automatically closes active unnamed %s.
94+
This keyword automatically closes
95+
any other currently active unnamed {singular}.
9596
"""
9697
previous = cls.session
9798
active = func(self, *args, **kwargs)
@@ -104,8 +105,8 @@ def open_session(self, *args, **kwargs):
104105
else:
105106
close_func(self, previous)
106107

107-
open_session.__doc__ %= (
108-
cls.meta.verbose_name, cls.meta.plural_verbose_name)
108+
open_session.__doc__ = open_session.__doc__.format(
109+
singular=cls.meta.verbose_name) # , cls.meta.plural_verbose_name)
109110

110111
open_session.argspec = argspec
111112
# Use custom doc string if defined
@@ -114,9 +115,22 @@ def open_session(self, *args, **kwargs):
114115
cls.keywords[keywordname % ''] = open_session
115116

116117
def open_named_session(self, name, *args, **kwargs):
117-
"""Open a named %s.
118+
"""Automatically generated alternative to `Open {singular}`
119+
for opening {plural} with an alias ``name``
120+
that can later be used with `Switch {singular}`.
118121
119-
- Automatically closes active unnamed %s.
122+
The arguments are similar to `Open {singular}`,
123+
except that the alias ``name`` is expected as first argument.
124+
So if `Open {singular}` is called like:
125+
126+
``Open {singular} | argument | ...``
127+
128+
Then `Open Named {singular}` is called like:
129+
130+
``Open Named {singular} | alias | argument | ...``
131+
132+
This keyword also automatically closes
133+
a currently active unnamed {singular}.
120134
"""
121135
previous = cls.session
122136
active = func(self, *args, **kwargs)
@@ -129,8 +143,9 @@ def open_named_session(self, name, *args, **kwargs):
129143
else:
130144
close_func(self, previous)
131145

132-
open_named_session.__doc__ %= (
133-
cls.meta.verbose_name, cls.meta.plural_verbose_name)
146+
open_named_session.__doc__ = open_named_session.__doc__.format(
147+
singular=cls.meta.verbose_name,
148+
plural=cls.meta.plural_verbose_name)
134149

135150
named_argspec = deepcopy(argspec)
136151
named_argspec.args.insert(1, 'name') # (after self)

0 commit comments

Comments
 (0)