flake8

zopefoundation · Jan 28, 2020 · f79b05c · f79b05c
1 parent ff81b6e
commit f79b05c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/webdav/PropertySheet.py b/src/webdav/PropertySheet.py
@@ -15,7 +15,7 @@
 
 from webdav.xmltools import escape
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3, ):
     basestring = str
     unicode = str
 

diff --git a/src/webdav/PropertySheets.py b/src/webdav/PropertySheets.py
@@ -24,7 +24,7 @@
 from webdav.common import isDavCollection
 from webdav.common import urlbase
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3, ):
     basestring = str
     unicode = str
 

diff --git a/src/webdav/common.py b/src/webdav/common.py
@@ -15,7 +15,7 @@
 import re
 import urllib
 
-from Acquisition import aq_base
+from Acquisition import aq_base, aq_parent
 from zExceptions import (
     HTTPConflict,
     HTTPLocked,
@@ -81,10 +81,10 @@ def urlfix(url, s):
 
 def is_acquired(ob):
     # Return true if this object is not a direct
-    # subobject of its aq_parent object.
-    if not hasattr(ob, 'aq_parent'):
+    # subobject of its __parent__ object.
+    if not hasattr(ob, '__parent__'):
         return 0
-    if hasattr(aq_base(ob.aq_parent), absattr(ob.id)):
+    if hasattr(aq_base(aq_parent(ob)), absattr(ob.id)):
         return 0
     if hasattr(aq_base(ob), 'isTopLevelPrincipiaApplicationObject') and \
             ob.isTopLevelPrincipiaApplicationObject: