summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-07 23:42:54 +0100
committerGeorg Brandl <georg@python.org>2010-02-07 23:42:54 +0100
commit59c3a708a6a56b6e2918082820a6c8ef5bf3fa5c (patch)
treea39ffac7574e01aa1e90eab7a170911f5085d22b /sphinx/directives/code.py
parent3d5bb4897f0a9a342674c3524d2cd38c99d41ab4 (diff)
parent24a50977176766ab094b5ece72cc336e457351c9 (diff)
downloadsphinx-git-59c3a708a6a56b6e2918082820a6c8ef5bf3fa5c.tar.gz
merge with 0.6
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 6535bdf56..5f2fd51ef 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -160,9 +160,9 @@ class LiteralInclude(Directive):
use = not startafter
res = []
for line in lines:
- if not use and startafter in line:
+ if not use and startafter and startafter in line:
use = True
- elif use and endbefore in line:
+ elif use and endbefore and endbefore in line:
use = False
break
elif use: