Update copyrights on core files; remove code for serializable, an abstract base class which we really don't use/need.

38 files changed, 39 insertions, 88 deletions

diff --git a/cobbler/action_acl.py b/cobbler/action_acl.py
index 6ee8ea5b..d265498a 100644
--- a/cobbler/action_acl.py
+++ b/cobbler/action_acl.py
@@ -4,7 +4,7 @@ line as non-root.  Now that CLI is largely remoted (XMLRPC) this is largely just
 useful for not having to log in (access to shared-secret) file but also grants
 access to hand-edit various config files and other useful things.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/action_buildiso.py b/cobbler/action_buildiso.py
index 4792f3dd..0c4bd95e 100644
--- a/cobbler/action_buildiso.py
+++ b/cobbler/action_buildiso.py
@@ -2,7 +2,7 @@
 Builds non-live bootable CD's that have PXE-equivalent behavior
 for all cobbler profiles currently in memory.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/action_check.py b/cobbler/action_check.py
index 7e4afbdd..fa1e601c 100644
--- a/cobbler/action_check.py
+++ b/cobbler/action_check.py
@@ -2,7 +2,7 @@
 Validates whether the system is reasonably well configured for
 serving up content.  This is the code behind 'cobbler check'.
 
-Copyright 2006, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/action_litesync.py b/cobbler/action_litesync.py
index 88bc7d0b..28060649 100644
--- a/cobbler/action_litesync.py
+++ b/cobbler/action_litesync.py
@@ -4,7 +4,7 @@ such that we don't need a time consuming sync when adding new
 systems if nothing has changed for systems that have already 
 been created.
 
-Copyright 2006, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/action_report.py b/cobbler/action_report.py
index 0a53aff3..5fd85650 100644
--- a/cobbler/action_report.py
+++ b/cobbler/action_report.py
@@ -1,5 +1,6 @@
 """
 Report from a cobbler master.
+FIXME: reinstante functionality for 2.0
 
 Copyright 2007-2009, Red Hat, Inc
 Anderson Silva <ansilva@redhat.com>
diff --git a/cobbler/action_status.py b/cobbler/action_status.py
index 6c897ab3..627b6ecc 100644
--- a/cobbler/action_status.py
+++ b/cobbler/action_status.py
@@ -2,7 +2,7 @@
 Reports on kickstart activity by examining the logs in
 /var/log/cobbler.
 
-Copyright 2007-2008, Red Hat, Inc
+Copyright 2007-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index b4ed9ba8..9b741314 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -2,7 +2,7 @@
 Builds out filesystem trees/data based on the object tree.
 This is the code behind 'cobbler sync'.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/action_validate.py b/cobbler/action_validate.py
index 72853270..cf8e23a6 100644
--- a/cobbler/action_validate.py
+++ b/cobbler/action_validate.py
@@ -1,7 +1,7 @@
 """
 Validates rendered kickstart files.
 
-Copyright 2007-2008, Red Hat, Inc
+Copyright 2007-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/api.py b/cobbler/api.py
index 6de22915..9f58fc57 100644
--- a/cobbler/api.py
+++ b/cobbler/api.py
@@ -3,7 +3,7 @@ python API module for Cobbler
 see source for cobbler.py, or pydoc, for example usage.
 CLI apps and daemons should import api.py, and no other cobbler code.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/cexceptions.py b/cobbler/cexceptions.py
index bc511279..bb4b3e82 100644
--- a/cobbler/cexceptions.py
+++ b/cobbler/cexceptions.py
@@ -1,7 +1,7 @@
 """
 Custom exceptions for Cobbler
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/cobblerd.py b/cobbler/cobblerd.py
index 57f0e007..e8251f91 100644
--- a/cobbler/cobblerd.py
+++ b/cobbler/cobblerd.py
@@ -1,7 +1,7 @@
 """
 cobbler daemon for logging remote syslog traffic during kickstart
  
-Copyright 2007, Red Hat, Inc
+Copyright 2007-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/codes.py b/cobbler/codes.py
index 6ff38164..7bda2115 100644
--- a/cobbler/codes.py
+++ b/cobbler/codes.py
@@ -2,8 +2,7 @@
 """
 various codes and constants used by Cobbler
 
-
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/collection.py b/cobbler/collection.py
index a8d5f40f..56a6ffff 100644
--- a/cobbler/collection.py
+++ b/cobbler/collection.py
@@ -1,7 +1,7 @@
 """
 Base class for any serializable list of things...
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 import exceptions
 from cexceptions import *
-import serializable
 import utils
 import glob
 import time
@@ -37,7 +36,7 @@ import item_repo
 import item_image
 from utils import _
 
-class Collection(serializable.Serializable):
+class Collection:
 
     def __init__(self,config):
         """
diff --git a/cobbler/collection_distros.py b/cobbler/collection_distros.py
index cd67ac77..8de96d51 100644
--- a/cobbler/collection_distros.py
+++ b/cobbler/collection_distros.py
@@ -2,7 +2,7 @@
 A distro represents a network bootable matched set of kernels
 and initrd files
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/collection_images.py b/cobbler/collection_images.py
index db9ef703..db44fc65 100644
--- a/cobbler/collection_images.py
+++ b/cobbler/collection_images.py
@@ -2,7 +2,7 @@
 A image instance represents a ISO or virt image we want to track
 and repeatedly install.  It differs from a answer-file based installation.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This software may be freely redistributed under the terms of the GNU
diff --git a/cobbler/collection_profiles.py b/cobbler/collection_profiles.py
index 58f168f2..ed1a4235 100644
--- a/cobbler/collection_profiles.py
+++ b/cobbler/collection_profiles.py
@@ -4,7 +4,7 @@ For instance, FC5 with a kickstart file specifying OpenOffice
 might represent a 'desktop' profile.  For Virt, there are many
 additional options, with client-side defaults (not kept here).
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/collection_repos.py b/cobbler/collection_repos.py
index 789fd923..08c5e964 100644
--- a/cobbler/collection_repos.py
+++ b/cobbler/collection_repos.py
@@ -3,7 +3,7 @@ Repositories in cobbler are way to create a local mirror of a yum repository.
 When used in conjunction with a mirrored kickstart tree (see "cobbler import")
 outside bandwidth needs can be reduced and/or eliminated.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/collection_systems.py b/cobbler/collection_systems.py
index 68f3801a..f74c7cc5 100644
--- a/cobbler/collection_systems.py
+++ b/cobbler/collection_systems.py
@@ -2,7 +2,7 @@
 Systems are hostnames/MACs/IP names and the associated profile
 they belong to.
 
-Copyright 2008, Red Hat, Inc
+Copyright 2008-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/config.py b/cobbler/config.py
index df4a589e..dd4fa20b 100644
--- a/cobbler/config.py
+++ b/cobbler/config.py
@@ -1,7 +1,7 @@
 """
 Config.py is a repository of the Cobbler object model
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/demo_connect.py b/cobbler/demo_connect.py
index 12627b1e..2a5061d1 100644
--- a/cobbler/demo_connect.py
+++ b/cobbler/demo_connect.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 """
-Copyright 2007-2008, Red Hat, Inc
+Copyright 2007-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/item.py b/cobbler/item.py
index fa9e3f30..562e2658 100644
--- a/cobbler/item.py
+++ b/cobbler/item.py
@@ -1,7 +1,7 @@
 """
 An Item is a serializable thing that can appear in a Collection
 
-Copyright 2006, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This software may be freely redistributed under the terms of the GNU
@@ -13,14 +13,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 """
 
 import exceptions
-import serializable
 import utils
 from cexceptions import *
 from utils import _
 import pprint
 import fnmatch
 
-class Item(serializable.Serializable):
+class Item:
 
     TYPE_NAME = "generic"
 
diff --git a/cobbler/item_distro.py b/cobbler/item_distro.py
index e3a61269..84c32e8b 100644
--- a/cobbler/item_distro.py
+++ b/cobbler/item_distro.py
@@ -2,7 +2,7 @@
 A cobbler distribution.  A distribution is a kernel, and initrd, and potentially
 some kernel options.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/item_image.py b/cobbler/item_image.py
index ff4939ae..013527a8 100644
--- a/cobbler/item_image.py
+++ b/cobbler/item_image.py
@@ -2,7 +2,7 @@
 A Cobbler Image.  Tracks a virtual or physical image, as opposed to a answer
 file (kickstart) led installation.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/item_profile.py b/cobbler/item_profile.py
index 2a282e16..9f766c01 100644
--- a/cobbler/item_profile.py
+++ b/cobbler/item_profile.py
@@ -1,7 +1,7 @@
 """
 A Cobbler Profile.  A profile is a reference to a distribution, possibly some kernel options, possibly some Virt options, and some kickstart data.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py
index e4af55a6..8013e97c 100644
--- a/cobbler/item_repo.py
+++ b/cobbler/item_repo.py
@@ -1,7 +1,7 @@
 """
 A Cobbler repesentation of a yum repo.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/item_system.py b/cobbler/item_system.py
index 4346a356..56ec9c3d 100644
--- a/cobbler/item_system.py
+++ b/cobbler/item_system.py
@@ -1,7 +1,7 @@
 """
 A Cobbler System.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/kickgen.py b/cobbler/kickgen.py
index f91924fd..bff034dd 100644
--- a/cobbler/kickgen.py
+++ b/cobbler/kickgen.py
@@ -2,7 +2,7 @@
 Builds out filesystem trees/data based on the object tree.
 This is the code behind 'cobbler sync'.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/manage_ctrl.py b/cobbler/manage_ctrl.py
index 95ad5b8f..9203f88f 100644
--- a/cobbler/manage_ctrl.py
+++ b/cobbler/manage_ctrl.py
@@ -2,7 +2,7 @@
 Builds out DHCP info
 This is the code behind 'cobbler sync'.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/module_loader.py b/cobbler/module_loader.py
index f50e4bf4..36aa38ae 100644
--- a/cobbler/module_loader.py
+++ b/cobbler/module_loader.py
@@ -3,7 +3,7 @@
 """
 Module loader, adapted for cobbler usage
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Adrian Likins <alikins@redhat.com>
 Michael DeHaan <mdehaan@redhat.com>
 
diff --git a/cobbler/pxegen.py b/cobbler/pxegen.py
index ff617592..664ab9e8 100644
--- a/cobbler/pxegen.py
+++ b/cobbler/pxegen.py
@@ -2,7 +2,7 @@
 Builds out filesystem trees/data based on the object tree.
 This is the code behind 'cobbler sync'.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/serializable.py b/cobbler/serializable.py
deleted file mode 100644
index ba54b2e7..00000000
--- a/cobbler/serializable.py
+++ /dev/null
@@ -1,47 +0,0 @@
-"""
-Serializable interface, for documentation purposes.
-Collections and Settings both support this interface.
-
-Copyright 2006-2008, Red Hat, Inc
-Michael DeHaan <mdehaan@redhat.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-"""
-
-from utils import _
-import exceptions
-
-class Serializable:
-
-   def filename(self):
-       """
-       Return the full path to the config file this object uses.
-       """
-       return None
-
-   def from_datastruct(self,datastruct):
-       """
-       Return an object constructed with data from datastruct
-       """
-       raise exceptions.NotImplementedError
-
-   def to_datastruct(self):
-       """
-       Return hash/array/scalar reprentation of self.
-       This function must be the inverse of from_datastruct.
-       """
-       raise exceptions.NotImplementedError
-
diff --git a/cobbler/serializer.py b/cobbler/serializer.py
index 89090baf..73e8395a 100644
--- a/cobbler/serializer.py
+++ b/cobbler/serializer.py
@@ -2,7 +2,7 @@
 Serializer code for cobbler
 Now adapted to support different storage backends
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/services.py b/cobbler/services.py
index eb4461b3..d8b66098 100644
--- a/cobbler/services.py
+++ b/cobbler/services.py
@@ -3,7 +3,7 @@ Mod Python service functions for Cobbler's public interface
 (aka cool stuff that works with wget)
 
 based on code copyright 2007 Albert P. Tobey <tobert@gmail.com>
-additions: 2007-2008 Michael DeHaan <mdehaan@redhat.com>
+additions: 2007-2009 Michael DeHaan <mdehaan@redhat.com>
  
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/cobbler/settings.py b/cobbler/settings.py
index b252c4aa..2cd15b78 100644
--- a/cobbler/settings.py
+++ b/cobbler/settings.py
@@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301  USA
 """
 
-import serializable
 import utils
 from utils import _
 
@@ -105,7 +104,7 @@ DEFAULTS = {
 }
 
 
-class Settings(serializable.Serializable):
+class Settings:
 
    def collection_type(self):
        return "settings"
diff --git a/cobbler/templar.py b/cobbler/templar.py
index 604c10f9..b541c2ce 100644
--- a/cobbler/templar.py
+++ b/cobbler/templar.py
@@ -3,7 +3,7 @@ Cobbler uses Cheetah templates for lots of stuff, but there's
 some additional magic around that to deal with snippets/etc.
 (And it's not spelled wrong!)
 
-Copyright 2008, Red Hat, Inc
+Copyright 2008-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/template_api.py b/cobbler/template_api.py
index a6b6eaba..2ea3cd98 100644
--- a/cobbler/template_api.py
+++ b/cobbler/template_api.py
@@ -4,6 +4,7 @@ such function and is now used to implement Cobbler's SNIPPET:: syntax.
 
 Written by Daniel Guernsey <danpg102@gmail.com>
 Contributions by Michael DeHaan <mdehaan@redhat.com>
+US Government work; No explicit copyright attached to this file.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/cobbler/utils.py b/cobbler/utils.py
index ccae389d..bb7d8507 100644
--- a/cobbler/utils.py
+++ b/cobbler/utils.py
@@ -1,7 +1,7 @@
 """
 Misc heavy lifting functions for cobbler
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/cobbler/yumgen.py b/cobbler/yumgen.py
index dfc93c86..7b6fb06b 100644
--- a/cobbler/yumgen.py
+++ b/cobbler/yumgen.py
@@ -2,7 +2,7 @@
 Builds out filesystem trees/data based on the object tree.
 This is the code behind 'cobbler sync'.
 
-Copyright 2006-2008, Red Hat, Inc
+Copyright 2006-2009, Red Hat, Inc
 Michael DeHaan <mdehaan@redhat.com>
 
 This program is free software; you can redistribute it and/or modify