diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-01-13 15:56:16 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-01-13 15:56:16 +0900 |
| commit | 38483a5e7975807f605404886b59ae3df0dfa7fb (patch) | |
| tree | 1141c5e553e5afa2c4ce9e02fe8e4b539ea45323 /sphinx/pycode | |
| parent | 7fea402a982807dc3089129193f3d4fc48a0aefd (diff) | |
| download | sphinx-git-38483a5e7975807f605404886b59ae3df0dfa7fb.tar.gz | |
Fix broken code (my wrong...)
Diffstat (limited to 'sphinx/pycode')
| -rw-r--r-- | sphinx/pycode/__init__.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py index 5d59bc310..e11a75941 100644 --- a/sphinx/pycode/__init__.py +++ b/sphinx/pycode/__init__.py @@ -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() |