summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-12-30 15:45:02 +0100
committerGeorg Brandl <georg@python.org>2008-12-30 15:45:02 +0100
commitc9d52ded703813ca16c75702bd18b9fcbd2e751d (patch)
treea1967015d2937d9b771ddc9f9139db08b3cf8627 /sphinx/directives/code.py
parent2cfbedc3766a17d9991589f482eadc76e4b3d687 (diff)
downloadsphinx-c9d52ded703813ca16c75702bd18b9fcbd2e751d.tar.gz
Rename "object" to "pyobject" and document it.
Diffstat (limited to 'sphinx/directives/code.py')
-rw-r--r--sphinx/directives/code.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index 7ac9a1c3..cc74566d 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -69,7 +69,7 @@ def literalinclude_directive(name, arguments, options, content, lineno,
fn = path.normpath(path.join(source_dir, rel_fn))
fromline = toline = None
- objectname = options.get('object')
+ objectname = options.get('pyobject')
if objectname is not None:
from sphinx.pycode import ModuleAnalyzer
analyzer = ModuleAnalyzer.for_file(fn, '')
@@ -109,7 +109,7 @@ def literalinclude_directive(name, arguments, options, content, lineno,
literalinclude_directive.options = {'linenos': directives.flag,
'language': directives.unchanged_required,
'encoding': directives.encoding,
- 'object': directives.unchanged_required,
+ 'pyobject': directives.unchanged_required,
#'lines': directives.unchanged_required,
#'start-after': directives.unchanged_required,
#'end-before': directives.unchanged_required,