Merge branch 'upstream_master' into dev

Author: CodeByZach

CHANGES.md

@@ -1,5 +1,10 @@
 # ColorHelper
 
+## 4.0.1
+
+- **FIX**: Fix built-in custom color class match return. This caused files  
+  using one of the built-in color classes to fail in creating previews.
+
 ## 4.0.0
 
 > **BREAKING CHANGE**

custom/ahex.py

@@ -18,7 +18,7 @@ def match(cls, string, start=0, fullmatch=True):
         m = cls.MATCH.match(string, start)
         if m is not None and (not fullmatch or m.end(0) == len(string)):
             return cls.split_channels(m.group(0)), m.end(0)
-        return None, None
+        return None
 
     @classmethod
     def translate_channel(cls, channel, value):

custom/ass_abgr.py

@@ -18,7 +18,7 @@ def match(cls, string: str, start: int = 0, fullmatch: bool = True):
         m = cls.MATCH.match(string, start)
         if m is not None and (not fullmatch or m.end(0) == len(string)):
             return cls.split_channels(m.group("color")), m.end(0)
-        return None, None
+        return None
 
     @classmethod
     def translate_channel(cls, channel: int, value: str):

custom/hex_0x.py

@@ -27,7 +27,7 @@ def match(cls, string, start=0, fullmatch=True):
         m = cls.MATCH.match(string, start)
         if m is not None and (not fullmatch or m.end(0) == len(string)):
             return cls.split_channels(m.group(0)), m.end(0)
-        return None, None
+        return None
 
     @classmethod
     def translate_channel(cls, channel, value):

custom/tmtheme.py

@@ -762,7 +762,7 @@ def match(cls, string, start=0, fullmatch=True):
                 string = name2hex(string[m.start(0):m.end(0)])
             if string is not None:
                 return cls.split_channels(string), m.end(0)
-        return None, None
+        return None
 
 
 class ColorSRGBX11(Color):

docs/src/requirements.txt

@@ -1,4 +1,4 @@
-mkdocs_pymdownx_material_extras>=1.5.4
+mkdocs_pymdownx_material_extras>=1.5.7
 mkdocs-git-revision-date-localized-plugin
 mkdocs-minify-plugin
 pyspelling

support.py

@@ -5,7 +5,7 @@
 import webbrowser
 import re
 
-__version__ = "4.0.0"
+__version__ = "4.0.1"
 __pc_name__ = 'ColorHelper'
 
 CSS = '''