Merge branch 'master' into 44-duplicated-traceback

Author: nicoddemus

CHANGELOG.rst

@@ -1,6 +1,8 @@
 1.1
 ---
 
+* From this version onward, ``pytest-mock`` is licensed under the `MIT`_ license (`#45`_).
+
 * Now the plugin also adds introspection information on differing call arguments when
   calling helper methods such as ``assert_called_once_with``. The extra introspection
   information is similar to pytest's and can be disabled with the ``mock_traceback_monkeypatch``
@@ -20,11 +22,19 @@
   anyway plus it generates confusing messages on Python 3.5 due to exception chaining (`#44`_).
   Thanks `@blueyed`_ for the report.
 
+* ``mock.call`` is now aliased as ``mocker.call`` for convenience.
+  Thanks `@jhermann`_ for the PR (`#49`_).
+
 .. _@jurko-gospodnetic: https://github.com/jurko-gospodnetic
 .. _@asfaltboy: https://github.com/asfaltboy
+.. _@jhermann: https://github.com/jhermann
+.. _#45: https://github.com/pytest-dev/pytest-mock/issues/45
 .. _#36: https://github.com/pytest-dev/pytest-mock/issues/36
 .. _#40: https://github.com/pytest-dev/pytest-mock/issues/40
 .. _#44: https://github.com/pytest-dev/pytest-mock/issues/44
+.. _#49: https://github.com/pytest-dev/pytest-mock/issues/49
+.. _MIT: https://github.com/pytest-dev/pytest-mock/blob/master/LICENSE
+
 
 1.0
 ---

LICENSE

@@ -1,165 +1,21 @@
-GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+MIT License
+
+Copyright (c) [2016] [Bruno Oliveira]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.rst

@@ -62,12 +62,13 @@ The supported methods are:
 * ``mocker.stopall()``: stops all active patches up to this point.
 * ``mocker.resetall()``: calls ``reset_mock()`` in all mocked objects up to this point. 
 
-Some objects from the ``mock`` module are accessible directly from ``mocker`` so
-you don't have to import it:
+Some objects from the ``mock`` module are accessible directly from ``mocker`` for convenience:
 
 * `Mock <https://docs.python.org/3/library/unittest.mock.html#unittest.mock.Mock>`_
 * `MagicMock <https://docs.python.org/3/library/unittest.mock.html#unittest.mock.MagicMock>`_
 * `PropertyMock <https://docs.python.org/3/library/unittest.mock.html#unittest.mock.PropertyMock>`_
+* `ANY <https://docs.python.org/3/library/unittest.mock.html#any>`_
+* `call <https://docs.python.org/3/library/unittest.mock.html#call>`_ *(Version 1.1)*
 
 
 Spy
@@ -247,3 +248,11 @@ Although mocker's API is intentionally the same as ``mock.patch``'s, its uses as
     in test_context_manager
         with mocker.patch.object(a, 'doIt', return_value=True, autospec=True):
     E   AttributeError: __exit__
+
+
+License
+=======
+
+Distributed under the terms of the `MIT`_ license.
+
+.. _MIT: https://github.com/pytest-dev/pytest-mock/blob/master/LICENSE

pytest_mock.py

@@ -20,6 +20,7 @@ class MockFixture(object):
     Mock = mock_module.Mock
     MagicMock = mock_module.MagicMock
     PropertyMock = mock_module.PropertyMock
+    call = mock_module.call
     ANY = mock_module.ANY
 
     def __init__(self):

setup.py

@@ -22,17 +22,17 @@
         ':python_version=="2.6" or python_version=="2.7"': ['mock'],
     },
     url='https://github.com/pytest-dev/pytest-mock/',
-    license='LGPL',
+    license='MIT',
     author='Bruno Oliveira',
     author_email='nicoddemus@gmail.com',
     description='Thin-wrapper around the mock package for easier use with py.test',
     long_description=open('README.rst').read(),
     keywords="pytest mock",
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Framework :: Pytest',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
+        'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',

test_pytest_mock.py

@@ -132,25 +132,12 @@ def test_deprecated_mock(mock, tmpdir):
     assert os.listdir(str(tmpdir)) == []
 
 
-def test_mocker_has_magic_mock_class_as_attribute_for_instantiation():
+@pytest.mark.parametrize('name', ['MagicMock', 'PropertyMock', 'Mock', 'call', 'ANY'])
+def test_mocker_aliases(name):
     from pytest_mock import mock_module, MockFixture
 
     mocker = MockFixture()
-    assert isinstance(mocker.MagicMock(), mock_module.MagicMock)
-
-
-def test_mocker_has_property_mock_class_as_attribute_for_instantiation():
-    from pytest_mock import mock_module, MockFixture
-
-    mocker = MockFixture()
-    assert isinstance(mocker.PropertyMock(), mock_module.PropertyMock)
-
-
-def test_mocker_has_mock_class_as_attribute_for_instantiation():
-    from pytest_mock import mock_module, MockFixture
-
-    mocker = MockFixture()
-    assert isinstance(mocker.Mock(), mock_module.Mock)
+    assert getattr(mocker, name) is getattr(mock_module, name)
 
 
 def test_mocker_resetall(mocker):