From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Marc - A. Dahlhaus" <mad@wol.de>
Subject: Re: [patch] fix python 2.6 warnings
Date: Tue, 10 Mar 2009 17:49:49 +0100
Message-ID: <49B69A2D.8040008@wol.de>
References: <49B64EC3.4070303@redhat.com>	<18870.23173.605053.102901@mariner.uk.xensource.com>	<49B66EB3.5010405@redhat.com>
	<49B68AAE.76E4.0078.0@novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <49B68AAE.76E4.0078.0@novell.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Jan Beulich <jbeulich@novell.com>
Cc: Jim Fehlig <JFEHLIG@novell.com>, Xen Development Mailing List <xen-devel@lists.xensource.com>, Ian Jackson <Ian.Jackson@eu.citrix.com>, Gerd Hoffmann <kraxel@redhat.com>
List-Id: xen-devel@lists.xenproject.org

Jan Beulich schrieb:
>>>> Gerd Hoffmann <kraxel@redhat.com> 10.03.09 14:44 >>>
>>>>         
>> Which makes me think at least the hashlib one needs a more sophisticated
>> approach so it keeps working on pre-2.5 versions ...
>>     
>
> Something like this (I had hoped this would have been submitted long ago,
> but apparently it wasn't even attempted).
>
> Jan
>
> --- xen-3.3.1-testing.orig/tools/python/xen/util/acmpolicy.py
> +++ xen-3.3.1-testing/tools/python/xen/util/acmpolicy.py
> @@ -17,7 +17,10 @@
>  #============================================================================
>  
>  import os
> -import sha
> +try:
> +    import hashlib # python v2.6 or newer
> +except ImportError:
> +    import sha # python v2.5 or older
>  import stat
>  import array
>  import struct
>
>
>   
hello,

this might work better

-import sha
+try:
+    import sha1 from hashlib # python v2.5 or newer
+except ImportError:
+    import sha as sha1 # pre python v2.5


and call it with: sha1( foo )

Marc