1
=== modified file 'src/lazr/restful/NEWS.txt'
2
--- src/lazr/restful/NEWS.txt	2018-02-21 15:18:34 +0000
3
+++ src/lazr/restful/NEWS.txt	2018-09-28 14:30:01 +0000
4
@@ -2,6 +2,14 @@
5
2
NEWS for lazr.restful
2
NEWS for lazr.restful
6
3
=====================
3
=====================
7
4
4
8
5
0.21.0
9
6
======
10
7
11
8
Fix IDjangoLocation for compatibility with zope.traversing >= 3.13, which
12
9
only adapts objects to ILocation if they do not have a __parent__ attribute.
13
10
Objects implementing IDjangoLocation must now have a __parent_object__
14
11
attribute instead of __parent__.
15
12
16
5
0.20.1 (2018-02-21)
13
0.20.1 (2018-02-21)
17
6
===================
14
===================
18
7
15
19
8
16
20
=== modified file 'src/lazr/restful/docs/django.txt'
21
--- src/lazr/restful/docs/django.txt	2016-02-17 01:07:21 +0000
22
+++ src/lazr/restful/docs/django.txt	2018-09-28 14:30:01 +0000
23
@@ -151,7 +151,7 @@
24
151
    ... class SubordinateResource:
151
    ... class SubordinateResource:
25
152
    ...
152
    ...
26
153
    ...     @property
153
    ...     @property
28
154
    ...     def __parent__(self):
154
    ...     def __parent_object__(self):
29
155
    ...         return DummyRootResource()
155
    ...         return DummyRootResource()
30
156
    ...
156
    ...
31
157
    ...     @property
157
    ...     @property
32
158
158
33
=== modified file 'src/lazr/restful/frameworks/django.py'
34
--- src/lazr/restful/frameworks/django.py	2016-02-17 01:07:21 +0000
35
+++ src/lazr/restful/frameworks/django.py	2018-09-28 14:30:01 +0000
36
@@ -65,13 +65,15 @@
37
65
65
38
66
    The problem with ILocation is that you have to define __name__,
66
    The problem with ILocation is that you have to define __name__,
39
67
    and the Django metaclass won't let you assign a property to
67
    and the Django metaclass won't let you assign a property to
41
68
    __name__.
68
    __name__.  We also can't use __parent__ here, because that will
42
69
    confuse AbsoluteURL into thinking that this can be treated as an
43
70
    ILocation.
44
69
    """
71
    """
45
70
72
46
71
    def __url_path__(self):
73
    def __url_path__(self):
47
72
        """The URL path for this object."""
74
        """The URL path for this object."""
48
73
75
50
74
    def __parent__(self):
76
    def __parent_object__(self):
51
75
        """This object's parent in the object tree."""
77
        """This object's parent in the object tree."""
52
76
78
53
77
# We want a raised django.core.exceptions.ObjectDoesNotExist
79
# We want a raised django.core.exceptions.ObjectDoesNotExist
54
@@ -102,7 +104,7 @@
55
102
104
56
103
    @property
105
    @property
57
104
    def __parent__(self):
106
    def __parent__(self):
59
105
        return self.context.__parent__
107
        return self.context.__parent_object__
60
106
108
61
107
    @property
109
    @property
62
108
    def __name__(self):
110
    def __name__(self):
Status:	Merged
Merged at revision:	220
Proposed branch:	lp:~cjwatson/lazr.restful/django-zope-compatibility
Merge into:	lp:lazr.restful
Diff against target:	62 lines (+14/-4) 3 files modified src/lazr/restful/NEWS.txt (+8/-0) src/lazr/restful/docs/django.txt (+1/-1) src/lazr/restful/frameworks/django.py (+5/-3)
To merge this branch:	bzr merge lp:~cjwatson/lazr.restful/django-zope-compatibility
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
William Grant	code	2018-09-28	Approve on 2018-10-01
Review via email: mp+355840@code.launchpad.net