From 70cc6bb182245d20c54afba79a265ef40f1ed080 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 25 Mar 2013 11:39:50 -0400 Subject: Revert "Packages: properly implemented deepcopy() for PackagesSources objects" This reverts commit 432f448983ff27452d82d62314d91c942f31bce5. --- src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py index 3069e4068..2735e389a 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py @@ -8,17 +8,13 @@ from Bcfg2.Server.Plugins.Packages.Source import SourceInitError class PackagesSources(Bcfg2.Server.Plugin.StructFile, - Bcfg2.Server.Plugin.Debuggable, - Bcfg2.Server.Plugin.DeepcopyMixin): + Bcfg2.Server.Plugin.Debuggable): """ PackagesSources handles parsing of the :mod:`Bcfg2.Server.Plugins.Packages` ``sources.xml`` file, and the creation of the appropriate :class:`Bcfg2.Server.Plugins.Packages.Source.Source` object for each ``Source`` tag. """ - _deepcopy_exclude = Bcfg2.Server.Plugin.DeepcopyMixin._deepcopy_exclude + \ - ['pkg_obj'] - __identifier__ = None def __init__(self, filename, cachepath, fam, packages, setup): @@ -43,7 +39,6 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile, If ``sources.xml`` cannot be read """ Bcfg2.Server.Plugin.Debuggable.__init__(self) - Bcfg2.Server.Plugin.DeepcopyMixin.__init__(self) try: Bcfg2.Server.Plugin.StructFile.__init__(self, filename, fam=fam, should_monitor=True) @@ -134,7 +129,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile, """ Create a :class:`Bcfg2.Server.Plugins.Packages.Source.Source` subclass object from XML representation of a source in ``sources.xml``. - ``source_from_xml`` determines the appropriate subclass of + ``source_from-xml`` determines the appropriate subclass of ``Source`` to instantiate according to the ``type`` attribute of the ``Source`` tag. @@ -181,6 +176,3 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile, def __len__(self): return len(self.entries) - - def _deepcopy_constructor_args(self): - return (self.name, self.cachepath, None, None, dict(self.setup)) -- cgit v1.2.3-1-g7c22