1 --- sure-2.0.0/setup.py.orig 2018-05-16 23:37:56.000000000 +0200
2 +++ sure-2.0.0/setup.py 2020-06-06 07:54:38.467908573 +0200
7 -install_requires = ["mock", "six"]
8 +install_requires = ['mock;python_version<"3"', "six"]
9 tests_require = ["nose"]
10 version = read_version()
12 --- sure-1.4.11/sure/core.py.orig 2018-03-17 23:31:48.000000000 +0100
13 +++ sure-1.4.11/sure/core.py 2020-06-06 07:56:27.183986275 +0200
18 - from mock import _CallList
19 + from unittest.mock import _CallList
21 - from mock.mock import _CallList
23 + from mock import _CallList
25 + from mock.mock import _CallList
29 --- sure-1.4.11/tests/test_assertion_builder.py.orig 2017-03-20 14:51:42.000000000 +0100
30 +++ sure-1.4.11/tests/test_assertion_builder.py 2020-06-06 07:58:55.016518731 +0200
32 # along with this program. If not, see <http://www.gnu.org/licenses/>.
33 from __future__ import unicode_literals
37 + from unittest import mock
40 from collections import OrderedDict
42 from datetime import datetime, timedelta
45 except AssertionError as e:
47 - expect(str(e)).to.equal("When calling 'blah [tests/test_assertion_builder.py line 635]' the exception message does not match. Expected to match regex: u'invalid regex'\n against:\n u'this message'")
48 + expect(str(e)).to.equal("When calling 'blah [tests/test_assertion_builder.py line 638]' the exception message does not match. Expected to match regex: u'invalid regex'\n against:\n u'this message'")
50 - expect(str(e)).to.equal("When calling b'blah [tests/test_assertion_builder.py line 635]' the exception message does not match. Expected to match regex: 'invalid regex'\n against:\n 'this message'")
51 + expect(str(e)).to.equal("When calling b'blah [tests/test_assertion_builder.py line 638]' the exception message does not match. Expected to match regex: 'invalid regex'\n against:\n 'this message'")
54 expect(blah).when.called_with(1).should.throw(ValueError, re.compile(r'invalid regex'))
55 raise RuntimeError('should not have reached here')
56 except AssertionError as e:
58 - expect(str(e)).to.equal("When calling 'blah [tests/test_assertion_builder.py line 635]' the exception message does not match. Expected to match regex: u'invalid regex'\n against:\n u'this message'")
59 + expect(str(e)).to.equal("When calling 'blah [tests/test_assertion_builder.py line 638]' the exception message does not match. Expected to match regex: u'invalid regex'\n against:\n u'this message'")
61 - expect(str(e)).to.equal("When calling b'blah [tests/test_assertion_builder.py line 635]' the exception message does not match. Expected to match regex: 'invalid regex'\n against:\n 'this message'")
62 + expect(str(e)).to.equal("When calling b'blah [tests/test_assertion_builder.py line 638]' the exception message does not match. Expected to match regex: 'invalid regex'\n against:\n 'this message'")
64 def test_should_not_be_different():
65 ("'something'.should_not.be.different('SOMETHING'.lower())")