From: Maximilian Albert <maximilian.albert@gmail.com>
Date: Sun, 12 Jul 2009 03:22:16 +0000 (+0900)
Subject: Use hashlib instead of deprecated md5 module if Python >= 2.5 is present
X-Git-Tag: release/2.12.3-1~71
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bf1b36a23237987786395546a0289f58dbb1e53e;hp=8ecc147c9397499e09b0a6d52c897645a5e4b001;p=lilypond.git

Use hashlib instead of deprecated md5 module if Python >= 2.5 is present
(cherry picked from commit 5ae228386f748633b7f66375852fd52d52822ab4)
---

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index c2e1a97c8d..e1d1824d75 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -29,7 +29,6 @@ TODO:
 '''
 
 import glob
-import md5
 import os
 import re
 import stat
@@ -1234,7 +1233,13 @@ class LilypondSnippet (Snippet):
 
     def get_checksum (self):
         if not self.checksum:
-            hash = md5.md5 (self.relevant_contents (self.full_ly ()))
+            # Work-around for md5 module deprecation warning in python 2.5+:
+            try: 
+                from hashlib import md5
+            except ImportError:
+                from md5 import md5
+
+            hash = md5 (self.relevant_contents (self.full_ly ()))
 
             ## let's not create too long names.
             self.checksum = hash.hexdigest ()[:10]