* Fwd: [patch] use hashlib instead of the deprecated md5 module
@ 2009-07-23 14:03 Matthias Klose
2009-07-23 14:37 ` Andrew Haley
0 siblings, 1 reply; 4+ messages in thread
From: Matthias Klose @ 2009-07-23 14:03 UTC (permalink / raw)
To: GCJ-patches
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
should have sent this to java-patches in the first place ...
-------- Original Message --------
Subject: [patch] use hashlib instead of the deprecated md5 module
Date: Thu, 23 Jul 2009 09:53:50 -0400
From: Matthias Klose <doko@ubuntu.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>
use hashlib (if available) instead of the md5 module, which was deprecated in
python2.5. Ok for the trunk and the 4.4 branch?
Matthias
[-- Attachment #2: md5.diff --]
[-- Type: text/plain, Size: 861 bytes --]
2009-07-23 Matthias Klose <doko@ubuntu.com>
* contrib/aotcompile.py.in: Use hashlib instead of md5 if available.
Index: contrib/aotcompile.py.in
===================================================================
--- contrib/aotcompile.py.in (revision 149997)
+++ contrib/aotcompile.py.in (working copy)
@@ -15,7 +15,11 @@
import classfile
import copy
-import md5
+# The md5 module is deprecated in Python 2.5
+try:
+ from hashlib import md5
+except ImportError:
+ from md5 import md5
import operator
import os
import sys
@@ -182,7 +186,7 @@
def addClass(self, bytes, name):
"""Subclasses call this from their __init__ method for
every class they find."""
- digest = md5.new(bytes).digest()
+ digest = md5(bytes).digest()
self.classes[digest] = bytes
self.classnames[digest] = name
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Fwd: [patch] use hashlib instead of the deprecated md5 module
2009-07-23 14:03 Fwd: [patch] use hashlib instead of the deprecated md5 module Matthias Klose
@ 2009-07-23 14:37 ` Andrew Haley
2009-07-23 14:38 ` Andrew Haley
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Haley @ 2009-07-23 14:37 UTC (permalink / raw)
To: Matthias Klose; +Cc: GCJ-patches
On 07/23/2009 04:02 PM, Matthias Klose wrote:
> should have sent this to java-patches in the first place ...
>
> -------- Original Message --------
> Subject: [patch] use hashlib instead of the deprecated md5 module
> Date: Thu, 23 Jul 2009 09:53:50 -0400
> From: Matthias Klose <doko@ubuntu.com>
> To: GCC Patches <gcc-patches@gcc.gnu.org>
>
> use hashlib (if available) instead of the md5 module, which was
> deprecated in
> python2.5. Ok for the trunk and the 4.4 branch?
I see it falls back to using the MD5 module. This is OK.
Andrew.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Fwd: [patch] use hashlib instead of the deprecated md5 module
2009-07-23 14:37 ` Andrew Haley
@ 2009-07-23 14:38 ` Andrew Haley
2009-07-23 14:48 ` Matthias Klose
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Haley @ 2009-07-23 14:38 UTC (permalink / raw)
To: Matthias Klose; +Cc: GCJ-patches
On 07/23/2009 04:37 PM, Andrew Haley wrote:
> On 07/23/2009 04:02 PM, Matthias Klose wrote:
>> should have sent this to java-patches in the first place ...
>>
>> -------- Original Message --------
>> Subject: [patch] use hashlib instead of the deprecated md5 module
>> Date: Thu, 23 Jul 2009 09:53:50 -0400
>> From: Matthias Klose <doko@ubuntu.com>
>> To: GCC Patches <gcc-patches@gcc.gnu.org>
>>
>> use hashlib (if available) instead of the md5 module, which was
>> deprecated in
>> python2.5. Ok for the trunk and the 4.4 branch?
>
> I see it falls back to using the MD5 module. This is OK.
Incidentally, did you test the fallback? Should be OK, but...
Andrew.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Fwd: [patch] use hashlib instead of the deprecated md5 module
2009-07-23 14:38 ` Andrew Haley
@ 2009-07-23 14:48 ` Matthias Klose
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Klose @ 2009-07-23 14:48 UTC (permalink / raw)
To: Andrew Haley; +Cc: GCJ-patches
On 23.07.2009 10:38, Andrew Haley wrote:
> On 07/23/2009 04:37 PM, Andrew Haley wrote:
>> On 07/23/2009 04:02 PM, Matthias Klose wrote:
>>> should have sent this to java-patches in the first place ...
>>>
>>> -------- Original Message --------
>>> Subject: [patch] use hashlib instead of the deprecated md5 module
>>> Date: Thu, 23 Jul 2009 09:53:50 -0400
>>> From: Matthias Klose<doko@ubuntu.com>
>>> To: GCC Patches<gcc-patches@gcc.gnu.org>
>>>
>>> use hashlib (if available) instead of the md5 module, which was
>>> deprecated in
>>> python2.5. Ok for the trunk and the 4.4 branch?
>>
>> I see it falls back to using the MD5 module. This is OK.
>
> Incidentally, did you test the fallback? Should be OK, but...
yes, tested with python2.4
Matthias
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-07-23 14:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-07-23 14:03 Fwd: [patch] use hashlib instead of the deprecated md5 module Matthias Klose
2009-07-23 14:37 ` Andrew Haley
2009-07-23 14:38 ` Andrew Haley
2009-07-23 14:48 ` Matthias Klose
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).