mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-28 09:37:29 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
# HG changeset patch
|
|
# User Rob Reilink <r.reilink@science-applied.nl>
|
|
# Date 1331657734 -3600
|
|
# Node ID 8aba132b1337fc351fe1464f3a4b61f21f55e64e
|
|
# Parent 4a6d33249418befdf587603fc31db58fb863fee4
|
|
fixed encoding for hashing functions for Python 3
|
|
|
|
diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/graphviz.py
|
|
--- a/sphinx/ext/graphviz.py Sat Mar 10 22:24:59 2012 +0100
|
|
+++ b/sphinx/ext/graphviz.py Tue Mar 13 17:55:34 2012 +0100
|
|
@@ -121,9 +121,11 @@
|
|
|
|
def render_dot(self, code, options, format, prefix='graphviz'):
|
|
"""Render graphviz code into a PNG or PDF output file."""
|
|
- hashkey = code.encode('utf-8') + str(options) + \
|
|
+ hashkey = (code + str(options) + \
|
|
str(self.builder.config.graphviz_dot) + \
|
|
str(self.builder.config.graphviz_dot_args)
|
|
+ ).encode('utf-8')
|
|
+
|
|
fname = '%s-%s.%s' % (prefix, sha(hashkey).hexdigest(), format)
|
|
if hasattr(self.builder, 'imgpath'):
|
|
# HTML
|
|
diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/inheritance_diagram.py
|
|
--- a/sphinx/ext/inheritance_diagram.py Sat Mar 10 22:24:59 2012 +0100
|
|
+++ b/sphinx/ext/inheritance_diagram.py Tue Mar 13 17:55:34 2012 +0100
|
|
@@ -39,7 +39,7 @@
|
|
import re
|
|
import sys
|
|
import inspect
|
|
-import __builtin__
|
|
+import __builtin__ as __builtin__ # as __builtin__ is for lib2to3 compatibility
|
|
try:
|
|
from hashlib import md5
|
|
except ImportError:
|
|
@@ -314,7 +314,8 @@
|
|
|
|
|
|
def get_graph_hash(node):
|
|
- return md5(node['content'] + str(node['parts'])).hexdigest()[-10:]
|
|
+ encoded = (node['content'] + str(node['parts'])).encode('utf-8')
|
|
+ return md5(encoded).hexdigest()[-10:]
|
|
|
|
|
|
def html_visit_inheritance_diagram(self, node):
|