summaryrefslogtreecommitdiff
path: root/sphinx/builders/html.py
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2013-01-15 14:16:16 +0900
committershimizukawa <shimizukawa@gmail.com>2013-01-15 14:16:16 +0900
commitaf5fcda7d72a6e706575878c3bb92d31ab3e7c39 (patch)
tree5e49511e1d101fdee09e0a870475f5516d276f49 /sphinx/builders/html.py
parent5cd280b342b3b7e472be2013ec1e62810ccb1b80 (diff)
downloadsphinx-af5fcda7d72a6e706575878c3bb92d31ab3e7c39.tar.gz
fix: output all html every time with python3.3.
Sphinx detect config changing by hash(str(cfgdict)). In python3.3, str(dict_instance) retun another string per process.
Diffstat (limited to 'sphinx/builders/html.py')
-rw-r--r--sphinx/builders/html.py22
1 files changed, 19 insertions, 3 deletions
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 573bb9b2..1d1dfa79 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -53,6 +53,23 @@ INVENTORY_FILENAME = 'objects.inv'
LAST_BUILD_FILENAME = 'last_build'
+def get_object_hash(obj):
+ """
+ In python3.3, unicode(dict_instance) retun another string per process.
+ get_object_hash(dict_instance) return same hash for same dict_instance.
+ """
+ if isinstance(obj, dict):
+ return get_object_hash(list(obj.items()))
+
+ elif isinstance(obj, (list, tuple)):
+ obj = sorted(get_object_hash(o) for o in obj)
+
+ else: # int or other objects
+ pass
+
+ return md5(unicode(obj).encode('utf8')).hexdigest()
+
+
class StandaloneHTMLBuilder(Builder):
"""
Builds standalone HTML docs.
@@ -156,9 +173,8 @@ class StandaloneHTMLBuilder(Builder):
cfgdict = dict((name, self.config[name])
for (name, desc) in self.config.values.iteritems()
if desc[1] == 'html')
- self.config_hash = md5(unicode(cfgdict).encode('utf-8')).hexdigest()
- self.tags_hash = md5(unicode(sorted(self.tags)).encode('utf-8')) \
- .hexdigest()
+ self.config_hash = get_object_hash(cfgdict)
+ self.tags_hash = get_object_hash(sorted(self.tags))
old_config_hash = old_tags_hash = ''
try:
fp = open(path.join(self.outdir, '.buildinfo'))