Attachment #202267 for bug #282729

View | Details | Raw Unified | Return to bug 282729 | Differences between
Collapse All | Expand All




#============================================================================

import os
import sha
import stat
import array
import struct
import shutil
import commands

# sha is deprecated as of python 2.6
try:
    from hashlib import sha1
except ImportError:
    # but hashlib was only added in python 2.5
    from sha import new as sha1

from xml.dom import minidom, Node
from xen.xend.XendLogging import log
from xen.util import xsconstants, bootloader, mkdir

        return None

    def hash(self):
        """ Calculate a SHA1 hash of the XML policy """
        return sha1(self.toxml())

    def save(self):
        ### Save the XML policy into a file ###




import time
import xmlrpclib
# sets is deprecated as of python 2.6, but set is unavailable in 2.3
try:
    set
except NameError:
    from sets import Set as set

import XendDomain, XendDomainInfo, XendNode, XendDmesg
import XendLogging, XendTaskManager, XendAPIStore

def event_register(session, reg_classes):
    if session not in event_registrations:
        event_registrations[session] = {
            'classes' : set(),
            'queue'   : Queue.Queue(EVENT_QUEUE_LENGTH),
            'next-id' : 1
            }
    if not reg_classes:
        reg_classes = classes
    sessionclasses = event_registrations[session]['classes']
    sessionclasses.union_update(reg_classes)
def event_unregister(session, unreg_classes):

Return to bug 282729

Lines 17-28 Link Here

(-)2522cc95efd2 (-3 / +10 lines)
17	#============================================================================	17	#============================================================================
18		18
19	import os	19	import os
20	import sha
21	import stat	20	import stat
22	import array	21	import array
23	import struct	22	import struct
24	import shutil	23	import shutil
25	import commands	24	import commands
		25
		26	# sha is deprecated as of python 2.6
		27	try:
		28	from hashlib import sha1
		29	except ImportError:
		30	# but hashlib was only added in python 2.5
		31	from sha import new as sha1
		32
26	from xml.dom import minidom, Node	33	from xml.dom import minidom, Node
27	from xen.xend.XendLogging import log	34	from xen.xend.XendLogging import log
28	from xen.util import xsconstants, bootloader, mkdir	35	from xen.util import xsconstants, bootloader, mkdir
Lines 1102-1109 Link Here
1102	return None	1109	return None
1103		1110
1104	def hash(self):	1111	def hash(self):
1105	""" Calculate a SAH1 hash of the XML policy """	1112	""" Calculate a SHA1 hash of the XML policy """
1106	return sha.sha(self.toxml())	1113	return sha1(self.toxml())
1107		1114
1108	def save(self):	1115	def save(self):
1109	### Save the XML policy into a file ###	1116	### Save the XML policy into a file ###

Lines 25-30 Link Here

(-)2522cc95efd2 (-2 / +9 lines)
25	import time	24	import time
26	import xmlrpclib	25	import xmlrpclib
		26	# sets is deprecated as of python 2.6, but set is unavailable in 2.3
		27	try:
		28	set
		29	except NameError:
		30	from sets import Set as set
		31
27	import XendDomain, XendDomainInfo, XendNode, XendDmesg	32	import XendDomain, XendDomainInfo, XendNode, XendDmesg
28	import XendLogging, XendTaskManager, XendAPIStore	33	import XendLogging, XendTaskManager, XendAPIStore
Lines 115-127 Link Here
115	def event_register(session, reg_classes):	120	def event_register(session, reg_classes):
116	if session not in event_registrations:	121	if session not in event_registrations:
117	event_registrations[session] = {	122	event_registrations[session] = {
118	'classes' : sets.Set(),	123	'classes' : set(),
119	'queue' : Queue.Queue(EVENT_QUEUE_LENGTH),	124	'queue' : Queue.Queue(EVENT_QUEUE_LENGTH),
120	'next-id' : 1	125	'next-id' : 1
121	}	126	}
122	if not reg_classes:	127	if not reg_classes:
123	reg_classes = classes	128	reg_classes = classes
124	event_registrations[session]['classes'].union_update(reg_classes)	129	sessionclasses = event_registrations[session]['classes']
		130	sessionclasses.union_update(reg_classes)
125	def event_unregister(session, unreg_classes):	131	def event_unregister(session, unreg_classes):