Permit comments at head of color files

lukelbd · lukelbd · commit 0ffc1d159c02 · 2020-01-10T04:17:26.000-07:00
diff --git a/proplot/colors/crayola.txt b/proplot/colors/crayola.txt
@@ -1,3 +1,5 @@
+# Crayola crayon colors
+# https://en.wikipedia.org/wiki/List_of_Crayola_crayon_colors
 almond:                   #efdecd
 antique brass:            #cd9575
 apricot:                  #fdd9b5
diff --git a/proplot/colors/opencolor.txt b/proplot/colors/opencolor.txt
@@ -1,3 +1,5 @@
+# Open-color colors
+# https://yeun.github.io/open-color/
 gray0:   #f8f9fa
 gray1:   #f1f3f5
 gray2:   #e9ecef
diff --git a/proplot/colors/xkcd.txt b/proplot/colors/xkcd.txt
@@ -1,3 +1,5 @@
+# XKCD color survey colors
+# https://blog.xkcd.com/2010/05/03/color-survey-results/
 purple:                     #7e1e9c
 green:                      #15b01a
 blue:                       #0343df
diff --git a/proplot/styletools.py b/proplot/styletools.py
@@ -3047,16 +3047,25 @@ def register_colors(nmax=np.inf):
         for file in paths:
             cat, _ = os.path.splitext(os.path.basename(file))
             with open(file, 'r') as f:
-                pairs = [
-                    tuple(item.strip() for item in line.split(':'))
-                    for line in f.readlines()
-                    if line.strip() and line.strip()[0] != '#'
-                ]
-            if not all(len(pair) == 2 for pair in pairs):
-                raise RuntimeError(
-                    f'Invalid color names file {file!r}. '
-                    f'Every line must be formatted as "name: color".'
+                cnt = 0
+                hex = re.compile(
+                    r'\A#(?:[0-9a-fA-F]{3}){1,2}\Z'  # ?: prevents capture
                 )
+                pairs = []
+                for line in f.readlines():
+                    cnt += 1
+                    stripped = line.strip()
+                    if not stripped or stripped[0] == '#':
+                        continue
+                    pair = tuple(item.strip() for item in line.split(':'))
+                    if len(pair) != 2 or not hex.match(pair[1]):
+                        _warn_proplot(
+                            f'Illegal line #{cnt} in file {file!r}:\n'
+                            f'{line!r}\n'
+                            f'Lines must be formatted as "name: hexcolor".'
+                        )
+                        continue
+                    pairs.append(pair)
 
             # Categories for which we add *all* colors
             if cat == 'opencolor' or i == 1:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Crayola crayon colors`
	`2`	`+# https://en.wikipedia.org/wiki/List_of_Crayola_crayon_colors`
`1`	`3`	`almond: #efdecd`
`2`	`4`	`antique brass: #cd9575`
`3`	`5`	`apricot: #fdd9b5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Open-color colors`
	`2`	`+# https://yeun.github.io/open-color/`
`1`	`3`	`gray0: #f8f9fa`
`2`	`4`	`gray1: #f1f3f5`
`3`	`5`	`gray2: #e9ecef`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# XKCD color survey colors`
	`2`	`+# https://blog.xkcd.com/2010/05/03/color-survey-results/`
`1`	`3`	`purple: #7e1e9c`
`2`	`4`	`green: #15b01a`
`3`	`5`	`blue: #0343df`