From 0d85b11a8c6016f4d29a378046e2f6fd56668c5b Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 28 Jul 2008 07:45:40 -0400 Subject: [PATCH] back to 2.4 compatibility Not dealing right now with a comprehensive upgrade. svn path=/trunk/packages/sipb-xen-base/; revision=766 --- debian/changelog | 6 ++++++ .../share/python-support/sipb-xen-base/.version | 1 - .../python-support/sipb-xen-base/invirt/config.py | 4 +--- 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 files/usr/share/python-support/sipb-xen-base/.version diff --git a/debian/changelog b/debian/changelog index c3ab1bd..b3a8ae3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sipb-xen-base (8.7) unstable; urgency=low + + * back to 2.4 compatibility + + -- Greg Price Mon, 28 Jul 2008 07:44:27 -0400 + sipb-xen-base (8.6) unstable; urgency=low * switching to python 2.5 only diff --git a/files/usr/share/python-support/sipb-xen-base/.version b/files/usr/share/python-support/sipb-xen-base/.version deleted file mode 100644 index 95e3ba8..0000000 --- a/files/usr/share/python-support/sipb-xen-base/.version +++ /dev/null @@ -1 +0,0 @@ -2.5 diff --git a/files/usr/share/python-support/sipb-xen-base/invirt/config.py b/files/usr/share/python-support/sipb-xen-base/invirt/config.py index 37fafb4..ea4bf4e 100644 --- a/files/usr/share/python-support/sipb-xen-base/invirt/config.py +++ b/files/usr/share/python-support/sipb-xen-base/invirt/config.py @@ -1,4 +1,3 @@ -from __future__ import with_statement import yaml default_path = '/etc/invirt/master.yaml' @@ -7,7 +6,6 @@ try: default_loader = yaml.CSafeLoader except: default_loader = yaml.SafeLoader def load( path = default_path ): - with file( path ) as f: - return yaml.load( f, default_loader ) + return yaml.load( file(path), default_loader ) # vim:et:sw=4:ts=4 -- 1.7.9.5