# HG changeset patch # User Matti Hamalainen # Date 1476782684 -10800 # Node ID 7677c4992381c6bd9b23d6cbf9f3d5f871027e88 # Parent f3949e4aca4bd2350b74accaa00b7987d4c030fa# Parent 205767356d2cb6adb9db895b368a14ba2087f718 Merged. diff -r f3949e4aca4b -r 7677c4992381 multimerge.py --- a/multimerge.py Tue Oct 18 11:55:14 2016 +0300 +++ b/multimerge.py Tue Oct 18 12:24:44 2016 +0300 @@ -185,6 +185,12 @@ else: gcm_fatal(u"Invalid initializer for GCMColor() object.") + def to_hexrgb(): + return "{0:02X}{1:02X}{2:02X}".format(self.r, self.g, self.b) + + def to_hexrgb_lc(): + return "{0:02x}{1:02x}{2:02x}".format(self.r, self.g, self.b) + def delta(self, other): ctmp = GCMColor() ctmp.r = other.r - self.r