summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2017-02-22 00:29:24 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2017-02-22 00:29:24 +0900
commit675b5f4237a3482f298ecfe13291660fee37e26d (patch)
tree39a93096d9d4d68a3e6d90a6d5f0a05ecc1b338f /sphinx/directives/code.py
parent3eb5b2960a90583ffc3173cd981fadfd678f5500 (diff)
downloadsphinx-git-675b5f4237a3482f298ecfe13291660fee37e26d.tar.gz
literalinclude directive allows combination of :pyobject: and :lines:
Diffstat (limited to 'sphinx/directives/code.py')
-rw-r--r--sphinx/directives/code.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index dc855e83d..bbe323391 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -170,7 +170,6 @@ class CodeBlock(Directive):
class LiteralIncludeReader(object):
INVALID_OPTIONS_PAIR = [
- ('pyobject', 'lines'),
('lineno-match', 'lineno-start'),
('lineno-match', 'append'),
('lineno-match', 'prepend'),