Revert "Metadata: group_in_category fixes"

This reverts commit 35498c8b849c15632d720656d5736c4c85f76b53.

group_in_category() access data that's held on the ClientMetadata
object, and getting that data via the MetadataQuery object would be
more expensive.

1 files changed, 5 insertions, 18 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 75cf6454c..f58e0a8b7 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -10,7 +10,6 @@ import errno
 import fcntl
 import socket
 import logging
-import warnings
 import lxml.etree
 import Bcfg2.Server
 import Bcfg2.Options
@@ -334,14 +333,13 @@ class ClientMetadata(object):
 
     def group_in_category(self, category):
         """ Return the group in the given category that the client is
-        a member of, or an empty string.  Deprecated in favor of
-        :func:`Bcfg2.Server.Plugins.Metadata.MetadataQuery.group_in_category`
+        a member of, or an empty string.
 
         :returns: string """
-        warnings.warn("metadata.group_in_category() is deprecated; "
-                      "use metadata.query.group_in_category() instead",
-                      DeprecationWarning)
-        return self.query.group_in_category(category) or ''
+        for grp in self.query.all_groups_in_category(category):
+            if grp in self.groups:
+                return grp
+        return ''
 
     def __repr__(self):
         return "%s(%s, profile=%s, groups=%s)" % (self.__class__.__name__,
@@ -425,17 +423,6 @@ class MetadataQuery(object):
 
         return inner
 
-    def group_in_category(self, category):
-        """ Return the group in the given category that the client is
-        a member of, or None, if the client is not a member of any
-        group in the category.
-
-        :returns: string or None """
-        for grp in self.query.all_groups_in_category(category):
-            if grp in self.groups:
-                return grp
-        return None
-
     def by_groups(self, groups):
         """ Get a list of
         :class:`Bcfg2.Server.Plugins.Metadata.ClientMetadata` objects