updated Path dependency to 7.0

misago/project_template/requirements.txt

@@ -9,7 +9,7 @@ django-mptt==0.6.1
 django-pipeline==1.4.2
 fake-factory==0.4.2
 markdown==2.4.1
-path.py==5.2
+path.py==7.0
 pillow==2.7.0
 psycopg2==2.5.4
 pytz

misago/users/avatars/gallery.py

@@ -1,6 +1,6 @@
 import random
 
-from path import path
+from path import Path
 from PIL import Image
 
 from django.conf import settings
@@ -18,7 +18,7 @@ def get_available_galleries(include_default=False):
     """
     galleries = []
 
-    for directory in path(MEDIA_AVATARS).dirs():
+    for directory in Path(MEDIA_AVATARS).dirs():
         if include_default or directory[-8:] != '_default':
             gallery = {'name': directory.name, 'images': []}
 

misago/users/avatars/store.py

@@ -1,7 +1,7 @@
 from hashlib import md5
 import os
 
-from path import path
+from path import Path
 from PIL import Image
 
 from misago.conf import settings
@@ -21,7 +21,7 @@ def store_avatar(user, image):
     normalize_image(image)
     for size in sorted(settings.MISAGO_AVATARS_SIZES, reverse=True):
         avatar_file = '%s_%s.png' % (user.pk, size)
-        avatar_file = path(os.path.join(avatars_dir, avatar_file))
+        avatar_file = Path(os.path.join(avatars_dir, avatar_file))
 
         image = image.resize((size, size), Image.ANTIALIAS)
         image.save(avatar_file, "PNG")
@@ -33,7 +33,7 @@ def delete_avatar(user):
 
     for size in suffixes_to_delete:
         avatar_file = '%s_%s.png' % (user.pk, size)
-        avatar_file = path(os.path.join(avatars_dir, avatar_file))
+        avatar_file = Path(os.path.join(avatars_dir, avatar_file))
         if avatar_file.exists():
             avatar_file.remove()
 
@@ -56,7 +56,7 @@ def store_original_avatar(user):
 def avatar_file_path(user, size):
     avatars_dir = get_existing_avatars_dir(user)
     avatar_file = '%s_%s.png' % (user.pk, size)
-    return path(os.path.join(avatars_dir, avatar_file))
+    return Path(os.path.join(avatars_dir, avatar_file))
 
 
 def avatar_file_exists(user, size):
@@ -80,9 +80,9 @@ def get_avatars_dir_path(user=None):
 
         dir_hash = md5(str(user_id)).hexdigest()
         hash_path = [dir_hash[0:1], dir_hash[2:3]]
-        return path(os.path.join(AVATARS_STORE, *hash_path))
+        return Path(os.path.join(AVATARS_STORE, *hash_path))
     else:
-        return path(os.path.join(AVATARS_STORE, 'blank'))
+        return Path(os.path.join(AVATARS_STORE, 'blank'))
 
 
 def get_existing_avatars_dir(user=None):

misago/users/avatars/uploaded.py

@@ -1,6 +1,6 @@
 from hashlib import sha256
 
-from path import path
+from path import Path
 from PIL import Image
 
 from django.core.exceptions import ValidationError
@@ -61,7 +61,7 @@ def validate_uploaded_file(uploaded_file):
         return validate_dimensions(uploaded_file)
     except ValidationError as e:
         try:
-            temporary_file_path = path(uploaded_file.temporary_file_path())
+            temporary_file_path = Path(uploaded_file.temporary_file_path())
             if temporary_file_path.exists():
                 temporary_file_path.remove()
         except Exception:

misago/users/management/commands/updateblankavatar.py

@@ -1,6 +1,6 @@
 import os
 
-from path import path
+from path import Path
 from PIL import Image
 
 from django.conf import settings
@@ -13,7 +13,7 @@ class Command(BaseCommand):
     help = 'Updates stored blank avatar.'
 
     def handle(self, *args, **options):
-        avatars_dir = path(os.path.join(AVATARS_STORE, 'blank'))
+        avatars_dir = Path(os.path.join(AVATARS_STORE, 'blank'))
 
         # Empty existing blank avatar
         if avatars_dir.exists():
@@ -24,7 +24,7 @@ class Command(BaseCommand):
         image = Image.open(BLANK_AVATAR)
         for size in sorted(settings.MISAGO_AVATARS_SIZES, reverse=True):
             avatar_file = '%s.png' % size
-            avatar_file = path(os.path.join(avatars_dir, avatar_file))
+            avatar_file = Path(os.path.join(avatars_dir, avatar_file))
 
             image = image.resize((size, size), Image.ANTIALIAS)
             image.save(avatar_file, "PNG")

misago/users/tests/test_avatars.py

@@ -1,4 +1,4 @@
-from path import path
+from path import Path
 from PIL import Image
 
 from django.contrib.auth import get_user_model
@@ -22,21 +22,21 @@ class AvatarsStoreTests(TestCase):
         # Assert that avatar was stored
         avatar_dir = store.get_existing_avatars_dir(test_user)
         for size in settings.MISAGO_AVATARS_SIZES:
-            avatar = path('%s/%s_%s.png' % (avatar_dir, test_user.pk, size))
+            avatar = Path('%s/%s_%s.png' % (avatar_dir, test_user.pk, size))
             self.assertTrue(avatar.exists())
             self.assertTrue(avatar.isfile())
 
         # Delete avatar and assert its gone
         store.delete_avatar(test_user)
         for size in settings.MISAGO_AVATARS_SIZES:
-            avatar = path('%s/%s_%s.png' % (avatar_dir, test_user.pk, size))
+            avatar = Path('%s/%s_%s.png' % (avatar_dir, test_user.pk, size))
             self.assertFalse(avatar.exists())
 
         # Override new avatar and test that it was changed
         store.store_avatar(test_user, test_image)
         store.store_new_avatar(test_user, test_image)
         for size in settings.MISAGO_AVATARS_SIZES:
-            avatar = path('%s/%s_%s.png' % (avatar_dir, test_user.pk, size))
+            avatar = Path('%s/%s_%s.png' % (avatar_dir, test_user.pk, size))
             self.assertTrue(avatar.exists())
             self.assertTrue(avatar.isfile())
 
@@ -57,13 +57,13 @@ class AvatarSetterTests(TestCase):
     def assertNoAvatarIsSet(self):
         avatar_dir = store.get_existing_avatars_dir(self.user)
         for size in settings.MISAGO_AVATARS_SIZES:
-            avatar = path('%s/%s_%s.png' % (avatar_dir, self.user.pk, size))
+            avatar = Path('%s/%s_%s.png' % (avatar_dir, self.user.pk, size))
             self.assertFalse(avatar.exists())
 
     def assertAvatarWasSet(self):
         avatar_dir = store.get_existing_avatars_dir(self.user)
         for size in settings.MISAGO_AVATARS_SIZES:
-            avatar = path('%s/%s_%s.png' % (avatar_dir, self.user.pk, size))
+            avatar = Path('%s/%s_%s.png' % (avatar_dir, self.user.pk, size))
             self.assertTrue(avatar.exists())
             self.assertTrue(avatar.isfile())
 

misago/users/tests/test_usercp_views.py

@@ -1,4 +1,4 @@
-from path import path
+from path import Path
 
 from django.contrib.auth import get_user_model
 from django.core import mail
@@ -129,7 +129,7 @@ class AvatarUploadTests(AuthenticatedUserTestCase):
             self.assertEqual(response.status_code, 200)
 
             avatar_dir = store.get_existing_avatars_dir(self.user)
-            avatar = path('%s/%s_tmp.png' % (avatar_dir, self.user.pk))
+            avatar = Path('%s/%s_tmp.png' % (avatar_dir, self.user.pk))
             self.assertTrue(avatar.exists())
             self.assertTrue(avatar.isfile())
 
@@ -152,10 +152,10 @@ class AvatarUploadTests(AuthenticatedUserTestCase):
             self.assertEqual(response.status_code, 302)
 
             avatar_dir = store.get_existing_avatars_dir(self.user)
-            avatar = path('%s/%s_tmp.png' % (avatar_dir, self.user.pk))
+            avatar = Path('%s/%s_tmp.png' % (avatar_dir, self.user.pk))
             self.assertFalse(avatar.exists())
 
-            avatar = path('%s/%s_org.png' % (avatar_dir, self.user.pk))
+            avatar = Path('%s/%s_org.png' % (avatar_dir, self.user.pk))
             self.assertTrue(avatar.exists())
             self.assertTrue(avatar.isfile())
 

misago/users/views/avatarserver.py

@@ -1,6 +1,6 @@
 import os
 
-from path import path
+from path import Path
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -27,7 +27,7 @@ def serve_user_avatar(request, user_id, size):
         avatar_file = get_user_avatar_file(user_id, size)
         avatar_path = os.path.join(avatar_dir, avatar_file)
 
-        if path(avatar_path).exists():
+        if Path(avatar_path).exists():
             avatar_path = os.path.join(avatar_dir, avatar_file)
             return make_file_response(avatar_path, 'image/png')
         else: