From 98508bdd264a1aa87e7a8b04e60dcb1ad1bc5a03 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Tue, 3 May 2016 23:15:39 -0400
Subject: [PATCH 1/2] Allow flexible whitespace in color strings.

Allow a variable amount of whitespace for rgb, rgba, hsv, and hsva
strings in the config.
Previously only 'rgb(0, 0, 0)' was allowed. Now things like
'rgb(0,0,0)' are permitted.
The repeated 3-digit segments of the regexes were separated out to
reduce repetition and line length.
---
 qutebrowser/config/configtypes.py     | 10 ++++++----
 tests/unit/config/test_configtypes.py |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index dcc0c96de..2525ded72 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -742,11 +742,13 @@ class QssColor(CssColor):
         color_func_regexes: Valid function regexes.
     """
 
+    num = r'[0-9]{1,3}%?'
+
     color_func_regexes = [
-        r'rgb\([0-9]{1,3}%?, [0-9]{1,3}%?, [0-9]{1,3}%?\)',
-        r'rgba\([0-9]{1,3}%?, [0-9]{1,3}%?, [0-9]{1,3}%?, [0-9]{1,3}%?\)',
-        r'hsv\([0-9]{1,3}%?, [0-9]{1,3}%?, [0-9]{1,3}%?\)',
-        r'hsva\([0-9]{1,3}%?, [0-9]{1,3}%?, [0-9]{1,3}%?, [0-9]{1,3}%?\)',
+        r'rgb\({},\s*{},\s*{}\)'.format(num, num, num),
+        r'rgba\({},\s*{},\s*{},\s*{}\)'.format(num, num, num, num),
+        r'hsv\({},\s*{},\s*{}\)'.format(num, num, num),
+        r'hsva\({},\s*{},\s*{},\s*{}\)'.format(num, num, num, num),
         r'qlineargradient\(.*\)',
         r'qradialgradient\(.*\)',
         r'qconicalgradient\(.*\)',
diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py
index 2a605c469..729256f68 100644
--- a/tests/unit/config/test_configtypes.py
+++ b/tests/unit/config/test_configtypes.py
@@ -913,12 +913,15 @@ class ColorTests:
         ('foo(1, 2, 3)', []),
 
         ('rgb(0, 0, 0)', [configtypes.QssColor]),
+        ('rgb(0,0,0)', [configtypes.QssColor]),
         ('-foobar(42)', [configtypes.CssColor]),
 
         ('rgba(255, 255, 255, 255)', [configtypes.QssColor]),
+        ('rgba(255,255,255,255)', [configtypes.QssColor]),
         ('hsv(359, 255, 255)', [configtypes.QssColor]),
         ('hsva(359, 255, 255, 255)', [configtypes.QssColor]),
         ('hsv(10%, 10%, 10%)', [configtypes.QssColor]),
+        ('hsv(10%,10%,10%)', [configtypes.QssColor]),
         ('qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 white, '
          'stop: 0.4 gray, stop:1 green)', [configtypes.QssColor]),
         ('qconicalgradient(cx:0.5, cy:0.5, angle:30, stop:0 white, '

From 0efd87af128dc33489bcbd5a74c2d07c7d152621 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 4 May 2016 07:07:24 +0200
Subject: [PATCH 2/2] Clean up formatting of num

---
 qutebrowser/config/configtypes.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index 2525ded72..0273f9ca2 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -745,10 +745,10 @@ class QssColor(CssColor):
     num = r'[0-9]{1,3}%?'
 
     color_func_regexes = [
-        r'rgb\({},\s*{},\s*{}\)'.format(num, num, num),
-        r'rgba\({},\s*{},\s*{},\s*{}\)'.format(num, num, num, num),
-        r'hsv\({},\s*{},\s*{}\)'.format(num, num, num),
-        r'hsva\({},\s*{},\s*{},\s*{}\)'.format(num, num, num, num),
+        r'rgb\({num},\s*{num},\s*{num}\)'.format(num=num),
+        r'rgba\({num},\s*{num},\s*{num},\s*{num}\)'.format(num=num),
+        r'hsv\({num},\s*{num},\s*{num}\)'.format(num=num),
+        r'hsva\({num},\s*{num},\s*{num},\s*{num}\)'.format(num=num),
         r'qlineargradient\(.*\)',
         r'qradialgradient\(.*\)',
         r'qconicalgradient\(.*\)',