=== modified file 'mandos'
--- mandos	2019-11-23 22:27:35 +0000
+++ mandos	2019-12-04 23:35:08 +0000
@@ -91,6 +91,7 @@
 
 if sys.version_info.major == 2:
     __metaclass__ = type
+    str = unicode
 
 # Show warnings by default
 if not sys.warnoptions:
@@ -122,9 +123,6 @@
             # No value found
             SO_BINDTODEVICE = None
 
-if sys.version_info.major == 2:
-    str = unicode
-
 if sys.version_info < (3, 2):
     configparser.Configparser = configparser.SafeConfigParser
 

=== modified file 'mandos-ctl'
--- mandos-ctl	2019-11-03 19:09:41 +0000
+++ mandos-ctl	2019-12-04 23:35:08 +0000
@@ -48,6 +48,7 @@
 
 if sys.version_info.major == 2:
     __metaclass__ = type
+    str = unicode
 
 try:
     import pydbus
@@ -75,7 +76,6 @@
 logging.captureWarnings(True)   # Show warnings via the logging system
 
 if sys.version_info.major == 2:
-    str = unicode
     import StringIO
     io.StringIO = StringIO.StringIO