diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-11-16 11:45:57 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-11-16 11:45:57 +0900 |
| commit | 4b5eebdc877759e204aa90435aebcf313a44f6cd (patch) | |
| tree | c240b4ca43ffefc88dda6d3a18ca2a61303aacb4 /sphinx/builders | |
| parent | e5786b888cfce77772f2e11d9f2934b941edbc7d (diff) | |
| parent | 4583c4b0227e425bca7b3c26b80d904a13a9c714 (diff) | |
| download | sphinx-git-4b5eebdc877759e204aa90435aebcf313a44f6cd.tar.gz | |
Merge branch 'stable' into 1.5-release
Diffstat (limited to 'sphinx/builders')
| -rw-r--r-- | sphinx/builders/gettext.py | 1 | ||||
| -rw-r--r-- | sphinx/builders/html.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py index bc74f7177..e118cde99 100644 --- a/sphinx/builders/gettext.py +++ b/sphinx/builders/gettext.py @@ -162,6 +162,7 @@ class LocalTimeZone(tzinfo): def dst(self, dt): return timedelta(0) + ltz = LocalTimeZone() diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py index ef816364e..e13d752d7 100644 --- a/sphinx/builders/html.py +++ b/sphinx/builders/html.py @@ -1177,6 +1177,7 @@ class PickleHTMLBuilder(SerializingHTMLBuilder): globalcontext_filename = 'globalcontext.pickle' searchindex_filename = 'searchindex.pickle' + # compatibility alias WebHTMLBuilder = PickleHTMLBuilder |