diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-18 11:06:46 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-18 11:06:46 -0500 |
commit | 7161b78b261cdbd959bf6f42d0780ceb78bf2e64 (patch) | |
tree | b619e1b222476096122e64302efc29c214076e9c /src/lib/Bcfg2/Server/Plugins/GroupPatterns.py | |
parent | b79027f553c82be75e49bcf9bde2f92ab72304c7 (diff) | |
parent | c2133f115673670992048f3567c22e7478281a79 (diff) | |
download | bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.tar.gz bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.tar.bz2 bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.zip |
Merge branch '1.3.1' into 1.4.x
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/GroupPatterns.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/GroupPatterns.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py index 0ad5dd788..42d860b89 100644 --- a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py +++ b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py @@ -6,6 +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): @@ -25,10 +26,8 @@ class PackedDigitRange(object): iother = int(other) if iother in self.sparse: return True - for (start, end) in self.ranges: - if iother in range(start, end + 1): - return True - return False + return any(iother in range(start, end + 1) + for start, end in self.ranges) class PatternMap(object): |