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 broken code (my wrong...)

Browse Source
This commit is contained in:
Takeshi KOMIYA 2019-01-13 15:56:16 +09:00
parent 7fea402a98
commit 38483a5e79
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/pycode/__init__.py
View File

@ -49,14 +49,9 @@ class ModuleAnalyzer:
@classmethod
def for_egg(cls, filename, modname):
<<<<<<< HEAD
# type: (str, str) -> ModuleAnalyzer
eggpath, relpath = re.split('(?<=\\.egg)/', filename)
=======
# type: (unicode, unicode) -> ModuleAnalyzer
SEP = re.escape(path.sep)
eggpath, relpath = re.split('(?<=\\.egg)' + SEP, filename)
>>>>>>> 1.8
try:
with ZipFile(eggpath) as egg:
code = egg.read(relpath).decode()