Browse Source

isort imports

rafalp 6 years ago
parent
commit
261b0d37df

+ 8 - 8
misago/core/tests/test_templatetags.py

@@ -73,19 +73,19 @@ Hello, <b>{{ the_var|safe }}</b>
 class BatchTests(TestCase):
 class BatchTests(TestCase):
     def test_batch(self):
     def test_batch(self):
         """standard batch yields valid results"""
         """standard batch yields valid results"""
-        batch = "loremipsum"
-        yields = [["l", "o", "r"], ["e", "m", "i"], ["p", "s", "u"], ["m"]]
+        value = "loremipsum"
+        result = [["l", "o", "r"], ["e", "m", "i"], ["p", "s", "u"], ["m"]]
 
 
-        for i, test_yield in enumerate(batch(batch, 3)):
-            self.assertEqual(test_yield, yields[i])
+        for i, test_result in enumerate(batch(value, 3)):
+            self.assertEqual(test_result, result[i])
 
 
     def test_batchnonefilled(self):
     def test_batchnonefilled(self):
         """none-filled batch yields valid results"""
         """none-filled batch yields valid results"""
-        batch = "loremipsum"
-        yields = [["l", "o", "r"], ["e", "m", "i"], ["p", "s", "u"], ["m", None, None]]
+        value = "loremipsum"
+        result = [["l", "o", "r"], ["e", "m", "i"], ["p", "s", "u"], ["m", None, None]]
 
 
-        for i, test_yield in enumerate(batchnonefilled(batch, 3)):
-            self.assertEqual(test_yield, yields[i])
+        for i, test_result in enumerate(batchnonefilled(value, 3)):
+            self.assertEqual(test_result, result[i])
 
 
 
 
 class MockUser(object):
 class MockUser(object):

+ 11 - 11
misago/readtracker/tests/test_poststracker.py

@@ -3,12 +3,12 @@ from datetime import timedelta
 from django.test import TestCase
 from django.test import TestCase
 from django.utils import timezone
 from django.utils import timezone
 
 
-from .. import poststracker
 from ...categories.models import Category
 from ...categories.models import Category
 from ...conf import settings
 from ...conf import settings
 from ...threads import test
 from ...threads import test
 from ...users.test import create_test_user
 from ...users.test import create_test_user
 from ..models import PostRead
 from ..models import PostRead
+from ..poststracker import make_read_aware, save_read
 
 
 
 
 class AnonymousUser(object):
 class AnonymousUser(object):
@@ -24,16 +24,16 @@ class PostsTrackerTests(TestCase):
 
 
     def test_falsy_value(self):
     def test_falsy_value(self):
         """passing falsy value to readtracker causes no errors"""
         """passing falsy value to readtracker causes no errors"""
-        poststracker.make_read_aware(self.user, None)
-        poststracker.make_read_aware(self.user, False)
-        poststracker.make_read_aware(self.user, [])
+        make_read_aware(self.user, None)
+        make_read_aware(self.user, False)
+        make_read_aware(self.user, [])
 
 
     def test_anon_post_before_cutoff(self):
     def test_anon_post_before_cutoff(self):
         """non-tracked post is marked as read for anonymous users"""
         """non-tracked post is marked as read for anonymous users"""
         posted_on = timezone.now() - timedelta(days=settings.MISAGO_READTRACKER_CUTOFF)
         posted_on = timezone.now() - timedelta(days=settings.MISAGO_READTRACKER_CUTOFF)
         post = test.reply_thread(self.thread, posted_on=posted_on)
         post = test.reply_thread(self.thread, posted_on=posted_on)
 
 
-        poststracker.make_read_aware(AnonymousUser(), post)
+        make_read_aware(AnonymousUser(), post)
         self.assertTrue(post.is_read)
         self.assertTrue(post.is_read)
         self.assertFalse(post.is_new)
         self.assertFalse(post.is_new)
 
 
@@ -41,7 +41,7 @@ class PostsTrackerTests(TestCase):
         """tracked post is marked as read for anonymous users"""
         """tracked post is marked as read for anonymous users"""
         post = test.reply_thread(self.thread, posted_on=timezone.now())
         post = test.reply_thread(self.thread, posted_on=timezone.now())
 
 
-        poststracker.make_read_aware(AnonymousUser(), post)
+        make_read_aware(AnonymousUser(), post)
         self.assertTrue(post.is_read)
         self.assertTrue(post.is_read)
         self.assertFalse(post.is_new)
         self.assertFalse(post.is_new)
 
 
@@ -50,7 +50,7 @@ class PostsTrackerTests(TestCase):
         posted_on = timezone.now() - timedelta(days=settings.MISAGO_READTRACKER_CUTOFF)
         posted_on = timezone.now() - timedelta(days=settings.MISAGO_READTRACKER_CUTOFF)
         post = test.reply_thread(self.thread, posted_on=posted_on)
         post = test.reply_thread(self.thread, posted_on=posted_on)
 
 
-        poststracker.make_read_aware(self.user, post)
+        make_read_aware(self.user, post)
         self.assertTrue(post.is_read)
         self.assertTrue(post.is_read)
         self.assertFalse(post.is_new)
         self.assertFalse(post.is_new)
 
 
@@ -58,7 +58,7 @@ class PostsTrackerTests(TestCase):
         """tracked post is marked as unread for authenticated users"""
         """tracked post is marked as unread for authenticated users"""
         post = test.reply_thread(self.thread, posted_on=timezone.now())
         post = test.reply_thread(self.thread, posted_on=timezone.now())
 
 
-        poststracker.make_read_aware(self.user, post)
+        make_read_aware(self.user, post)
         self.assertFalse(post.is_read)
         self.assertFalse(post.is_read)
         self.assertTrue(post.is_new)
         self.assertTrue(post.is_new)
 
 
@@ -67,7 +67,7 @@ class PostsTrackerTests(TestCase):
         posted_on = timezone.now() - timedelta(days=1)
         posted_on = timezone.now() - timedelta(days=1)
         post = test.reply_thread(self.thread, posted_on=posted_on)
         post = test.reply_thread(self.thread, posted_on=posted_on)
 
 
-        poststracker.make_read_aware(self.user, post)
+        make_read_aware(self.user, post)
         self.assertTrue(post.is_read)
         self.assertTrue(post.is_read)
         self.assertFalse(post.is_new)
         self.assertFalse(post.is_new)
 
 
@@ -75,8 +75,8 @@ class PostsTrackerTests(TestCase):
         """tracked post is marked as read for authenticated users with read entry"""
         """tracked post is marked as read for authenticated users with read entry"""
         post = test.reply_thread(self.thread, posted_on=timezone.now())
         post = test.reply_thread(self.thread, posted_on=timezone.now())
 
 
-        poststracker.save_read(self.user, post)
-        poststracker.make_read_aware(self.user, post)
+        save_read(self.user, post)
+        make_read_aware(self.user, post)
 
 
         self.assertTrue(post.is_read)
         self.assertTrue(post.is_read)
         self.assertFalse(post.is_new)
         self.assertFalse(post.is_new)

+ 2 - 2
misago/readtracker/threadstracker.py

@@ -1,5 +1,5 @@
-from ..models import Post
-from ..permissions import exclude_invisible_posts
+from ..threads.models import Post
+from ..threads.permissions import exclude_invisible_posts
 from .dates import get_cutoff_date
 from .dates import get_cutoff_date
 
 
 
 

+ 0 - 1
misago/users/avatars/__init__.py

@@ -1,5 +1,4 @@
 from ...conf import settings
 from ...conf import settings
-
 from . import store, gravatar, dynamic, gallery, uploaded
 from . import store, gravatar, dynamic, gallery, uploaded
 
 
 AVATAR_TYPES = ("gravatar", "dynamic", "gallery", "uploaded")
 AVATAR_TYPES = ("gravatar", "dynamic", "gallery", "uploaded")