Skip to content

Commit 3dc71aa

Browse files
author
Dan
committed
Updated sphinx min version and default theme. Added exit code to output representation. Updated docstrings
1 parent 2033adf commit 3dc71aa

File tree

4 files changed

+124
-60
lines changed

4 files changed

+124
-60
lines changed

doc/conf.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@
2525
# -- General configuration ------------------------------------------------
2626

2727
# If your documentation needs a minimal Sphinx version, state it here.
28-
#needs_sphinx = '1.0'
28+
needs_sphinx = '1.3'
2929

3030
# Add any Sphinx extension module names here, as strings. They can be
3131
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
3232
# ones.
3333
extensions = [
3434
'sphinx.ext.autodoc',
3535
'sphinx.ext.intersphinx',
36+
'sphinx.ext.autosummary',
37+
'sphinx.ext.coverage',
3638
# 'sphinx.ext.viewcode',
3739
]
3840

@@ -58,7 +60,7 @@
5860

5961
# General information about the project.
6062
project = u'Parallel-SSH'
61-
copyright = u'2015-, P Kittenis'
63+
copyright = u'2014-2017, P Kittenis'
6264

6365
# The version info for the project you're documenting, acts as replacement for
6466
# |version| and |release|, also used in various other places throughout the
@@ -112,7 +114,7 @@
112114

113115
# The theme to use for HTML and HTML Help pages. See the documentation for
114116
# a list of builtin themes.
115-
html_theme = 'default'
117+
html_theme = 'sphinx_rtd_theme'
116118

117119
# Theme options are theme-specific and customize the look and feel of a theme
118120
# further. For a list of options available for each theme, see the

pssh/agent.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ def __init__(self):
4646

4747
def add_key(self, key):
4848
"""Add key to agent.
49+
4950
:param key: Key to add
50-
:type key: :mod:`paramiko.pkey.PKey`
51+
:type key: :py:class:`paramiko.pkey.PKey`
5152
"""
5253
self.keys.append(key)
5354

pssh/output.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(self, host, cmd, channel, stdout, stderr, stdin,
4646
:param exit_code: Exit code of command
4747
:type exit_code: int or None
4848
:param exception: Exception from host if any
49-
:type exception: Exception or None
49+
:type exception: :py:class:`Exception` or ``None``
5050
"""
5151
dict.__init__(self, (('host', host), ('cmd', cmd), ('channel', channel),
5252
('stdout', stdout), ('stderr', stderr),
@@ -73,8 +73,10 @@ def update(self, update_dict):
7373

7474
def __repr__(self):
7575
return "{linesep}\thost={host}{linesep}" \
76+
"\texit_code={exit_code}{linesep}" \
7677
"\tcmd={cmd}{linesep}\tchannel={channel}{linesep}" \
7778
"\tstdout={stdout}{linesep}\tstderr={stderr}{linesep}\tstdin={stdin}{linesep}\
7879
\texception={exception}{linesep}".format(
7980
host=self.host, cmd=self.cmd, channel=self.channel, stdout=self.stdout,
80-
stdin=self.stdin, stderr=self.stderr, exception=self.exception, linesep=linesep,)
81+
stdin=self.stdin, stderr=self.stderr, exception=self.exception,
82+
linesep=linesep, exit_code=self.exit_code)

0 commit comments

Comments
 (0)