From 854aaf4986cd79b659fe4de0b1d319dbd5f9ac92 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 20 Aug 2012 13:40:29 -0400 Subject: added CmpMixin to provide __cmp__ functionality to py3k --- src/lib/Bcfg2/Server/Plugin.py | 5 +++-- src/lib/Bcfg2/Server/SchemaUpdater/__init__.py | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2/Server') diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py index c6e626a5c..82162aa4a 100644 --- a/src/lib/Bcfg2/Server/Plugin.py +++ b/src/lib/Bcfg2/Server/Plugin.py @@ -10,7 +10,7 @@ import threading import lxml.etree import Bcfg2.Server import Bcfg2.Options -from Bcfg2.Bcfg2Py3k import ConfigParser +from Bcfg2.Bcfg2Py3k import ConfigParser, CmpMixin try: import django @@ -992,9 +992,10 @@ class SpecificityError(Exception): pass -class Specificity(object): +class Specificity(CmpMixin): def __init__(self, all=False, group=False, hostname=False, prio=0, delta=False): + CmpMixin.__init__(self) self.hostname = hostname self.all = all self.group = group diff --git a/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py b/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py index 1ea41c880..186f8797c 100644 --- a/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py +++ b/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py @@ -7,6 +7,7 @@ import re import sys import traceback +from Bcfg2.Py3k import CmpMixin from Bcfg2.Server.models import InternalDatabaseVersion from Bcfg2.Server.SchemaUpdater.Routines import UpdaterRoutineException, \ UpdaterRoutine @@ -50,10 +51,12 @@ def _release_to_version(release): return int("%02d%02d00" % (int(m.group(1)), int(m.group(2)))) -class Updater(object): +class Updater(CmpMixin): """Database updater to standardize updates""" def __init__(self, release): + CmpMixin.__init__(self) + self._cursor = None self._release = release try: -- cgit v1.2.3-1-g7c22