summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-01-04 23:39:13 +0100
committerGeorg Brandl <georg@python.org>2011-01-04 23:39:13 +0100
commitd714e312146fddbd08a4761deae73ea7f2d3b8c0 (patch)
tree13f87dbe22c870af4974083c2d46f5138676bd48
parent9cb059734c1c552ae5045a459a4a2e211d00070b (diff)
downloadsphinx-d714e312146fddbd08a4761deae73ea7f2d3b8c0.tar.gz
#581: Fix traceback in Python domain for empty cross-reference targets.
-rw-r--r--CHANGES3
-rw-r--r--sphinx/domains/python.py2
-rw-r--r--tests/root/objects.txt3
3 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index ac50bd91..b89665b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
Release 1.0.6 (in development)
==============================
+* #581: Fix traceback in Python domain for empty cross-reference
+ targets.
+
* #283: Fix literal block display issues on Chrome browsers.
* #383, #148: Support sorting a limited range of accented characters
diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index 4c216a43..d2242cdd 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -585,7 +585,7 @@ class PythonDomain(Domain):
name = name[:-2]
if not name:
- return None, None
+ return []
objects = self.data['objects']
matches = []
diff --git a/tests/root/objects.txt b/tests/root/objects.txt
index 7b70b062..0b71761e 100644
--- a/tests/root/objects.txt
+++ b/tests/root/objects.txt
@@ -13,6 +13,9 @@ Testing object descriptions
.. function:: func_with_module
:module: foolib
+Referring to :func:`func with no index <func_noindex>`.
+Referring to :func:`nothing <>`.
+
.. module:: mod
:synopsis: Module synopsis.
:platform: UNIX