Python 3 issue in XRANDR_DEFAULTS

[deb_pkgs/autorandr.git] / autorandr.py

diff --git a/autorandr.py b/autorandr.py
index 5083c03c20486cb08e9ab7e459bb7a62403e5f96..72f48b89059721689e2cf37349176764c5dc17bf 100755 (executable)
--- a/autorandr.py
+++ b/autorandr.py
@@ -4,7 +4,7 @@
 # autorandr.py
 # Copyright (c) 2015, Phillip Berndt
 #
-# Experimental autorandr rewrite in Python
+# Autorandr rewrite in Python
 #
 # This script aims to be fully compatible with the original autorandr.
 #
@@ -123,7 +123,7 @@ class XrandrOutput(object):
         "gamma": "1.0:1.0:1.0",
     }
 
-    XRANDR_DEFAULTS = dict(XRANDR_13_DEFAULTS.items() + XRANDR_12_DEFAULTS.items())
+    XRANDR_DEFAULTS = dict(list(XRANDR_13_DEFAULTS.items()) + list(XRANDR_12_DEFAULTS.items()))
 
     def __repr__(self):
         return "<%s%s %s>" % (self.output, (" %s..%s" % (self.edid[:5], self.edid[-5:])) if self.edid else "", " ".join(self.option_vector))
@@ -550,14 +550,14 @@ def main(argv):
     else:
         for profile_name in profiles.keys():
             if profile_blocked(os.path.join(profile_path, profile_name)):
-                print("%s (blocked)" % profile_name)
+                print("%s (blocked)" % profile_name, file=sys.stderr)
                 continue
             if detected_profile == profile_name:
-                print("%s (detected)" % profile_name)
+                print("%s (detected)" % profile_name, file=sys.stderr)
                 if "-c" in options or "--change" in options:
                     load_profile = detected_profile
             else:
-                print(profile_name)
+                print(profile_name, file=sys.stderr)
 
     if "-d" in options:
         options["--default"] = options["-d"]
@@ -574,8 +574,8 @@ def main(argv):
                 print("Failed to load profile '%s':\nProfile not found" % load_profile, file=sys.stderr)
                 sys.exit(1)
         add_unused_outputs(config, profile)
-        if profile == config and not "-f" in options and not "--force" in options:
-            print("Config already loaded")
+        if profile == dict(config) and not "-f" in options and not "--force" in options:
+            print("Config already loaded", file=sys.stderr)
             sys.exit(0)
 
         try: