1 files changed, 26 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Utils.py b/src/lib/Bcfg2/Utils.py
index 10057b63e..b043fd11c 100644
--- a/src/lib/Bcfg2/Utils.py
+++ b/src/lib/Bcfg2/Utils.py
@@ -321,6 +321,15 @@ def safe_input(msg):
     return input(msg)
 
 
+def safe_module_name(prefix, module):
+    """ Munge the name of a module with prefix to avoid collisions
+    with other Python modules.  E.g., if you want to import user
+    defined helper modules and someone has a helper named 'ldap.py',
+    it should not be added to ``sys.modules`` as ``ldap``, but rather
+    as something more obscure. """
+    return '__%s_%s' % (prefix, module)
+
+
 class classproperty(object):  # pylint: disable=C0103
     """ Decorator that can be used to create read-only class
     properties. """
@@ -329,4 +338,20 @@ class classproperty(object):  # pylint: disable=C0103
         self.getter = getter
 
     def __get__(self, instance, owner):
-        return self.getter(owner)
+        return classmethod(self.getter).__get__(None, owner)()
+
+
+def is_string(strng, encoding):
+    """ Returns true if the string contains no ASCII control
+    characters and can be decoded from the specified encoding. """
+    for char in strng:
+        if ord(char) < 9 or ord(char) > 13 and ord(char) < 32:
+            return False
+    if not hasattr(strng, "decode"):
+        # py3k
+        return True
+    try:
+        strng.decode(encoding)
+        return True
+    except:  # pylint: disable=W0702
+        return False