Py3 compatibility fixes.

saltstack · Jan 30, 2015 · 4883692 · 4883692
1 parent 2d71cd7
commit 4883692
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/salt/modules/systemd.py b/salt/modules/systemd.py
@@ -7,6 +7,8 @@
 import logging
 import os
 import re
+
+# Import 3rd-party libs
 import salt.ext.six as six
 
 log = logging.getLogger(__name__)
@@ -199,7 +201,7 @@ def get_all():
 
         salt '*' service.get_all
     '''
-    return sorted(set(_get_all_units().keys() + _get_all_unit_files().keys()))
+    return sorted(set(list(_get_all_units().keys()) + list(_get_all_unit_files().keys())))
 
 
 def available(name):