[patch] fix python 2.6 warnings

[patch] fix python 2.6 warnings

[Gerd Hoffmann]

[-- Attachment #1: Type: text/plain, Size: 92 bytes --]

  Hi,

Attached patch fixes a few python warnings about deprecated modules.

cheers,
  Gerd

[-- Attachment #2: fix.deprecated --]
[-- Type: text/plain, Size: 1496 bytes --]

diff -up xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated xen-3.3.1/tools/python/xen/util/acmpolicy.py
--- xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated	2009-03-09 17:22:39.000000000 +0100
+++ xen-3.3.1/tools/python/xen/util/acmpolicy.py	2009-03-09 17:23:09.000000000 +0100
@@ -17,7 +17,7 @@
 #============================================================================
 
 import os
-import sha
+import hashlib
 import stat
 import array
 import struct
@@ -1103,7 +1103,7 @@ class ACMPolicy(XSPolicy):
 
     def hash(self):
         """ Calculate a SAH1 hash of the XML policy """
-        return sha.sha(self.toxml())
+        return hashlib.sha1(self.toxml())
 
     def save(self):
         ### Save the XML policy into a file ###
diff -up xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated xen-3.3.1/tools/python/xen/xend/XendAPI.py
--- xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated	2009-03-10 11:16:47.000000000 +0100
+++ xen-3.3.1/tools/python/xen/xend/XendAPI.py	2009-03-10 11:17:34.000000000 +0100
@@ -18,7 +18,6 @@
 import inspect
 import os
 import Queue
-import sets
 import string
 import sys
 import traceback
@@ -116,7 +115,7 @@ event_registrations = {}
 def event_register(session, reg_classes):
     if session not in event_registrations:
         event_registrations[session] = {
-            'classes' : sets.Set(),
+            'slasses' : set(),
             'queue'   : Queue.Queue(EVENT_QUEUE_LENGTH),
             'next-id' : 1
             }

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [patch] fix python 2.6 warnings

[Gerd Hoffmann]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

Gerd Hoffmann wrote:
>   Hi,
> 
> Attached patch fixes a few python warnings about deprecated modules.

Oops, that one had a tyops, fixed version attached.

cheers,
  Gerd

[-- Attachment #2: fix.deprecated --]
[-- Type: text/plain, Size: 1496 bytes --]

diff -up xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated xen-3.3.1/tools/python/xen/util/acmpolicy.py
--- xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated	2009-03-09 17:22:39.000000000 +0100
+++ xen-3.3.1/tools/python/xen/util/acmpolicy.py	2009-03-09 17:23:09.000000000 +0100
@@ -17,7 +17,7 @@
 #============================================================================
 
 import os
-import sha
+import hashlib
 import stat
 import array
 import struct
@@ -1103,7 +1103,7 @@ class ACMPolicy(XSPolicy):
 
     def hash(self):
         """ Calculate a SAH1 hash of the XML policy """
-        return sha.sha(self.toxml())
+        return hashlib.sha1(self.toxml())
 
     def save(self):
         ### Save the XML policy into a file ###
diff -up xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated xen-3.3.1/tools/python/xen/xend/XendAPI.py
--- xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated	2009-03-10 11:16:47.000000000 +0100
+++ xen-3.3.1/tools/python/xen/xend/XendAPI.py	2009-03-10 13:13:33.000000000 +0100
@@ -18,7 +18,6 @@
 import inspect
 import os
 import Queue
-import sets
 import string
 import sys
 import traceback
@@ -116,7 +115,7 @@ event_registrations = {}
 def event_register(session, reg_classes):
     if session not in event_registrations:
         event_registrations[session] = {
-            'classes' : sets.Set(),
+            'classes' : set(),
             'queue'   : Queue.Queue(EVENT_QUEUE_LENGTH),
             'next-id' : 1
             }

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [patch] fix python 2.6 warnings

[Ian Jackson]

Gerd Hoffmann writes ("[Xen-devel] [patch] fix python 2.6 warnings"):
> Attached patch fixes a few python warnings about deprecated modules.

Can you please confirm in which Python version the new modules were
introduced ?  Some people (including our automatic test systems!) are
using very old versions of python and it would be nice if that kept
working.

Ian.

Re: [patch] fix python 2.6 warnings

[M A Young]

On Tue, 10 Mar 2009, Gerd Hoffmann wrote:

> Attached patch fixes a few python warnings about deprecated modules.

Do you mean 'slasses'? My knowledge of python isn't great, but that looks 
like a typo.

 	Michael Young

Re: [patch] fix python 2.6 warnings

[Gerd Hoffmann]

Ian Jackson wrote:
> Gerd Hoffmann writes ("[Xen-devel] [patch] fix python 2.6 warnings"):
>> Attached patch fixes a few python warnings about deprecated modules.
> 
> Can you please confirm in which Python version the new modules were
> introduced ?  Some people (including our automatic test systems!) are
> using very old versions of python and it would be nice if that kept
> working.

set type (obsoletes sets module) was added in 2.4
hashlib (obsoletes sha module) was added in 2.5

For reference:  RHEL-5 ships with python 2.4.

Which makes me think at least the hashlib one needs a more sophisticated
approach so it keeps working on pre-2.5 versions ...

cheers,
  Gerd

Re: [patch] fix python 2.6 warnings

[John Levon]

On Tue, Mar 10, 2009 at 02:44:19PM +0100, Gerd Hoffmann wrote:

> > Can you please confirm in which Python version the new modules were
> > introduced ?  Some people (including our automatic test systems!) are
> > using very old versions of python and it would be nice if that kept
> > working.
> 
> set type (obsoletes sets module) was added in 2.4
> hashlib (obsoletes sha module) was added in 2.5

We're using 2.4 too (we have 2.5, and 2.6, but haven't yet done the work
to move versions).

regards
john

Re: [patch] fix python 2.6 warnings

[Jan Beulich]

>>> 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

Re: [patch] fix python 2.6 warnings

[Gerd Hoffmann]

[-- Attachment #1: Type: text/plain, Size: 601 bytes --]

Jan Beulich wrote:
>>>> 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).

> -import sha
> +try:
> +    import hashlib # python v2.6 or newer
> +except ImportError:
> +    import sha # python v2.5 or older

Well, due to the renaming (sha.sha -> hashlib.sha1) it isn't *that*
easy.  Patch below could work.  WARNING: untested.

cheers,
  Gerd


[-- Attachment #2: fix.deprecated --]
[-- Type: text/plain, Size: 1563 bytes --]

diff -up xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated xen-3.3.1/tools/python/xen/util/acmpolicy.py
--- xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated	2009-03-09 17:22:39.000000000 +0100
+++ xen-3.3.1/tools/python/xen/util/acmpolicy.py	2009-03-10 16:48:14.000000000 +0100
@@ -17,7 +17,10 @@
 #============================================================================
 
 import os
-import sha
+try:
+    from hashlib import sha1
+except ImportError:
+    from sha import sha as sha1
 import stat
 import array
 import struct
@@ -1103,7 +1106,7 @@ class ACMPolicy(XSPolicy):
 
     def hash(self):
         """ Calculate a SAH1 hash of the XML policy """
-        return sha.sha(self.toxml())
+        return sha1(self.toxml())
 
     def save(self):
         ### Save the XML policy into a file ###
diff -up xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated xen-3.3.1/tools/python/xen/xend/XendAPI.py
--- xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated	2009-03-10 11:16:47.000000000 +0100
+++ xen-3.3.1/tools/python/xen/xend/XendAPI.py	2009-03-10 13:13:33.000000000 +0100
@@ -18,7 +18,6 @@
 import inspect
 import os
 import Queue
-import sets
 import string
 import sys
 import traceback
@@ -116,7 +115,7 @@ event_registrations = {}
 def event_register(session, reg_classes):
     if session not in event_registrations:
         event_registrations[session] = {
-            'classes' : sets.Set(),
+            'classes' : set(),
             'queue'   : Queue.Queue(EVENT_QUEUE_LENGTH),
             'next-id' : 1
             }

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [patch] fix python 2.6 warnings

[Marc - A. Dahlhaus]

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

Re: [patch] fix python 2.6 warnings

[Ian Jackson]

Gerd Hoffmann writes ("Re: [Xen-devel] [patch] fix python 2.6 warnings"):
> set type (obsoletes sets module) was added in 2.4
> hashlib (obsoletes sha module) was added in 2.5
> 
> For reference:  RHEL-5 ships with python 2.4.

The automated test systems which manage propagation from staging to
xen-unstable are running python 2.3.

Ian.