Changes between Version 8 and Version 9 of TipAndDoc/project/trac/plugins

Timestamp:

Dec 31, 2010 9:24:07 PM (15 years ago)

Author:

mitty

Comment:

--

TipAndDoc/project/trac/plugins

@@ -30 +30 @@
 /path/to/global/trac/plugins/graphviz-0.7.6dev-py2.6.egg/graphviz/graphviz.py:23: DeprecationWarning: the sha module is deprecated; use the hashlib module instead
 }}}
-   * 以下のようにして修正すればよい(というか警告のママ)
+   * ~~以下のようにして修正すればよい(というか警告のママ)~~
 {{{
 $ svn diff graphvizplugin/
@@ -46 +46 @@
  import sys
 }}}
+     * 上記だけではNG[[br]][[Image(graphviz-error_sha.png, 33%)]]
+   * svn diff 0.11/graphviz/graphviz.py
+{{{
+Index: 0.11/graphviz/graphviz.py
+===================================================================
+--- 0.11/graphviz/graphviz.py   (revision 9708)
++++ 0.11/graphviz/graphviz.py   (working copy)
+@@ -20,7 +20,7 @@
+ import locale
+ import os
+ import re
+-import sha
++import hashlib
+ import subprocess
+ import sys
+
+@@ -310,7 +310,7 @@
+         encoded_cmd = (processor + unicode(self.processor_options)) \
+                 .encode(self.encoding)
+         encoded_content = content.encode(self.encoding)
+-        sha_key  = sha.new(encoded_cmd + encoded_content).hexdigest()
++        sha_key  = hashlib.sha1(encoded_cmd + encoded_content).hexdigest()
+         img_name = '%s.%s.%s' % (sha_key, processor, out_format)
+         # cache: hash.<dot>.<png>
+         img_path = os.path.join(self.cache_dir, img_name)
+}}}