[Python-modules-commits] [sphinx-paramlinks] 01/05: Import sphinx-paramlinks_0.3.2.orig.tar.gz
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat May 14 16:42:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository sphinx-paramlinks.
commit d2e8975dc017ad993155ded65afe6cdecb811f72
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat May 14 19:25:03 2016 +0300
Import sphinx-paramlinks_0.3.2.orig.tar.gz
---
PKG-INFO | 2 +-
sphinx_paramlinks.egg-info/PKG-INFO | 2 +-
sphinx_paramlinks/__init__.py | 2 +-
sphinx_paramlinks/sphinx_paramlinks.py | 16 +++++++++-------
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index 8e92dfd..ae30991 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: sphinx-paramlinks
-Version: 0.3.1
+Version: 0.3.2
Summary: Allows param links in Sphinx function/method descriptions to be linkable
Home-page: http://bitbucket.org/zzzeek/sphinx-paramlinks
Author: Mike Bayer
diff --git a/sphinx_paramlinks.egg-info/PKG-INFO b/sphinx_paramlinks.egg-info/PKG-INFO
index 8e92dfd..ae30991 100644
--- a/sphinx_paramlinks.egg-info/PKG-INFO
+++ b/sphinx_paramlinks.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: sphinx-paramlinks
-Version: 0.3.1
+Version: 0.3.2
Summary: Allows param links in Sphinx function/method descriptions to be linkable
Home-page: http://bitbucket.org/zzzeek/sphinx-paramlinks
Author: Mike Bayer
diff --git a/sphinx_paramlinks/__init__.py b/sphinx_paramlinks/__init__.py
index 66365ff..4a57c0f 100644
--- a/sphinx_paramlinks/__init__.py
+++ b/sphinx_paramlinks/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '0.3.1'
+__version__ = '0.3.2'
from .sphinx_paramlinks import setup # noqa
diff --git a/sphinx_paramlinks/sphinx_paramlinks.py b/sphinx_paramlinks/sphinx_paramlinks.py
index 073b552..1692dd1 100644
--- a/sphinx_paramlinks/sphinx_paramlinks.py
+++ b/sphinx_paramlinks/sphinx_paramlinks.py
@@ -7,7 +7,8 @@ from sphinx.util.osutil import copyfile
from sphinx.util.console import bold
from sphinx.domains.python import PyXRefRole
from sphinx.domains.python import PythonDomain
-
+from distutils.version import LooseVersion
+from sphinx import __version__
# the searchindex.js system relies upon the object types
# in the PythonDomain to create search entries
from sphinx.domains import ObjType
@@ -49,11 +50,11 @@ def autodoc_process_docstring(app, what, name, obj, options, lines):
def cvt(m):
modifier, objname, paramname = m.group(1) or '', name, m.group(2)
refname = _refname_from_paramname(paramname, strip_markup=True)
- doc_idx.append(
- ('single', '%s (%s parameter)' % (refname, objname),
- '%s.params.%s' % (objname, refname), '')
- )
-
+ item = ('single', '%s (%s parameter)' % (refname, objname),
+ '%s.params.%s' % (objname, refname), '')
+ if LooseVersion(__version__) >= LooseVersion('1.4.0'):
+ item += (None,)
+ doc_idx.append(item)
return ":param %s_sphinx_paramlinks_%s.%s:" % (
modifier, objname, paramname)
return re.sub(r'^:param ([^:]+? )?([^:]+?):', cvt, line)
@@ -221,7 +222,8 @@ def build_index(app, doctree):
doc_entries = entries[docname]
app.env.indexentries[docname].extend(doc_entries)
- for sing, desc, ref, extra in doc_entries:
+ for entry in doc_entries:
+ sing, desc, ref, extra = entry[:4]
app.env.domains['py'].data['objects'][ref] = (docname, 'parameter')
app.env.indexentries.pop('_sphinx_paramlinks_index')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx-paramlinks.git
More information about the Python-modules-commits
mailing list