Merge branch '1.3.1' into 1.4.x

2 files changed, 4 insertions, 8 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 57edcb938..59796a556 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -577,15 +577,12 @@ class StructFile(XMLFileBacked):
 
     def Index(self):
         XMLFileBacked.Index(self)
-        if self.encryption:
+        if self.encryption and HAS_CRYPTO:
             strict = self.xdata.get(
                 "decrypt",
                 self.setup.cfp.get(Bcfg2.Encryption.CFG_SECTION, "decrypt",
                                    default="strict")) == "strict"
             for el in self.xdata.xpath("//*[@encrypted]"):
-                if not HAS_CRYPTO:
-                    raise PluginExecutionError("%s: M2Crypto is not available"
-                                               % self.name)
                 try:
                     el.text = self._decrypt(el).encode('ascii',
                                                        'xmlcharrefreplace')
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):