summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-04-17 12:57:38 +0200
committerGeorg Brandl <georg@python.org>2010-04-17 12:57:38 +0200
commit020410f20be4f77fc5e41b8235fcf22a49bc0155 (patch)
tree144ea175dd78a06b98dc27c510788a13e34d8f18 /sphinx/ext/autodoc.py
parent138fc5f7bded5b37c4218ce21d56db1a35df43b5 (diff)
parent2c8e51a17b3e99bd9106d589970e412b5b5063af (diff)
downloadsphinx-git-020410f20be4f77fc5e41b8235fcf22a49bc0155.tar.gz
merge with 0.6
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 ca96195eb..020ea522f 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -833,7 +833,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