head 1.2; access; symbols pkgsrc-2016Q4:1.1.0.54 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.52 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.50 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.48 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.46 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.44 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.42 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.40 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.38 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.36 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.34 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.32 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.30 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.28 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.26 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.24 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.22 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.20 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.18 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.16 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.14 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.12 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.10 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.8 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.6 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.4 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.2 pkgsrc-2010Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2016.12.29.19.13.03; author wiz; state dead; branches; next 1.1; commitid kFYPk8EnajcmFUzz; 1.1 date 2010.05.05.06.12.36; author cegger; state Exp; branches; next ; desc @@ 1.2 log @Remove xenkernel and tools versions 3, 33, and 41. As discussed on pkgsrc-users. @ text @$NetBSD: patch-ff,v 1.1 2010/05/05 06:12:36 cegger Exp $ --- python/xen/util/acmpolicy.py.orig 2009-08-06 12:56:37.000000000 +0000 +++ python/xen/util/acmpolicy.py @@@@ -17,12 +17,19 @@@@ #============================================================================ 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 @@@@ -1102,8 +1109,8 @@@@ class ACMPolicy(XSPolicy): return None def hash(self): - """ Calculate a SAH1 hash of the XML policy """ - return sha.sha(self.toxml()) + """ Calculate a SHA1 hash of the XML policy """ + return sha1(self.toxml()) def save(self): ### Save the XML policy into a file ### @ 1.1 log @Apply c/s 19609 from upstream: xend: Avoid deprecation warnings with Python 2.6. http://xenbits.xensource.com/xen-unstable.hg/rev/4d6029814742 Fixes PR pkg/43231 Add LICENSE Bump pkgversion @ text @d1 1 a1 1 $NetBSD$ @