Merge branch 'icinga-db-py3' of https://github.com/imrejonk/debops in…

…to imrejonk-icinga-db-py3
debops · Sep 20, 2019 · 16d42d7 · 16d42d7
2 parents eb188ee + 6ed463c
commit 16d42d7
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/ansible/roles/debops.icinga_db/templates/etc/ansible/facts.d/icinga_db.fact.j2 b/ansible/roles/debops.icinga_db/templates/etc/ansible/facts.d/icinga_db.fact.j2
@@ -12,6 +12,12 @@ try:
 except ImportError:
     from ConfigParser import ConfigParser
 
+# Python 2 compatibility
+try:
+    from StringIO import StringIO
+except ImportError:
+    pass
+
 
 def get_config(config_file):
     config_data = []
@@ -22,7 +28,12 @@ def get_config(config_file):
             try:
                 config.read_string(config_string.decode('utf-8'))
             except AttributeError:
-                config.read_string(config_string)
+                try:
+                    config.read_string(config_string)
+                except AttributeError:
+                    # Python 2 compatibility
+                    sbuffer = StringIO(config_string)
+                    config.readfp(sbuffer)
 
             for section in config.sections():