Hello community,
here is the log from the commit of package python-mockito for openSUSE:Factory
checked in at 2013-12-09 17:01:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-mockito (Old)
and /work/SRC/openSUSE:Factory/.python-mockito.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-mockito"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-mockito/python-mockito.changes
2013-10-25 11:22:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-mockito.new/python-mockito.changes
2013-12-09 17:01:10.000000000 +0100
@@ -1,0 +2,11 @@
+Sun Dec 8 16:15:34 UTC 2013 - p.drou...@gmail.com
+
+- Update to version 0.5.2
+ + No changelog available
+- Remove redundant %clean section
+- Adapt setup.py.patch to upstream changes
+- Rename it to respect standard naming conventions
+- Remove python-mockito.rpmlintrc; problem of execution bits have
+ been fixed by upstream
+
+-------------------------------------------------------------------
Old:
----
mockito-0.5.1.tar.gz
python-mockito.rpmlintrc
setup.py.patch
New:
----
mockito-0.5.2.tar.gz
python-mockito-0.5.2-setup.py.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-mockito.spec ++++++
--- /var/tmp/diff_new_pack.nxQobc/_old 2013-12-09 17:01:10.000000000 +0100
+++ /var/tmp/diff_new_pack.nxQobc/_new 2013-12-09 17:01:10.000000000 +0100
@@ -19,14 +19,14 @@
%define mod_name mockito
Name: python-%{mod_name}
-Version: 0.5.1
+Version: 0.5.2
Release: 0
Url: http://code.google.com/p/mockito-python
Summary: Spying framework
License: MIT
Group: Development/Languages/Python
-Source: %{mod_name}-%{version}.tar.gz
-Patch0: setup.py.patch
+Source:
https://pypi.python.org/packages/source/m/mockito/%{mod_name}-%{version}.tar.gz
+Patch0: python-mockito-0.5.2-setup.py.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
BuildRequires: python-nose
@@ -50,9 +50,6 @@
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{python_sitelib}/*
++++++ mockito-0.5.1.tar.gz -> mockito-0.5.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/AUTHORS new/mockito-0.5.2/AUTHORS
--- old/mockito-0.5.1/AUTHORS 1970-01-01 01:00:00.000000000 +0100
+++ new/mockito-0.5.2/AUTHORS 2013-10-21 05:19:52.000000000 +0200
@@ -0,0 +1,4 @@
+Szczepan Faber
+Serhiy Oplakanets
+Herr Kaste
+Justin Hopper
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/LICENSE new/mockito-0.5.2/LICENSE
--- old/mockito-0.5.1/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ new/mockito-0.5.2/LICENSE 2013-10-21 06:01:56.000000000 +0200
@@ -0,0 +1,19 @@
+Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+
+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.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/MANIFEST.in
new/mockito-0.5.2/MANIFEST.in
--- old/mockito-0.5.1/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100
+++ new/mockito-0.5.2/MANIFEST.in 2013-10-21 07:20:41.000000000 +0200
@@ -0,0 +1,5 @@
+recursive-include mockito_test *.py
+
+include AUTHORS
+include LICENSE
+include README.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/PKG-INFO new/mockito-0.5.2/PKG-INFO
--- old/mockito-0.5.1/PKG-INFO 2010-08-04 15:57:40.000000000 +0200
+++ new/mockito-0.5.2/PKG-INFO 2013-10-21 18:35:26.000000000 +0200
@@ -1,9 +1,9 @@
Metadata-Version: 1.0
Name: mockito
-Version: 0.5.1
+Version: 0.5.2
Summary: Spying framework
Home-page: http://code.google.com/p/mockito-python
-Author: Mockito Maintainers
+Author: Justin Hopper
Author-email: mockito-pyt...@googlegroups.com
License: MIT
Download-URL: http://code.google.com/p/mockito-python/downloads/list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/README new/mockito-0.5.2/README
--- old/mockito-0.5.1/README 2010-08-04 15:46:40.000000000 +0200
+++ new/mockito-0.5.2/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-Mockito is a spying framework based on Java library with the same name.
-
-1. To install:
-
- $ python setup.py install
-
-2. To run all tests:
-
- $ python setup.py test
-
-3. For more info, see:
-
- http://code.google.com/p/mockito-python/
-
- Feel free to contribute more documentation or feedback!
-
-4. Our user and developer discussion group is:
-
- http://groups.google.com/group/mockito-python
-
-5. Mockito is licensed under the MIT license
-
-6. Library was tested with the following Python versions:
-
- Python 2.4.6
- Python 2.5.4
- Python 2.6.1
- Python 2.7
- Python 3.1.2
-
-7. (Generated from mockito_demo_test.py) Basic usage:
-
- import unittest
- from mockito import mock, when, verify
-
- class DemoTest(unittest.TestCase):
- def testStubbing(self):
- # create a mock
- ourMock = mock()
-
- # stub it
- when(ourMock).getStuff("cool").thenReturn("cool stuff")
-
- # use the mock
- self.assertEqual("cool stuff", ourMock.getStuff("cool"))
-
- # what happens when you pass different argument?
- self.assertEqual(None, ourMock.getStuff("different argument"))
-
- def testVerification(self):
- # create a mock
- theMock = mock()
-
- # use the mock
- theMock.doStuff("cool")
-
- # verify the interactions. Method and parameters must match. Otherwise
verification error.
- verify(theMock).doStuff("cool")
-
-
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/README.rst new/mockito-0.5.2/README.rst
--- old/mockito-0.5.1/README.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/mockito-0.5.2/README.rst 2013-10-21 06:07:12.000000000 +0200
@@ -0,0 +1,60 @@
+Mockito is a spying framework based on Java library with the same name.
+
+1. To install:
+
+ $ python setup.py install
+
+2. To run all tests:
+
+ $ python setup.py test
+
+3. For more info, see:
+
+ __ http://code.google.com/p/mockito-python/
+
+ Feel free to contribute more documentation or feedback!
+
+4. Our user and developer discussion group is:
+
+ __ http://groups.google.com/group/mockito-python
+
+5. Mockito is licensed under the MIT license
+
+6. Library was tested with the following Python versions:
+
+ Python 2.4.6
+ Python 2.5.4
+ Python 2.6.1
+ Python 2.7
+ Python 3.1.2
+
+7. (Generated from mockito_demo_test.py) Basic usage:
+
+ import unittest
+ from mockito import mock, when, verify
+
+ class DemoTest(unittest.TestCase):
+ def testStubbing(self):
+ # create a mock
+ ourMock = mock()
+
+ # stub it
+ when(ourMock).getStuff("cool").thenReturn("cool stuff")
+
+ # use the mock
+ self.assertEqual("cool stuff", ourMock.getStuff("cool"))
+
+ # what happens when you pass different argument?
+ self.assertEqual(None, ourMock.getStuff("different argument"))
+
+ def testVerification(self):
+ # create a mock
+ theMock = mock()
+
+ # use the mock
+ theMock.doStuff("cool")
+
+ # verify the interactions. Method and parameters must match. Otherwise
verification error.
+ verify(theMock).doStuff("cool")
+
+
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito/__init__.py
new/mockito-0.5.2/mockito/__init__.py
--- old/mockito-0.5.1/mockito/__init__.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito/__init__.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,12 +1,25 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
'''Mockito is a Test Spy framework.'''
-__copyright__ = "Copyright 2008-2010, Mockito Contributors"
-__license__ = "MIT"
-__maintainer__ = "Mockito Maintainers"
-__email__ = "mockito-pyt...@googlegroups.com"
from mockito import mock, verify, verifyNoMoreInteractions,
verifyZeroInteractions, when, unstub, ArgumentError
import inorder
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito/inorder.py
new/mockito-0.5.2/mockito/inorder.py
--- old/mockito-0.5.1/mockito/inorder.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito/inorder.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,13 +1,27 @@
-#!/usr/bin/env python3
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
from mockito import verify as verify_main
__author__ = "Serhiy Oplakanets <ser...@oplakanets.com>"
-__copyright__ = "Copyright 2008-2010, Mockito Contributors"
-__license__ = "MIT"
-__maintainer__ = "Mockito Maintainers"
-__email__ = "mockito-pyt...@googlegroups.com"
+
def verify(object, *args, **kwargs):
kwargs['inorder'] = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito/invocation.py
new/mockito-0.5.2/mockito/invocation.py
--- old/mockito-0.5.1/mockito/invocation.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito/invocation.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,12 +1,25 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
import matchers
-__copyright__ = "Copyright 2008-2010, Mockito Contributors"
-__license__ = "MIT"
-__maintainer__ = "Mockito Maintainers"
-__email__ = "mockito-pyt...@googlegroups.com"
class InvocationError(AssertionError):
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito/matchers.py
new/mockito-0.5.2/mockito/matchers.py
--- old/mockito-0.5.1/mockito/matchers.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito/matchers.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,18 +1,31 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
'''Matchers for stubbing and verifications.
Common matchers for use in stubbing and verifications.
'''
-__copyright__ = "Copyright 2008-2010, Mockito Contributors"
-__license__ = "MIT"
-__maintainer__ = "Mockito Maintainers"
-__email__ = "mockito-pyt...@googlegroups.com"
-
__all__ = ['any', 'contains', 'times']
+
class Matcher:
def matches(self, arg):
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito/mock_registry.py
new/mockito-0.5.2/mockito/mock_registry.py
--- old/mockito-0.5.1/mockito/mock_registry.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito/mock_registry.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
class MockRegistry:
"""Registers mock()s, ensures that we only have one mock() per mocked_obj,
and
iterates over them to unstub each stubbed method. """
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito/mocking.py
new/mockito-0.5.2/mockito/mocking.py
--- old/mockito-0.5.1/mockito/mocking.py 2010-08-04 15:47:02.000000000
+0200
+++ new/mockito-0.5.2/mockito/mocking.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,15 +1,28 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
import inspect
import invocation
from mock_registry import mock_registry
import warnings
-__copyright__ = "Copyright 2008-2010, Mockito Contributors"
-__license__ = "MIT"
-__maintainer__ = "Mockito Maintainers"
-__email__ = "mockito-pyt...@googlegroups.com"
__all__ = ['mock', 'Mock']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito/mockito.py
new/mockito-0.5.2/mockito/mockito.py
--- old/mockito-0.5.1/mockito/mockito.py 2010-08-04 15:47:02.000000000
+0200
+++ new/mockito-0.5.2/mockito/mockito.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,15 +1,28 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
import verification
from mocking import mock, TestDouble
from mock_registry import mock_registry
from verification import VerificationError
-__copyright__ = "Copyright 2008-2010, Mockito Contributors"
-__license__ = "MIT"
-__maintainer__ = "Mockito Maintainers"
-__email__ = "mockito-pyt...@googlegroups.com"
class ArgumentError(Exception):
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito/spying.py
new/mockito-0.5.2/mockito/spying.py
--- old/mockito-0.5.1/mockito/spying.py 2010-08-04 15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito/spying.py 2013-10-21 07:09:51.000000000 +0200
@@ -1,5 +1,22 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
'''Spying on real objects.'''
@@ -7,10 +24,6 @@
from mocking import TestDouble
__author__ = "Serhiy Oplakanets <ser...@oplakanets.com>"
-__copyright__ = "Copyright 2009-2010, Mockito Contributors"
-__license__ = "MIT"
-__maintainer__ = "Mockito Maintainers"
-__email__ = "mockito-pyt...@googlegroups.com"
__all__ = ['spy']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito/verification.py
new/mockito-0.5.2/mockito/verification.py
--- old/mockito-0.5.1/mockito/verification.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito/verification.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,10 +1,22 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-__copyright__ = "Copyright 2008-2010, Mockito Contributors"
-__license__ = "MIT"
-__maintainer__ = "Mockito Maintainers"
-__email__ = "mockito-pyt...@googlegroups.com"
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
__all__ = ['never', 'VerificationError']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito.egg-info/PKG-INFO
new/mockito-0.5.2/mockito.egg-info/PKG-INFO
--- old/mockito-0.5.1/mockito.egg-info/PKG-INFO 2010-08-04 15:57:40.000000000
+0200
+++ new/mockito-0.5.2/mockito.egg-info/PKG-INFO 2013-10-21 18:35:26.000000000
+0200
@@ -1,9 +1,9 @@
Metadata-Version: 1.0
Name: mockito
-Version: 0.5.1
+Version: 0.5.2
Summary: Spying framework
Home-page: http://code.google.com/p/mockito-python
-Author: Mockito Maintainers
+Author: Justin Hopper
Author-email: mockito-pyt...@googlegroups.com
License: MIT
Download-URL: http://code.google.com/p/mockito-python/downloads/list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito.egg-info/SOURCES.txt
new/mockito-0.5.2/mockito.egg-info/SOURCES.txt
--- old/mockito-0.5.1/mockito.egg-info/SOURCES.txt 2010-08-04
15:57:40.000000000 +0200
+++ new/mockito-0.5.2/mockito.egg-info/SOURCES.txt 2013-10-21
18:35:26.000000000 +0200
@@ -1,4 +1,7 @@
-README
+AUTHORS
+LICENSE
+MANIFEST.in
+README.rst
distribute_setup.py
setup.cfg
setup.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/__init__.py
new/mockito-0.5.2/mockito_test/__init__.py
--- old/mockito-0.5.1/mockito_test/__init__.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito_test/__init__.py 2013-10-21 07:09:51.000000000
+0200
@@ -0,0 +1,19 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/classmethods_test.py
new/mockito-0.5.2/mockito_test/classmethods_test.py
--- old/mockito-0.5.1/mockito_test/classmethods_test.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/classmethods_test.py 2013-10-21
07:05:15.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
from test_base import *
from mockito import *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/demo_test.py
new/mockito-0.5.2/mockito_test/demo_test.py
--- old/mockito-0.5.1/mockito_test/demo_test.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito_test/demo_test.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,5 +1,22 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
import mockito_util.write_readme
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/instancemethods_test.py
new/mockito-0.5.2/mockito_test/instancemethods_test.py
--- old/mockito-0.5.1/mockito_test/instancemethods_test.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/instancemethods_test.py 2013-10-21
07:09:51.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
from test_base import *
from mockito import *
from mockito.invocation import InvocationError
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/matchers_test.py
new/mockito-0.5.2/mockito_test/matchers_test.py
--- old/mockito-0.5.1/mockito_test/matchers_test.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/matchers_test.py 2013-10-21
07:09:51.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
from test_base import *
from mockito import mock, verify, contains
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/mockingexacttypes_test.py
new/mockito-0.5.2/mockito_test/mockingexacttypes_test.py
--- old/mockito-0.5.1/mockito_test/mockingexacttypes_test.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/mockingexacttypes_test.py 2013-10-21
07:09:51.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
from test_base import *
from mockito.invocation import InvocationError
from mockito import mock, when
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/modulefunctions_test.py
new/mockito-0.5.2/mockito_test/modulefunctions_test.py
--- old/mockito-0.5.1/mockito_test/modulefunctions_test.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/modulefunctions_test.py 2013-10-21
07:09:51.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
from test_base import *
from mockito import *
from mockito.invocation import InvocationError
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/spying_test.py
new/mockito-0.5.2/mockito_test/spying_test.py
--- old/mockito-0.5.1/mockito_test/spying_test.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/spying_test.py 2013-10-21
07:09:51.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
#!/usr/bin/env python
# coding: utf-8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/staticmethods_test.py
new/mockito-0.5.2/mockito_test/staticmethods_test.py
--- old/mockito-0.5.1/mockito_test/staticmethods_test.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/staticmethods_test.py 2013-10-21
07:09:51.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
from test_base import *
from mockito import *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/stubbing_test.py
new/mockito-0.5.2/mockito_test/stubbing_test.py
--- old/mockito-0.5.1/mockito_test/stubbing_test.py 2010-08-04
15:47:02.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/stubbing_test.py 2013-10-21
07:09:51.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
from test_base import *
from mockito import mock, when, verify, times, any
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/test_base.py
new/mockito-0.5.2/mockito_test/test_base.py
--- old/mockito-0.5.1/mockito_test/test_base.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito_test/test_base.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,5 +1,22 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
import unittest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mockito-0.5.1/mockito_test/verification_errors_test.py
new/mockito-0.5.2/mockito_test/verification_errors_test.py
--- old/mockito-0.5.1/mockito_test/verification_errors_test.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/verification_errors_test.py 2013-10-21
07:09:51.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
from test_base import *
from mockito import mock, when, verify, VerificationError,
verifyNoMoreInteractions
from mockito.verification import never
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_test/verifications_test.py
new/mockito-0.5.2/mockito_test/verifications_test.py
--- old/mockito-0.5.1/mockito_test/verifications_test.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_test/verifications_test.py 2013-10-21
07:09:51.000000000 +0200
@@ -1,5 +1,22 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
from test_base import TestBase, main
from mockito import mock, verify, inorder, VerificationError , ArgumentError,
verifyNoMoreInteractions, verifyZeroInteractions, any
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_util/__init__.py
new/mockito-0.5.2/mockito_util/__init__.py
--- old/mockito-0.5.1/mockito_util/__init__.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito_util/__init__.py 2013-10-21 07:09:51.000000000
+0200
@@ -0,0 +1,19 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_util/test.py
new/mockito-0.5.2/mockito_util/test.py
--- old/mockito-0.5.1/mockito_util/test.py 2010-08-04 15:46:40.000000000
+0200
+++ new/mockito-0.5.2/mockito_util/test.py 2013-10-21 07:09:51.000000000
+0200
@@ -1,5 +1,22 @@
-#!/usr/bin/env python
-# coding: utf-8
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
from unittest import TestLoader as BaseTestLoader, TestSuite
import sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/mockito_util/write_readme.py
new/mockito-0.5.2/mockito_util/write_readme.py
--- old/mockito-0.5.1/mockito_util/write_readme.py 2010-08-04
15:46:40.000000000 +0200
+++ new/mockito-0.5.2/mockito_util/write_readme.py 2013-10-21
07:19:29.000000000 +0200
@@ -1,3 +1,23 @@
+# Copyright (c) 2008-2013 Szczepan Faber, Serhiy Oplakanets, Herr Kaste
+#
+# 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.
+
import os
import re
@@ -10,12 +30,12 @@
demo_test = ' '.join(openFile('mockito_test/demo_test.py').readlines())
demo_test = demo_test.split('#DELIMINATOR')[1]
-readme_before = ''.join(openFile('README').readlines())
+readme_before = ''.join(openFile('README.rst').readlines())
token = 'Basic usage:'
readme_after = re.compile(token + '.*', re.S).sub(token + '\n' + demo_test,
readme_before)
if (readme_before != readme_after):
- readme_file = openFile('README', 'w')
+ readme_file = openFile('README.rst', 'w')
readme_file.write(readme_after)
print "README updated"
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/setup.cfg new/mockito-0.5.2/setup.cfg
--- old/mockito-0.5.1/setup.cfg 2010-08-04 15:57:40.000000000 +0200
+++ new/mockito-0.5.2/setup.cfg 2013-10-21 18:35:26.000000000 +0200
@@ -1,9 +1,9 @@
+[nosetests]
+where = mockito_test
+detailed-errors = 1
+
[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0
-[nosetests]
-detailed-errors = 1
-where = mockito_test
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mockito-0.5.1/setup.py new/mockito-0.5.2/setup.py
--- old/mockito-0.5.1/setup.py 2010-08-04 15:47:39.000000000 +0200
+++ new/mockito-0.5.2/setup.py 2013-10-21 06:09:43.000000000 +0200
@@ -5,21 +5,21 @@
use_setuptools()
try:
- from setuptools import setup
+ from setuptools import setup
except ImportError:
- from distutils.core import setup
+ from distutils.core import setup
import sys
extra = {}
if sys.version_info >= (3,):
- extra['use_2to3'] = True
+ extra['use_2to3'] = True
setup(name='mockito',
- version='0.5.1',
+ version='0.5.2',
packages=['mockito', 'mockito_test', 'mockito_util'],
url='http://code.google.com/p/mockito-python',
download_url='http://code.google.com/p/mockito-python/downloads/list',
- maintainer='Mockito Maintainers',
+ maintainer='Justin Hopper',
maintainer_email='mockito-pyt...@googlegroups.com',
license='MIT',
description='Spying framework',
@@ -30,9 +30,8 @@
'Topic :: Software Development :: Testing',
'Programming Language :: Python :: 3'
],
- test_suite = 'nose.collector',
- py_modules = ['distribute_setup'],
- setup_requires = ['nose'],
- **extra
-)
+ test_suite='nose.collector',
+ py_modules=['distribute_setup'],
+ setup_requires=['nose'],
+ **extra)
++++++ python-mockito-0.5.2-setup.py.patch ++++++
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,6 @@
#!/usr/bin/env python
# coding: utf-8
-from distribute_setup import use_setuptools
-use_setuptools()
-
try:
from setuptools import setup
except ImportError:
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
