IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix test_autodoc with Python 3.3, patches by Jon and Takayuki.

Browse Source
This commit is contained in:
Georg Brandl 2012-11-01 17:52:41 +01:00
parent 21d57d3125
commit 72962c99b7
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/ext/autodoc.py
View File

@ -1105,7 +1105,7 @@ class MethodDocumenter(DocstringSignatureMixin, ClassLevelDocumenter):
""" """
objtype = 'method' objtype = 'method'
member_order = 50 member_order = 50
priority = 0 priority = 1 # must be more than FunctionDocumenter
@classmethod @classmethod
def can_document_member(cls, member, membername, isattr, parent): def can_document_member(cls, member, membername, isattr, parent):

13
sphinx/util/__init__.py
View File

@ -197,13 +197,18 @@ def get_module_source(modname):
except Exception, err: except Exception, err:
raise PycodeError('error importing %r' % modname, err) raise PycodeError('error importing %r' % modname, err)
mod = sys.modules[modname] mod = sys.modules[modname]
if hasattr(mod, '__loader__'): filename = getattr(mod, '__file__', None)
loader = getattr(mod, '__loader__', None)
if loader and getattr(loader, 'get_filename', None):
try: try:
source = mod.__loader__.get_source(modname) filename = loader.get_filename(modname)
except Exception, err:
raise PycodeError('error getting filename for %r' % filename, err)
if filename is None and loader:
try:
return 'string', loader.get_source(modname)
except Exception, err: except Exception, err:
raise PycodeError('error getting source for %r' % modname, err) raise PycodeError('error getting source for %r' % modname, err)
return 'string', source
filename = getattr(mod, '__file__', None)
if filename is None: if filename is None:
raise PycodeError('no source found for module %r' % modname) raise PycodeError('no source found for module %r' % modname)
filename = path.normpath(path.abspath(filename)) filename = path.normpath(path.abspath(filename))