add python 3 compatibility

Author: ppdraga2

.gitignore

@@ -23,4 +23,9 @@
 *.pot
 *.pyc
 env
+env3
 .idea
+.vscode
+*.sqlite
+migrations
+__pycache__

.travis.yml

@@ -1,13 +1,15 @@
 language: python
 python:
   - "2.7"
-  - "2.6"
+  - "3.8"
 env:
-  - DJANGO_VERSION=1.6.11
-  - DJANGO_VERSION=1.7.7
+  - DJANGO_VERSION=1.11.29
+  - DJANGO_VERSION=3.1.2
 matrix:
   exclude:
-   - python: "2.6"
-     env: DJANGO_VERSION=1.7.7
-install: pip install -q Django==$DJANGO_VERSION djangorestframework==3.2.5
+   - python: "2.7"
+     env: DJANGO_VERSION=1.11.29
+   - python: "3.8"
+     env: DJANGO_VERSION=3.1.2
+install: pip install -q Django==$DJANGO_VERSION djangorestframework mock lxml
 script: python setup.py test

djangodav/__init__.py

@@ -19,5 +19,5 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with DjangoDav.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION = (0, 0, 1, 'beta', 23)
-__version__ = "0.0.1b23"
+VERSION = (0, 0, 1, 'beta', 24)
+__version__ = "0.0.1b24"

djangodav/auth/tests.py

@@ -1,3 +1,4 @@
+import sys
 from os.path import dirname
 from base64 import b64encode
 
@@ -100,7 +101,11 @@ class RestAuthDavView(TestDAVView):
         self.assertIsNotAuthorized(response)
 
         # get with basic authentication goes through
-        request = RequestFactory().get('/', **{'HTTP_AUTHORIZATION': 'Basic %s' % b64encode('root:test')})
+        if sys.version_info < (3, 0, 0): #py2
+            b64encode_str = b64encode('root:test')
+        else:
+            b64encode_str = b64encode(b'root:test').decode('utf-8')
+        request = RequestFactory().get('/', **{'HTTP_AUTHORIZATION': 'Basic %s' % b64encode_str})
         response = v(request, '/')
         self.assertIsAuthorized(response)
 
@@ -125,6 +130,10 @@ class RestAuthDavView(TestDAVView):
         self.assertIsAuthorized(response)    
 
         # get with basic authentication goes through
-        request = RequestFactory().get('/', **{'HTTP_AUTHORIZATION': 'Basic %s' % b64encode('root:test')})
+        if sys.version_info < (3, 0, 0): #py2
+            b64encode_str = b64encode('root:test')
+        else:
+            b64encode_str = b64encode(b'root:test').decode('utf-8')
+        request = RequestFactory().get('/', **{'HTTP_AUTHORIZATION': 'Basic %s' % b64encode_str})
         response = v(request, '/')
         self.assertIsAuthorized(response)

djangodav/base/resources.py

@@ -21,6 +21,7 @@
 from hashlib import md5
 from mimetypes import guess_type
 
+from django.utils.encoding import force_bytes
 from django.utils.http import urlquote
 from djangodav.utils import rfc3339_date, rfc1123_date, safe_join
 
@@ -191,8 +192,8 @@ def getetag(self):
         file system. The etag is used to detect changes to a resource between HTTP calls. So this
         needs to change if a resource is modified."""
         hashsum = md5()
-        hashsum.update(self.displayname)
-        hashsum.update(str(self.creationdate))
-        hashsum.update(str(self.getlastmodified))
-        hashsum.update(str(self.getcontentlength))
+        hashsum.update(force_bytes(self.displayname))
+        hashsum.update(force_bytes(self.creationdate))
+        hashsum.update(force_bytes(self.getlastmodified))
+        hashsum.update(force_bytes(self.getcontentlength))
         return hashsum.hexdigest()

djangodav/db/resources.py

@@ -19,6 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with DjangoDav.  If not, see <http://www.gnu.org/licenses/>.
 from operator import and_
+# from itertools import reduce
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Q
 from django.utils.functional import cached_property

djangodav/fs/resources.py

@@ -80,14 +80,15 @@ def exists(self):
 
     def get_children(self):
         """Return an iterator of all direct children of this resource."""
-        for child in os.listdir(self.get_abs_path()):
-            try:
-                is_unicode = isinstance(child, unicode)
-            except NameError:  # Python 3 fix
-                is_unicode = isinstance(child, str)
-            if not is_unicode:
-                child = child.decode(fs_encoding)
-            yield self.clone(url_join(*(self.path + [child])))
+        if os.path.isdir(self.get_abs_path()):
+            for child in os.listdir(self.get_abs_path()):
+                try:
+                    is_unicode = isinstance(child, unicode)
+                except NameError:  # Python 3 fix
+                    is_unicode = isinstance(child, str)
+                if not is_unicode:
+                    child = child.decode(fs_encoding)
+                yield self.clone(url_join(*(self.path + [child])))
 
     def write(self, content):
         raise NotImplementedError
@@ -117,13 +118,13 @@ def move_object(self, destination):
 
 class DummyReadFSDavResource(BaseFSDavResource):
     def read(self):
-        with open(self.get_abs_path(), 'r') as f:
+        with open(self.get_abs_path(), 'rb') as f:
             return f.read()
 
 
 class DummyWriteFSDavResource(BaseFSDavResource):
     def write(self, request):
-        with file(self.get_abs_path(), 'w') as dst:
+        with open(self.get_abs_path(), 'wb') as dst:
             shutil.copyfileobj(request, dst)
 
 

djangodav/fs/tests.py

@@ -58,8 +58,9 @@ def test_get_size(self, getsize):
     def test_get_abs_path(self):
         self.assertEquals(self.resource.get_abs_path(), '/some/folder/path/to/name')
 
+    @patch('djangodav.fs.resources.os.path.isdir')
     @patch('djangodav.fs.resources.os.listdir')
-    def test_get_children(self, listdir):
+    def test_get_children(self, listdir, isdir):
         listdir.return_value=['child1', 'child2']
         children = list(self.resource.get_children())
         self.assertEqual(children[0].path, ['path', 'to', 'name', 'child1'])

djangodav/locks.py

@@ -20,6 +20,8 @@
 # along with DjangoDav.  If not, see <http://www.gnu.org/licenses/>.
 from uuid import uuid4
 
+from django.utils.encoding import force_text
+
 from djangodav.base.locks import BaseLock
 
 
@@ -28,7 +30,7 @@ def get(self, *args, **kwargs):
         pass
 
     def acquire(self, *args, **kwargs):
-        return unicode(uuid4())
+        return force_text(uuid4())
 
     def release(self, token):
         return True

djangodav/utils.py

@@ -22,6 +22,8 @@
 
 import datetime, time, calendar
 from wsgiref.handlers import format_date_time
+
+from django.utils.encoding import force_text
 from django.utils.feedgenerator import rfc2822_date
 
 try:
@@ -61,7 +63,7 @@ def get_property_tag(res, name):
         return D(name)
     try:
         if hasattr(res, name):
-            return D(name, unicode(getattr(res, name)))
+            return D(name, force_text(getattr(res, name)))
     except AttributeError:
         return
 

djangodav/views/tests.py

@@ -18,6 +18,7 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with DjangoDav.  If not, see <http://www.gnu.org/licenses/>.
+import sys
 from lxml.etree import ElementTree
 from django.http import HttpResponse, HttpRequest, Http404
 from djangodav.acls import FullAcl
@@ -325,34 +326,46 @@ def test_get_obj(self):
         self.assertEqual(resp['Etag'], "0" * 40)
         self.assertEqual(resp['Content-Type'], "text/plain")
         self.assertEqual(resp['Last-Modified'], "Wed, 24 Dec 2014 06:00:00 +0000")
-        self.assertEqual(resp.content, "C" * 42)
+        if sys.version_info < (3, 0, 0): #py2
+            self.assertEqual(resp.content, "C" * 42)
+        else:
+            self.assertEqual(resp.content.decode('utf-8'), "C" * 42)
 
-    @patch('djangodav.views.render_to_response', Mock(return_value=HttpResponse('listing')))
+    @patch('djangodav.views.render', Mock(return_value=HttpResponse('listing')))
     def test_head_object(self):
         path = '/object.txt'
         v = DavView(path=path, base_url='/base', _allowed_methods=Mock(return_value=['ALL']), acl_class=FullAcl)
         v.__dict__['resource'] = MockObject(path)
         resp = v.head(None, path)
         self.assertEqual("text/plain", resp['Content-Type'])
         self.assertEqual("Wed, 24 Dec 2014 06:00:00 +0000", resp['Last-Modified'])
-        self.assertEqual("", resp.content)
+        if sys.version_info < (3, 0, 0): #py2
+            self.assertEqual("", resp.content)
+        else:
+            self.assertEqual("", resp.content.decode('utf-8'))
         self.assertEqual("0", resp['Content-Length'])
 
-    @patch('djangodav.views.views.render_to_response', Mock(return_value=HttpResponse('listing')))
+    @patch('djangodav.views.views.render', Mock(return_value=HttpResponse('listing')))
     def test_get_collection(self):
         path = '/collection/'
         v = DavView(path=path, acl_class=FullAcl, base_url='/base', _allowed_methods=Mock(return_value=['ALL']))
         v.__dict__['resource'] = MockCollection(path)
         resp = v.get(None, path)
-        self.assertEqual("listing", resp.content)
+        if sys.version_info < (3, 0, 0): #py2
+            self.assertEqual("listing", resp.content)
+        else:
+            self.assertEqual("listing", resp.content.decode('utf-8'))
         self.assertEqual("Wed, 24 Dec 2014 06:00:00 +0000", resp['Last-Modified'])
 
     def test_head_collection(self):
         path = '/collection/'
         v = DavView(path=path, acl_class=FullAcl, base_url='/base', _allowed_methods=Mock(return_value=['ALL']))
         v.__dict__['resource'] = MockCollection(path)
         resp = v.head(None, path)
-        self.assertEqual("", resp.content)
+        if sys.version_info < (3, 0, 0): #py2
+            self.assertEqual("", resp.content)
+        else:
+            self.assertEqual("", resp.content.decode('utf-8'))
         self.assertEqual("Wed, 24 Dec 2014 06:00:00 +0000", resp['Last-Modified'])
         self.assertEqual("0", resp['Content-Length'])
 

djangodav/views/views.py

@@ -1,18 +1,20 @@
 import urllib, re
+import sys
 try:
     import urlparse
 except ImportError:
     from urllib import parse as urlparse
 from sys import version_info as python_version
-from django.utils.timezone import now
 from lxml import etree
 
+from django.utils.encoding import force_text
+from django.utils.timezone import now
 from django.http import HttpResponseForbidden, HttpResponseNotAllowed, HttpResponseBadRequest, \
     HttpResponseNotModified, HttpResponseRedirect, Http404
 from django.utils.decorators import method_decorator
 from django.utils.functional import cached_property
 from django.utils.http import parse_etags
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import View
 
@@ -192,7 +194,7 @@ def get(self, request, path, head=False, *args, **kwargs):
                 response['Content-Length'] = self.resource.getcontentlength
                 response.content = self.resource.read()
         elif not head:
-            response = render_to_response(self.template_name, dict(resource=self.resource, base_url=self.base_url))
+            response = render(request, self.template_name, dict(resource=self.resource, base_url=self.base_url))
         response['Last-Modified'] = self.resource.getlastmodified
         return response
 
@@ -247,7 +249,13 @@ def relocate(self, request, path, method, *args, **kwargs):
             raise Http404("Resource doesn't exists")
         if not self.has_access(self.resource, 'read'):
             return self.no_access()
-        dst = urlparse.unquote(request.META.get('HTTP_DESTINATION', '')).decode(self.xml_encoding)
+        # dst = urlparse.unquote(request.META.get('HTTP_DESTINATION', '')).decode(self.xml_encoding)
+        if sys.version_info < (3, 0, 0): #py2
+            # in Python 2, urlparse requires bytestrings
+            dst = urlparse.unquote(request.META.get('HTTP_DESTINATION', '')).decode(self.xml_encoding)
+        else:
+            # in Python 3, urlparse understands string
+            dst = urlparse.unquote(request.META.get('HTTP_DESTINATION', ''))
         if not dst:
             return HttpResponseBadRequest('Destination header missing.')
         dparts = urlparse.urlparse(dst)
@@ -339,7 +347,7 @@ def lock(self, request, path, xbody=None, *args, **kwargs):
         body = D.activelock(*([
             D.locktype(locktype_obj),
             D.lockscope(lockscope_obj),
-            D.depth(unicode(depth)),
+            D.depth(force_text(depth)),
             D.timeout("Second-%s" % timeout),
             D.locktoken(D.href('opaquelocktoken:%s' % token))]
             + ([owner_obj] if owner_obj is not None else [])

runtests.py

@@ -37,8 +37,14 @@
             ENGINE = 'django.db.backends.sqlite3'
         )
     ),
-    ROOT_URLCONF = 'djangodav.tests.urls',
-    MIDDLEWARE_CLASSES = ()
+    # ROOT_URLCONF = 'djangodav.tests.urls',
+    MIDDLEWARE_CLASSES = (),
+    TEMPLATES = [
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'APP_DIRS': True,
+        },
+    ]
 )
 
 

samples/db/models.py

@@ -33,15 +33,15 @@ class Meta:
 
 
 class CollectionModel(BaseDavModel):
-    parent = models.ForeignKey('self', blank=True, null=True)
+    parent = models.ForeignKey('self', blank=True, null=True, on_delete=models.CASCADE)
     size = 0
 
     class Meta:
         unique_together = (('parent', 'name'),)
 
 
 class ObjectModel(BaseDavModel):
-    parent = models.ForeignKey(CollectionModel, blank=True, null=True)
+    parent = models.ForeignKey(CollectionModel, blank=True, null=True, on_delete=models.CASCADE)
     size = models.IntegerField(default=0)
     content = models.TextField(default=u"")
     md5 = models.CharField(max_length=255)

samples/requirements.txt

@@ -1,3 +1,4 @@
 django
 django-tastypie
 djangorestframework
+lxml