Merge lp:~cjwatson/lazr.restful/django-zope-compatibility into lp:lazr.restful

[Colin Watson]

Fix IDjangoLocation for compatibility with zope.traversing >= 3.13.

This is an API break, but I don't see a good alternative. (I'm also not sure I've ever heard of anyone using this Django support code, so I'm not too worried.)

[William Grant (wgrant)]

lazr.restful.django was presumably introduced for SSO, which no longer uses lazr.restful.

review: Approve (code)

=== modified file 'src/lazr/restful/NEWS.txt'
--- src/lazr/restful/NEWS.txt	2018-02-21 15:18:34 +0000
+++ src/lazr/restful/NEWS.txt	2018-09-28 14:30:01 +0000
@@ -2,6 +2,14 @@
 NEWS for lazr.restful
 =====================
 
+0.21.0
+======
+
+Fix IDjangoLocation for compatibility with zope.traversing >= 3.13, which
+only adapts objects to ILocation if they do not have a __parent__ attribute.
+Objects implementing IDjangoLocation must now have a __parent_object__
+attribute instead of __parent__.
+
 0.20.1 (2018-02-21)
 ===================
 

=== modified file 'src/lazr/restful/docs/django.txt'
--- src/lazr/restful/docs/django.txt	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/docs/django.txt	2018-09-28 14:30:01 +0000
@@ -151,7 +151,7 @@
     ... class SubordinateResource:
     ...
     ...     @property
-    ...     def __parent__(self):
+    ...     def __parent_object__(self):
     ...         return DummyRootResource()
     ...
     ...     @property

=== modified file 'src/lazr/restful/frameworks/django.py'
--- src/lazr/restful/frameworks/django.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/frameworks/django.py	2018-09-28 14:30:01 +0000
@@ -65,13 +65,15 @@
 
     The problem with ILocation is that you have to define __name__,
     and the Django metaclass won't let you assign a property to
-    __name__.
+    __name__.  We also can't use __parent__ here, because that will
+    confuse AbsoluteURL into thinking that this can be treated as an
+    ILocation.
     """
 
     def __url_path__(self):
         """The URL path for this object."""
 
-    def __parent__(self):
+    def __parent_object__(self):
         """This object's parent in the object tree."""
 
 # We want a raised django.core.exceptions.ObjectDoesNotExist
@@ -102,7 +104,7 @@
 
     @property
     def __parent__(self):
-        return self.context.__parent__
+        return self.context.__parent_object__
 
     @property
     def __name__(self):