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

Merge pull request #5933 from tk0miya/fix_parse_eggfile_on_windows

Browse Source 
Fix parse eggfile on windows
This commit is contained in:
Takeshi KOMIYA 2019-01-13 15:20:49 +09:00 committed by GitHub
commit 4144f821e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -24,6 +24,7 @@ Bugs fixed
* #5755: C++, fix duplicate declaration error on function templates with constraints * #5755: C++, fix duplicate declaration error on function templates with constraints
in the return type. in the return type.
* C++, parse unary right fold expressions and binary fold expressions. * C++, parse unary right fold expressions and binary fold expressions.
* pycode could not handle egg files on windows
* #5928: KeyError: 'DOCUTILSCONFIG' when running build * #5928: KeyError: 'DOCUTILSCONFIG' when running build
Testing Testing

6
sphinx/pycode/__init__.py
View File

@ -11,6 +11,7 @@
from __future__ import print_function from __future__ import print_function
import re import re
from os import path
from zipfile import ZipFile from zipfile import ZipFile
from six import iteritems, BytesIO, StringIO from six import iteritems, BytesIO, StringIO
@ -45,7 +46,7 @@ class ModuleAnalyzer(object):
obj = cls(f, modname, filename) obj = cls(f, modname, filename)
cls.cache['file', filename] = obj cls.cache['file', filename] = obj
except Exception as err: except Exception as err:
if '.egg/' in filename: if '.egg' + path.sep in filename:
obj = cls.cache['file', filename] = cls.for_egg(filename, modname) obj = cls.cache['file', filename] = cls.for_egg(filename, modname)
else: else:
raise PycodeError('error opening %r' % filename, err) raise PycodeError('error opening %r' % filename, err)
@ -54,7 +55,8 @@ class ModuleAnalyzer(object):
@classmethod @classmethod
def for_egg(cls, filename, modname): def for_egg(cls, filename, modname):
# type: (unicode, unicode) -> ModuleAnalyzer # type: (unicode, unicode) -> ModuleAnalyzer
eggpath, relpath = re.split('(?<=\\.egg)/', filename) SEP = re.escape(path.sep)
eggpath, relpath = re.split('(?<=\\.egg)' + SEP, filename)
try: try:
with ZipFile(eggpath) as egg: with ZipFile(eggpath) as egg:
code = egg.read(relpath).decode('utf-8') code = egg.read(relpath).decode('utf-8')