Merge #8 #13 #14

8: Update mock to 4.0.2 r=aragilar a=pyup-bot


This PR updates [mock](https://pypi.org/project/mock) from **3.0.5** to **4.0.2**.



<details>
  <summary>Changelog</summary>
  
  
   ### 4.0.2
   ```
   -----

- Issue 39915: Ensure :attr:`unittest.mock.AsyncMock.await_args_list` has
  call objects in the order of awaited arguments instead of using
  :attr:`unittest.mock.Mock.call_args` which has the last value of the call.
  Patch by Karthikeyan Singaravelan.
   ```
   
  
  
   ### 4.0.1
   ```
   -----

- Remove the universal marker from the wheel.
   ```
   
  
  
   ### 4.0.0
   ```
   -----

- No Changes from 4.0.0b1.
   ```
   
  
  
   ### 4.0.0b1
   ```
   -------

- The release is a fresh cut of cpython&#39;s `4a686504`__. All changes to :mod:`mock`
  from that commit and before are included in this release along with the
  subsequent changes listed below.

  __ python/cpython@4a68650

- Issue 37972: Subscripts to the `unittest.mock.call` objects now receive
  the same chaining mechanism as any other custom attributes, so that the
  following usage no longer raises a `TypeError`:

  call().foo().__getitem__(&#39;bar&#39;)

  Patch by blhsing

- Issue 38839: Fix some unused functions in tests. Patch by Adam Johnson.

- Issue 39485: Fix a bug in :func:`unittest.mock.create_autospec` that
  would complain about the wrong number of arguments for custom descriptors
  defined in an extension module returning functions.

- Issue 39082: Allow AsyncMock to correctly patch static/class methods

- Issue 38093: Fixes AsyncMock so it doesn&#39;t crash when used with
  AsyncContextManagers or AsyncIterators.

- Issue 38859: AsyncMock now returns StopAsyncIteration on the exaustion of
  a side_effects iterable. Since PEP-479 its Impossible to raise a
  StopIteration exception from a coroutine.

- Issue 38163: Child mocks will now detect their type as either synchronous
  or asynchronous, asynchronous child mocks will be AsyncMocks and
  synchronous child mocks will be either MagicMock or Mock (depending on
  their parent type).

- Issue 38473: Use signature from inner mock for autospecced methods
  attached with :func:`unittest.mock.attach_mock`. Patch by Karthikeyan
  Singaravelan.

- Issue 38136: Changes AsyncMock call count and await count to be two
  different counters. Now await count only counts when a coroutine has been
  awaited, not when it has been called, and vice-versa. Update the
  documentation around this.

- Issue 37555: Fix `NonCallableMock._call_matcher` returning tuple instead
  of `_Call` object when `self._spec_signature` exists. Patch by Elizabeth
  Uselton

- Issue 37251: Remove `__code__` check in AsyncMock that incorrectly
  evaluated function specs as async objects but failed to evaluate classes
  with `__await__` but no `__code__` attribute defined as async objects.

- Issue 38669: Raise :exc:`TypeError` when passing target as a string with
  :meth:`unittest.mock.patch.object`.

- Issue 25597: Ensure, if ``wraps`` is supplied to
  :class:`unittest.mock.MagicMock`, it is used to calculate return values
  for the magic methods instead of using the default return values. Patch by
  Karthikeyan Singaravelan.

- Issue 38108: Any synchronous magic methods on an AsyncMock now return a
  MagicMock. Any asynchronous magic methods on a MagicMock now return an
  AsyncMock.

- Issue 21478: Record calls to parent when autospecced object is attached
  to a mock using :func:`unittest.mock.attach_mock`. Patch by Karthikeyan
  Singaravelan.

- Issue 38857: AsyncMock fix for return values that are awaitable types.
  This also covers side_effect iterable values that happend to be awaitable,
  and wraps callables that return an awaitable type. Before these awaitables
  were being awaited instead of being returned as is.

- Issue 38932: Mock fully resets child objects on reset_mock(). Patch by
  Vegard Stikbakke

- Issue 37685: Fixed ``__eq__``, ``__lt__`` etc implementations in some
  classes. They now return :data:`NotImplemented` for unsupported type of
  the other operand. This allows the other operand to play role (for example
  the equality comparison with :data:`~unittest.mock.ANY` will return
  ``True``).

- Issue 37212: :func:`unittest.mock.call` now preserves the order of
  keyword arguments in repr output. Patch by Karthikeyan Singaravelan.

- Issue 37828: Fix default mock name in
  :meth:`unittest.mock.Mock.assert_called` exceptions. Patch by Abraham
  Toriz Cruz.

- Issue 36871: Improve error handling for the assert_has_calls and
  assert_has_awaits methods of mocks. Fixed a bug where any errors
  encountered while binding the expected calls to the mock&#39;s spec were
  silently swallowed, leading to misleading error output.

- Issue 21600: Fix :func:`mock.patch.stopall` to stop active patches that
  were created with :func:`mock.patch.dict`.

- Issue 38161: Removes _AwaitEvent from AsyncMock.

- Issue 36871: Ensure method signature is used instead of constructor
  signature of a class while asserting mock object against method calls.
  Patch by Karthikeyan Singaravelan.
   ```
   
  
</details>


 

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.org/project/mock
  - Changelog: https://pyup.io/changelogs/mock/
  - Docs: http://mock.readthedocs.org/en/latest/
</details>



13: Add default functions to save user typing r=aragilar a=aragilar



14: Update pylint and astroid r=aragilar a=aragilar



Co-authored-by: pyup-bot <[email protected]>
Co-authored-by: James Tocknell <[email protected]>

doc-requirements.txt

@@ -1,4 +1,4 @@
 sphinx>=1.3
 sphinxcontrib-napoleon>=0.4.3
-mock==3.0.5
+mock==4.0.2
 sphinx_rtd_theme==0.4.3

pylint-requirements.txt

@@ -1,2 +1,2 @@
-astroid==2.3.3
-pylint==2.4.3
+astroid==2.4.1
+pylint==2.5.2

stringtopy/__init__.py

@@ -24,7 +24,7 @@ def str_to_float_converter(use_none_on_fail=False):
     Returns a human friendly float converter, can use use_none_on_fail to
     return None if value cannot be converted.
     """
-    def str_to_float(s):
+    def str_to_float_func(s):
         """
         Convert a string to a float
         """
@@ -34,15 +34,15 @@ def str_to_float(s):
             if use_none_on_fail:
                 return None
             raise
-    return str_to_float
+    return str_to_float_func
 
 
 def str_to_int_converter(use_none_on_fail=False):
     """
     Returns a human friendly int converter, can use use_none_on_fail to return
     None if value cannot be converted.
     """
-    def str_to_int(s):
+    def str_to_int_func(s):
         """
         Convert a string to a int
         """
@@ -55,7 +55,7 @@ def str_to_int(s):
             if use_none_on_fail:
                 return None
             raise
-    return str_to_int
+    return str_to_int_func
 
 
 def str_to_bool_converter(
@@ -90,7 +90,7 @@ def str_to_bool_converter(
             "{} are both True and False".format(boolean_true & boolean_false)
         )
 
-    def str_to_bool(s):
+    def str_to_bool_func(s):
         """
         Convert a string to a bool, based on settings
         """
@@ -100,4 +100,11 @@ def str_to_bool(s):
         if s in boolean_false:
             return False
         raise ValueError("{} is neither True nor False.".format(s))
-    return str_to_bool
+    return str_to_bool_func
+
+
+# versions using defaults so that users can import the actual functions, rather
+# than creating their own
+str_to_float = str_to_float_converter()
+str_to_int = str_to_int_converter()
+str_to_bool = str_to_bool_converter()