3 files changed, 27 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
index 11355e117..ec0d8e828 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
@@ -13,6 +13,19 @@ class AptCollection(Collection):
     overrides nothing, and defers all operations to :class:`PacSource`
     """
 
+    def __init__(self, metadata, sources, cachepath, basepath, fam,
+                 debug=False):
+        # we define an __init__ that just calls the parent __init__,
+        # so that we can set the docstring on __init__ to something
+        # different from the parent __init__ -- namely, the parent
+        # __init__ docstring, minus everything after ``.. -----``,
+        # which we use to delineate the actual docs from the
+        # .. autoattribute hacks we have to do to get private
+        # attributes included in sphinx 1.0 """
+        Collection.__init__(self, metadata, sources, cachepath, basepath, fam,
+                            debug=debug)
+    __init__.__doc__ = Collection.__init__.__doc__.split(".. -----")[0]
+
     def get_config(self):
         """ Get an APT configuration file (i.e., ``sources.list``).
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
index ec9ba550b..f9bb9e1a2 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
@@ -117,6 +117,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable):
         :param debug: Enable debugging output
         :type debug: bool
 
+        .. -----
         .. autoattribute:: __package_groups__
         """
         Bcfg2.Server.Plugin.Debuggable.__init__(self)
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
index ac58f4c99..99aed5ce5 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
@@ -11,7 +11,19 @@ class PacCollection(Collection):
     :class:`Bcfg2.Server.Plugins.Packages.Collection.Collection`,
     overrides nothing, and defers all operations to :class:`PacSource`
     """
-    pass
+
+    def __init__(self, metadata, sources, cachepath, basepath, fam,
+                 debug=False):
+        # we define an __init__ that just calls the parent __init__,
+        # so that we can set the docstring on __init__ to something
+        # different from the parent __init__ -- namely, the parent
+        # __init__ docstring, minus everything after ``.. -----``,
+        # which we use to delineate the actual docs from the
+        # .. autoattribute hacks we have to do to get private
+        # attributes included in sphinx 1.0 """
+        Collection.__init__(self, metadata, sources, cachepath, basepath, fam,
+                            debug=debug)
+    __init__.__doc__ = Collection.__init__.__doc__.split(".. -----")[0]
 
 
 class PacSource(Source):