summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-04-17 13:00:19 +0200
committerGeorg Brandl <georg@python.org>2010-04-17 13:00:19 +0200
commit722f9ac329a7a73c6d883b37d7ed888fb4acf453 (patch)
tree36cf252ac492ece127966a47978229da3c18121d /sphinx/ext/autodoc.py
parent64baa69162cfce000a6771288e6731bcb8c67d8b (diff)
parent020410f20be4f77fc5e41b8235fcf22a49bc0155 (diff)
downloadsphinx-git-722f9ac329a7a73c6d883b37d7ed888fb4acf453.tar.gz
merge with trunk
Diffstat (limited to 'sphinx/ext/autodoc.py')
-rw-r--r--sphinx/ext/autodoc.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 359689161..8e5c5ce94 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -841,7 +841,10 @@ class FunctionDocumenter(ModuleLevelDocumenter):
argspec = inspect.getargspec(self.object.__init__)
if argspec[0]:
del argspec[0][0]
- return inspect.formatargspec(*argspec)
+ args = inspect.formatargspec(*argspec)
+ # escape backslashes for reST
+ args = args.replace('\\', '\\\\')
+ return args
def document_members(self, all_members=False):
pass