More 2to3 fixes in the Tools directory. Fixes #2893.
diff --git a/Tools/pynche/ColorDB.py b/Tools/pynche/ColorDB.py
index 6d52b40..fcf1b87 100644
--- a/Tools/pynche/ColorDB.py
+++ b/Tools/pynche/ColorDB.py
@@ -66,7 +66,7 @@
# version the `name', or the CapitalizedVersion, etc.
key = (red, green, blue)
foundname, aliases = self.__byrgb.get(key, (name, []))
- if foundname <> name and foundname not in aliases:
+ if foundname != name and foundname not in aliases:
aliases.append(name)
self.__byrgb[key] = (foundname, aliases)
# add to byname lookup
@@ -122,7 +122,7 @@
self.__allnames = []
for name, aliases in self.__byrgb.values():
self.__allnames.append(name)
- self.__allnames.sort(key=unicode.lower)
+ self.__allnames.sort(key=str.lower)
return self.__allnames
def aliases_of(self, red, green, blue):
@@ -209,7 +209,7 @@
"""Converts a #rrggbb color to the tuple (red, green, blue)."""
rgbtuple = _namedict.get(color)
if rgbtuple is None:
- if color[0] <> '#':
+ if color[0] != '#':
raise BadColor(color)
red = color[1:3]
green = color[3:5]
@@ -232,7 +232,7 @@
_maxtuple = (256.0,) * 3
def triplet_to_fractional_rgb(rgbtuple):
- return map(operator.__div__, rgbtuple, _maxtuple)
+ return list(map(operator.__div__, rgbtuple, _maxtuple))
def triplet_to_brightness(rgbtuple):