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 branch 'master' into bytesio

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-09-25 08:29:37 +09:00 committed by GitHub
commit 67e9f87a54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sphinx/builders/applehelp.py
View File

@ -35,13 +35,6 @@ if False:
logger = logging.getLogger(__name__)
# Use plistlib.dump in 3.4 and above
try:
write_plist = plistlib.dump # type: ignore
except AttributeError:
write_plist = plistlib.writePlist
# False access page (used because helpd expects strict XHTML)
access_page_template = '''\
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\
@ -173,7 +166,7 @@ class AppleHelpBuilder(StandaloneHTMLBuilder):
logger.info(bold(__('writing Info.plist... ')), nonl=True)
with open(path.join(contents_dir, 'Info.plist'), 'wb') as f:
write_plist(info_plist, f)
plistlib.dump(info_plist, f) # type: ignore
logger.info(__('done'))
# Copy the icon, if one is supplied

2
sphinx/environment/__init__.py
View File

@ -18,8 +18,6 @@ from copy import copy
from io import BytesIO
from os import path
from six import next
from sphinx import addnodes
from sphinx.deprecation import RemovedInSphinx30Warning, RemovedInSphinx40Warning
from sphinx.environment.adapters.toctree import TocTree

5
sphinx/util/build_phase.py
View File

@ -9,10 +9,7 @@
:license: BSD, see LICENSE for details.
"""
try:
from enum import IntEnum
except ImportError: # py27
IntEnum = object # type: ignore
from enum import IntEnum
class BuildPhase(IntEnum):

8
tests/test_build_applehelp.py
View File

@ -17,12 +17,6 @@ import pytest
from sphinx.testing.path import path
# Use plistlib.load in 3.4 and above
try:
read_plist = plistlib.load
except AttributeError:
read_plist = plistlib.readPlist
def check_structure(outdir):
contentsdir = outdir / 'Contents'
@ -30,7 +24,7 @@ def check_structure(outdir):
assert (contentsdir / 'Info.plist').isfile()
with open(contentsdir / 'Info.plist', 'rb') as f:
plist = read_plist(f)
plist = plistlib.load(f)
assert plist
assert len(plist)
assert plist.get('CFBundleIdentifier', None) == 'org.sphinx-doc.Sphinx.help'