summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-21 14:37:27 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-21 14:37:27 -0400
commitc9ba92ef62376bbf01da1eac96cd5a2b5eb65a66 (patch)
tree19a61840175d2fb16ea51dedf49abd45d2417774 /src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
parentf36c89f5e78a3a2fcd9ad4b38b8670895883bd38 (diff)
parente88c029c6fdbedb038443c8cbe52206d9ca9c1a2 (diff)
downloadbcfg2-c9ba92ef62376bbf01da1eac96cd5a2b5eb65a66.tar.gz
bcfg2-c9ba92ef62376bbf01da1eac96cd5a2b5eb65a66.tar.bz2
bcfg2-c9ba92ef62376bbf01da1eac96cd5a2b5eb65a66.zip
Merge branch 'maint'
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/GroupPatterns.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/GroupPatterns.py23
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):