1
=== modified file 'lib/fixtures/_fixtures/monkeypatch.py'
2
--- lib/fixtures/_fixtures/monkeypatch.py	2012-07-04 17:51:59 +0000
3
+++ lib/fixtures/_fixtures/monkeypatch.py	2014-01-19 02:22:26 +0000
4
@@ -17,6 +17,9 @@
5
17
    'MonkeyPatch'
17
    'MonkeyPatch'
6
18
    ]
18
    ]
7
19
19
8
20
import sys
9
21
import types
10
22
11
20
from fixtures import Fixture
23
from fixtures import Fixture
12
21
24
13
22
25
14
@@ -62,6 +65,11 @@
15
62
        if old_value is sentinel:
65
        if old_value is sentinel:
16
63
            self.addCleanup(self._safe_delete, current, attribute)
66
            self.addCleanup(self._safe_delete, current, attribute)
17
64
        else:
67
        else:
18
68
            # Python 2's setattr transforms function into instancemethod
19
69
            if (sys.version_info.major == 2 and
20
70
                isinstance(current, (type, types.ClassType)) and
21
71
                isinstance(old_value, types.FunctionType)):
22
72
                    old_value = staticmethod(old_value)
23
65
            self.addCleanup(setattr, current, attribute, old_value)
73
            self.addCleanup(setattr, current, attribute, old_value)
24
66
74
25
67
    def _safe_delete(self, obj, attribute):
75
    def _safe_delete(self, obj, attribute):
26
68
76
27
=== modified file 'lib/fixtures/tests/_fixtures/test_monkeypatch.py'
28
--- lib/fixtures/tests/_fixtures/test_monkeypatch.py	2012-07-04 17:51:59 +0000
29
+++ lib/fixtures/tests/_fixtures/test_monkeypatch.py	2014-01-19 02:22:26 +0000
30
@@ -19,6 +19,11 @@
31
19
19
32
20
reference = 23
20
reference = 23
33
21
21
34
22
class C(object):
35
23
    @staticmethod
36
24
    def foo(): pass
37
25
def bar(): pass
38
26
39
22
class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
27
class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
40
23
28
41
24
    def test_patch_and_restore(self):
29
    def test_patch_and_restore(self):
42
@@ -66,3 +71,13 @@
43
66
        finally:
71
        finally:
44
67
            fixture.cleanUp()
72
            fixture.cleanUp()
45
68
            self.assertFalse('new_attr' in globals())
73
            self.assertFalse('new_attr' in globals())
46
74
47
75
    def test_patch_staticmethod(self):
48
76
        oldfoo = C.foo
49
77
        fixture = MonkeyPatch(
50
78
            'fixtures.tests._fixtures.test_monkeypatch.C.foo',
51
79
            bar)
52
80
        with fixture:
53
81
            pass
54
82
        self.assertEqual(oldfoo, C.foo)
55
83
Status:	Merged
Merged at revision:	76
Proposed branch:	lp:~danken/python-fixtures/staticmethod
Merge into:	lp:~python-fixtures/python-fixtures/trunk
Diff against target:	55 lines (+23/-0) 2 files modified lib/fixtures/_fixtures/monkeypatch.py (+8/-0) lib/fixtures/tests/_fixtures/test_monkeypatch.py (+15/-0)
To merge this branch:	bzr merge lp:~danken/python-fixtures/staticmethod
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
python-fixtures committers		2014-01-19	Pending
Review via email: mp+202207@code.launchpad.net
1	=== modified file 'lib/fixtures/_fixtures/monkeypatch.py'
2	--- lib/fixtures/_fixtures/monkeypatch.py 2012-07-04 17:51:59 +0000
3	+++ lib/fixtures/_fixtures/monkeypatch.py 2014-01-19 02:22:26 +0000
4	@@ -17,6 +17,9 @@
5	17	'MonkeyPatch'	17	'MonkeyPatch'
6	18	]	18	]
7	19		19
8			20	import sys
9			21	import types
10			22
11	20	from fixtures import Fixture	23	from fixtures import Fixture
12	21		24
13	22		25
14	@@ -62,6 +65,11 @@
15	62	if old_value is sentinel:	65	if old_value is sentinel:
16	63	self.addCleanup(self._safe_delete, current, attribute)	66	self.addCleanup(self._safe_delete, current, attribute)
17	64	else:	67	else:
18			68	# Python 2's setattr transforms function into instancemethod
19			69	if (sys.version_info.major == 2 and
20			70	isinstance(current, (type, types.ClassType)) and
21			71	isinstance(old_value, types.FunctionType)):
22			72	old_value = staticmethod(old_value)
23	65	self.addCleanup(setattr, current, attribute, old_value)	73	self.addCleanup(setattr, current, attribute, old_value)
24	66		74
25	67	def _safe_delete(self, obj, attribute):	75	def _safe_delete(self, obj, attribute):
26	68		76
27	=== modified file 'lib/fixtures/tests/_fixtures/test_monkeypatch.py'
28	--- lib/fixtures/tests/_fixtures/test_monkeypatch.py 2012-07-04 17:51:59 +0000
29	+++ lib/fixtures/tests/_fixtures/test_monkeypatch.py 2014-01-19 02:22:26 +0000
30	@@ -19,6 +19,11 @@
31	19		19
32	20	reference = 23	20	reference = 23
33	21		21
34			22	class C(object):
35			23	@staticmethod
36			24	def foo(): pass
37			25	def bar(): pass
38			26
39	22	class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):	27	class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
40	23		28
41	24	def test_patch_and_restore(self):	29	def test_patch_and_restore(self):
42	@@ -66,3 +71,13 @@
43	66	finally:	71	finally:
44	67	fixture.cleanUp()	72	fixture.cleanUp()
45	68	self.assertFalse('new_attr' in globals())	73	self.assertFalse('new_attr' in globals())
46			74
47			75	def test_patch_staticmethod(self):
48			76	oldfoo = C.foo
49			77	fixture = MonkeyPatch(
50			78	'fixtures.tests._fixtures.test_monkeypatch.C.foo',
51			79	bar)
52			80	with fixture:
53			81	pass
54			82	self.assertEqual(oldfoo, C.foo)
55			83