Mercurial > ldcheck / file diff

--- a/colours.py	Thu Aug 26 19:16:25 2021 +0300
+++ b/colours.py	Thu Aug 26 19:36:44 2021 +0300
@@ -19,26 +19,6 @@
     @property
     def is_direct_colour(self):
         return self.index >= 0x2000000
-    @property
-    def is_ldconfig_colour(self):
-        return self.index in ldconfig_colour_data
-    @property
-    def name(self):
-        if self.is_ldconfig_colour:
-            return ldconfig_colour_data[self.index]['name']
-        else:
-            return str(self)
-    @property
-    def face_colour(self):
-        if self.is_ldconfig_colour:
-            return ldconfig_colour_data[self.index]['value']
-        elif self.is_direct_colour:
-            return '#%06X' % (self.index & 0xffffff)
-        else:
-            return '#000000'
-    @property
-    def is_valid(self):
-        return self.is_ldconfig_colour or self.is_direct_colour
     def __eq__(self, other):
         return self.index == other.index
     def __lt__(self, other):
@@ -95,12 +75,9 @@
             colour = parse_ldconfig_ldr_line(line)
             yield (colour['code'], colour)
 
-# LDConfig lookup table
-ldconfig_colour_data = {}
-
 def load_colours(ldconfig_ldr):
     '''
         Loads colours. Expects a file pointer to LDConfig.ldr as the parameter.
+        Returns a lookup table
     '''
-    global ldconfig_colour_data
-    ldconfig_colour_data = dict(parse_ldconfig_ldr(ldconfig_ldr))
+    return dict(parse_ldconfig_ldr(ldconfig_ldr))