From 32cc831500aac7e9de479401fbd8d091bbcd624a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Fale=C5=A1n=C3=ADk?= <mfalesni@redhat.com>
Date: Tue, 6 Feb 2018 16:00:59 +0100
Subject: [PATCH] partial_match: Refactor and make it support None

---
 src/widgetastic/utils.py | 34 ++++++++++++++++++++++++++++++----
 testing/test_utils.py    | 12 ++++++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/widgetastic/utils.py b/src/widgetastic/utils.py
index e5e44444..f3955e0f 100644
--- a/src/widgetastic/utils.py
+++ b/src/widgetastic/utils.py
@@ -547,15 +547,23 @@ def crop_string_middle(s, length=32, cropper='...'):
     return s[:half] + cropper + s[-half - 1:]
 
 
-class partial_match(object):  # noqa
-    """Use this to wrap values to be selected using partial matching in various objects.
+class FillValueWrapper(object):
+    """Base class for fill value wrapping. Subclass to create your own for special treatment.
 
     It proxies all ``get`` operations to the underlying ``item``.
 
     It also proxies ``dir`` so you get the exactly same result of :py:func:`dir` as if you did it
     on the wrapped object.
 
+    If ``None`` is passed as the item, it is passed through so
+    :py:meth:`widgetastic.widget.View.fill` can skip the field
+
     """
+    def __new__(cls, item):
+        if item is None:
+            return None
+        return super(FillValueWrapper, cls).__new__(cls)
+
     def __init__(self, item):
         self.item = item
 
@@ -567,12 +575,30 @@ def __getattr__(self, attr):
 
     def __setattr__(self, attr, value):
         if attr == 'item':
-            super(partial_match, self).__setattr__(attr, value)
+            super(FillValueWrapper, self).__setattr__(attr, value)
         else:
             setattr(self.item, attr, value)
 
     def __repr__(self):
-        return 'partial_match({!r})'.format(self.item)
+        return '{}({!r})'.format(type(self).__name__, self.item)
+
+
+class PartialMatch(FillValueWrapper):
+    """Use this to wrap values to be selected using partial matching in various objects.
+
+    Example may be a ``<select>``. This will select the first item in the select containing "bat":
+
+    .. code-block:: python
+
+        some_view.fill({
+            'foo': 'bar',
+            'baz': PartialMatch('bat')
+        })
+    """
+
+
+# Backwards compatibility
+partial_match = PartialMatch
 
 
 class Ignore(object):
diff --git a/testing/test_utils.py b/testing/test_utils.py
index 700dcc62..75d2f5cb 100644
--- a/testing/test_utils.py
+++ b/testing/test_utils.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import pytest
 
-from widgetastic.utils import nested_getattr, partial_match
+from widgetastic.utils import PartialMatch, nested_getattr, partial_match
 
 
 def test_nested_getattr_wrong_type():
@@ -34,10 +34,18 @@ class bar(object):  # noqa
 
 def test_partial_match_wrapping():
     value = ' foobar '
-    wrapped = partial_match(value)
+    wrapped = PartialMatch(value)
 
     assert dir(wrapped) == dir(value)
 
     assert wrapped.item is value
 
     assert wrapped.strip() == value.strip()
+
+
+def test_partial_match_none():
+    assert PartialMatch(None) is None
+
+
+def test_partial_match_is_partialmatch():
+    assert partial_match is PartialMatch