Merge branch '1.3.2' into maint

Conflicts:
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 1 insertions, 22 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
index 1b12e590a..5716a134f 100644
--- a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
+++ b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
@@ -6,28 +6,7 @@ import sys
 import logging
 import Bcfg2.Server.Lint
 import Bcfg2.Server.Plugin
-from Bcfg2.Compat import any  # pylint: disable=W0622
-
-
-class PackedDigitRange(object):
-    """ Helper object for NameRange entries """
-
-    def __init__(self, digit_range):
-        self.sparse = list()
-        self.ranges = list()
-        for item in digit_range.split(','):
-            if '-' in item:
-                self.ranges.append(tuple([int(x) for x in item.split('-')]))
-            else:
-                self.sparse.append(int(item))
-
-    def includes(self, other):
-        """ return True if other is included in this range """
-        iother = int(other)
-        if iother in self.sparse:
-            return True
-        return any(iother in range(start, end + 1)
-                   for start, end in self.ranges)
+from Bcfg2.Utils import PackedDigitRange
 
 
 class PatternMap(object):