devilry 6.2.3__tar.gz → 6.3.0__tar.gz

{devilry-6.2.3 → devilry-6.3.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: devilry
-Version: 6.2.3
+Version: 6.3.0
 Summary: A system for handling electronic deliveries. See https://github.com/devilry/devilry-django.
-Author: Tor Johansen, Bendik Opstad, Vegard Angell, Magne Westlie, Ilya Kostolomov, Christian Tryti, Rebekka Mørken, Stian Julseth
+Author: Tor Johansen, Bendik Opstad, Vegard Angell, Magne Westlie, Ilya Kostolomov, Christian Tryti, Rebekka Mørken, Stian Julseth, Åsmund J. Rosendahl
 Author-email: Espen Angell Kristiansen <post@appresso.no>
 License: Copyright (c) 2010, Devilry contributors
         All rights reserved.
@@ -55,7 +55,7 @@ Requires-Dist: html-sanitizer
 Requires-Dist: html2text<2018.2.0,>=2018.1.0
 Requires-Dist: html5lib
 Requires-Dist: httplib2<0.20.0,>=0.19.0
-Requires-Dist: idna<2.7.0,>=2.6.0
+Requires-Dist: idna>=3.7.0
 Requires-Dist: ievv-opensource<10.0.0,>=9.2.2
 Requires-Dist: markdown<3.4.0,>=3.3.0
 Requires-Dist: mimeparse<0.2.0,>=0.1.0
@@ -74,6 +74,8 @@ Requires-Dist: requests
 Requires-Dist: requests-oauthlib<0.9.0,>=0.8.0
 Requires-Dist: rq<1.9.0,>=1.8.0
 Requires-Dist: six<1.16.0,>=1.15.0
+Requires-Dist: stream-zip>=0.0.70
+Requires-Dist: to-file-like-obj>=0.0.5
 Requires-Dist: urllib3>=1.26.0
 Requires-Dist: urlobject<2.5.0,>=2.4.0
 Requires-Dist: xlsxwriter<1.2.0,>=1.1.0
@@ -82,6 +84,7 @@ Requires-Dist: beautifulsoup4==4.7.1; extra == 'dev'
 Requires-Dist: boto==2.32.1; extra == 'dev'
 Requires-Dist: django-auth-ldap; extra == 'dev'
 Requires-Dist: django-debug-toolbar; extra == 'dev'
+Requires-Dist: django-silk; extra == 'dev'
 Requires-Dist: django-storages==1.1.5; extra == 'dev'
 Requires-Dist: doc2dash==3.0.0; extra == 'dev'
 Requires-Dist: fabric3==1.14.post1; extra == 'dev'

devilry-6.3.0/devilry/__init__.py

@@ -0,0 +1 @@
+__version__ = '6.3.0'

devilry-6.3.0/devilry/devilry_admin/views/assignment/download_files/backends.py

@@ -0,0 +1,21 @@
+import os
+
+from devilry.devilry_compressionutil.backends import backends_base
+
+
+class DevilryAdminZipBackend(backends_base.StreamZipBackend):
+    backend_id = 'devilry_admin_local'
+    save_to_disk = False
+
+    @classmethod
+    def delete_archive(cls, full_path):
+        if cls.save_to_disk:
+            if not os.path.exists(full_path):
+                return False
+            try:
+                os.remove(full_path)
+            except OSError:
+                return False
+            return True
+        else:
+            return False

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_admin/views/assignment/download_files/batch_download_api.py

@@ -2,6 +2,7 @@
 
 
 from ievv_opensource.ievv_batchframework import batchregistry
+from django.http.response import JsonResponse
 
 from devilry.apps.core import models as core_models
 from devilry.devilry_compressionutil.models import CompressedArchiveMeta
@@ -16,11 +17,11 @@ class BatchCompressionAPIAssignmentView(AbstractBatchCompressionAPIView):
     """
     model_class = core_models.Assignment
     batchoperation_type = 'batchframework_admin_compress_assignment'
-    
+
     @property
     def created_by_role(self):
         return CompressedArchiveMeta.CREATED_BY_ROLE_ADMIN
-    
+
     def get_assignment_group_ids(self):
         assignment_group_ids = core_models.AssignmentGroup.objects \
             .filter(parentnode=self.content_object) \
@@ -58,6 +59,10 @@ class BatchCompressionAPIAssignmentView(AbstractBatchCompressionAPIView):
     def should_filter_by_created_by_user(self):
         return True
 
+    def get(self, request, *args, **kwargs):
+        content_object_id = kwargs.get('content_object_id')
+        return JsonResponse(self.get_ready_for_download_status(content_object_id=content_object_id))
+
     def start_compression_task(self, content_object_id):
         batchregistry.Registry.get_instance().run(
             actiongroup_name=self.batchoperation_type,

devilry-6.3.0/devilry/devilry_admin/views/assignment/download_files/download_archive.py

@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+import os
+
+from django.http import Http404
+from django import http
+from django.shortcuts import get_object_or_404
+from django.views import generic
+
+from cradmin_legacy import crapp
+
+from devilry.apps.core import models as core_models
+from devilry.devilry_admin.views.assignment.download_files import batch_download_api
+from devilry.devilry_compressionutil import backend_registry
+from devilry.devilry_compressionutil.batchjob_mixins.assignment_mixin import AssignmentBatchMixin
+
+
+class CompressedAssignmentFileDownloadView(AssignmentBatchMixin, generic.TemplateView):
+    backend_id = 'devilry_admin_local'
+
+    def get_assignment_group_queryset(self, assignment, user):
+        return assignment.assignmentgroups.filter_user_is_admin(user=user)
+
+    def get(self, request, *args, **kwargs):
+        assignment_id = kwargs.get('assignment_id')
+        assignment = get_object_or_404(core_models.Assignment, id=assignment_id)
+
+        if assignment != self.request.cradmin_role:
+            raise Http404()
+
+        from django.utils import timezone
+        archive_name = '{}.{}.{}.{}.zip'.format(
+            assignment.subject.short_name,
+            assignment.period.short_name,
+            assignment.short_name,
+            timezone.now().strftime('%Y-%m-%d-%H%M'))
+
+        archive_path = os.path.join(
+            'admin',
+            str(assignment.parentnode.id),
+            str(assignment.id),
+            str(self.request.user),
+            archive_name
+        )
+
+        zip_backend = backend_registry.Registry.get_backend_instance(
+            backend_id=self.backend_id,
+            zipfile_path=archive_path,
+            archive_name=archive_name
+        )
+
+        if not zip_backend:
+            raise Http404()
+
+        self.add_assignment_groups(self.request.user, zip_backend, assignment)
+        zip_backend.close()
+
+        filewrapper = zip_backend.get_archive()
+
+        response = http.FileResponse(
+            filewrapper
+        )
+        response.set_cookie('zipdownload', 'start', max_age=1)
+
+        response['content-disposition'] = 'attachment; filename={}'.format(
+            archive_name.encode('ascii', 'replace').decode()
+        )
+        if zip_backend.archive_size() > 0:
+            response['content-length'] = zip_backend.archive_size()
+
+        return response
+
+
+class App(crapp.App):
+    appurls = [
+        crapp.Url(
+            r'^assignment-file-download/(?P<assignment_id>[0-9]+)$',
+            CompressedAssignmentFileDownloadView.as_view(),
+            name='assignment-file-download'),
+        crapp.Url(
+            r'assignment-download-api/(?P<content_object_id>[0-9]+)$',
+            batch_download_api.BatchCompressionAPIAssignmentView.as_view(),
+            name='assignment-file-download-api'
+        )
+    ]

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_authenticate/allauth_adapter.py

@@ -9,6 +9,18 @@ logger = logging.getLogger(__name__)
 
 
 class DevilrySocialAccountAdapter(DefaultSocialAccountAdapter):
+    extra_data_to_keep = ['userid_sec', 'userid', 'email', 'name', 'profilephoto']
+
+    def clean_extra_date(self, extra_data):
+        out = {}
+        for k, v in extra_data.items():
+            if k in self.extra_data_to_keep:
+                out[k] = v
+            else:
+                logger.error(msg='{} value was removed from socialacount extra_data of userid {}'
+                             .format(k, extra_data['userid']))
+        return out
+
     def save_user(self, request, sociallogin, form=None):
         # Debug log
         logger.debug(msg='DevilrySocialAccountAdapter.save_user:')
@@ -19,6 +31,8 @@ class DevilrySocialAccountAdapter(DefaultSocialAccountAdapter):
         # Debug log
         logger.debug(msg='Fetching updater (type): {}'.format(type(updater)))
 
+        sociallogin.account.extra_data = self.clean_extra_date(sociallogin.account.extra_data)
+
         shortname = updater.make_shortname(
             socialaccount=sociallogin.account)
 

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_compressionutil/abstract_batch_action.py

@@ -31,23 +31,7 @@ class AbstractBaseBatchAction(batchregistry.Action):
             readmode=False
         )
 
-    def add_file(self, zipfile_backend, sub_path, comment_file, is_duplicate=False):
-        """
-        Add file to ZIP archive.
-
-        Args:
-            zipfile_backend: A subclass of ``PythonZipFileBackend``.
-            sub_path: The path to write to inside the archive.
-            comment_file: The `CommentFile` file to write.
-            is_duplicate: Is the file a duplicate? Defaults to ``False``.
-        """
-        file_name = comment_file.filename
-        if is_duplicate:
-            file_name = comment_file.get_filename_as_unique_string()
 
-        zipfile_backend.add_file(
-            os.path.join(sub_path, file_name),
-            comment_file.file.file)
 
     def execute(self):
-        raise NotImplementedError()
+        raise NotImplementedError()

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_compressionutil/backend_registry.py

@@ -55,6 +55,26 @@ class Registry(Singleton):
             return None
         return backend_class
 
+    @classmethod
+    def get_backend_instance(cls, backend_id, zipfile_path, archive_name):
+        """
+        Get an instance of the backend to use.
+
+        Args:
+            backend_id: ID of backend class.
+            zipfile_path: Path to the archive.
+            archive_name: Name of the archive.
+
+        Returns:
+            PythonZipFileBackend: Backend for `self.backend_id`
+        """
+        zipfile_backend_class = cls.get_instance().get(backend_id)
+        return zipfile_backend_class(
+            archive_path=zipfile_path,
+            archive_name=archive_name,
+            readmode=False
+        )
+
 
 class MockableRegistry(Registry):
     """

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_compressionutil/backends/backend_mock.py

@@ -1,7 +1,16 @@
 import os
 
-from devilry.devilry_compressionutil.backends.backends_base import PythonZipFileBackend
-from devilry.devilry_compressionutil.backends.backends_base import PythonTarFileBackend
+from devilry.devilry_compressionutil.backends.backends_base import PythonZipFileBackend, PythonTarFileBackend, StreamZipBackend
+
+
+class MockDevilryStreamZipBackend(StreamZipBackend):
+    """
+    Used for testing.
+    """
+    backend_id = 'stream'
+
+    def __init__(self, **kwargs):
+        super(MockDevilryStreamZipBackend, self).__init__(**kwargs)
 
 
 class MockDevilryZipBackend(PythonZipFileBackend):

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_compressionutil/backends/backends_base.py

@@ -1,11 +1,17 @@
 # Python imports
 import os
+import io
 import zipfile
 import tarfile
 import shutil
+from stat import S_IFREG
+from stream_zip import ZIP_AUTO, stream_zip
+from to_file_like_obj import to_file_like_obj
 
 # Django imports
 from django.conf import settings
+from django.utils import timezone
+
 
 
 class BaseArchiveBackend(object):
@@ -17,6 +23,7 @@ class BaseArchiveBackend(object):
 
     #: A unique string ID for the subclasses to use that describes what kind of backend it is.
     backend_id = None
+    save_to_disk = True
 
     class Meta:
         abstract = True
@@ -129,6 +136,15 @@ class BaseArchiveBackend(object):
         """
         raise NotImplementedError()
 
+    def get_chunk_size(self):
+        """
+        Get the archive chunk size.
+
+        Returns:
+            (int): result of archive_size if not implemented
+        """
+        return self.archive_size()
+
     @classmethod
     def delete_archive(cls, full_path):
         """
@@ -146,6 +162,124 @@ class BaseArchiveBackend(object):
         raise NotImplementedError()
 
 
+class StreamZipBackend(BaseArchiveBackend):
+    def __init__(self, save_to_disk=False, chunk_size=None, **kwargs):
+        super(StreamZipBackend, self).__init__(**kwargs)
+        self.files = []
+        self.zipped_chunks = None
+        self.save_to_disk = save_to_disk
+        self.__add_path_extension()
+        self._create_path_if_not_exists()
+        if chunk_size:
+            self.chunk_size = chunk_size
+        else:
+            self.chunk_size = int(0x8000)
+
+    def __add_path_extension(self):
+        """
+        Sets :obj:`~.PythonZipFileBackend.archive_path` to full path by prepending the backend storage location
+        to the archive_path. Also adds .zip extension
+        """
+        if self.save_to_disk:
+            self.archive_path = os.path.join(self.get_storage_location(), self.archive_path)
+        if not self.archive_path.endswith('.zip'):
+            self.archive_name += '.zip'
+            self.archive_path += '.zip'
+
+    def archive_size(self):
+        """
+        Get size of archive. Uses ``os.stat``.
+
+        Returns:
+            int: size of archive.
+
+        Raises:
+            ValueError: If not in ``readmode``.
+        """
+        if not self.readmode:
+            raise ValueError('Must be in readmode')
+        return 0
+
+    def add_file(self, path, filelike_obj):
+        """
+        Prep a file to be written to the archive on the given ``path``.
+
+        Args:
+            path: Path to file inside the archive.
+            filelike_obj: An object that behaves like a File(read, write..).
+
+        """
+        if self.readmode is True:
+            raise ValueError('readmode must be False to add files.')
+
+        self.files.append((path, filelike_obj))
+
+    def read_archive(self):
+        """
+        Get the zipped archive as :obj:`~ZipFile` in readmode.
+
+        Returns:
+            ZipFile: The zipped archive.
+        """
+        if not self.readmode:
+            raise ValueError('Must be in readmode')
+        if not self.zipped_chunks:
+            raise ValueError('Archive has not been created yet')
+        return zipfile.ZipFile(io.BytesIO(b''.join(self.zipped_chunks)))
+
+    def get_archive(self):
+        """
+        Get the filelike object of the archive for compressed files.
+
+        """
+        return to_file_like_obj(self.zipped_chunks)
+
+    def _prep_files(self):
+        """
+        Prepares the files for Zip creation
+        """
+        now = timezone.now()
+        mode = S_IFREG | 0o600
+
+        def contents(file_object):
+            with file_object.file.open('r') as f:
+                while chunk := f.read(self.chunk_size):
+                    yield chunk
+
+        for (path, filelike_obj) in self.files:
+            yield (path, now, mode, ZIP_AUTO(filelike_obj.file.size), contents(filelike_obj))
+
+
+    def close(self):
+        """
+        Must be invoked in order to process the files into an iterable yielding the bytes of the ZIP file.
+
+        Readmode is set to True
+        """
+        prepped_files = self._prep_files()
+        self.zipped_chunks = stream_zip(prepped_files, chunk_size=self.chunk_size)
+        self.readmode = True
+
+        if self.save_to_disk:
+            self.archive = open(self.archive_path, 'wb')
+            for chunk in self.zipped_chunks:
+                self.archive.write(chunk)
+
+            super(StreamZipBackend, self).close()
+
+    def get_chunk_size(self):
+        return self.chunk_size
+
+    def _create_path_if_not_exists(self):
+        """
+        Create path if given path does not exist.
+        """
+        archivedirname = os.path.dirname(self.archive_path)
+        if self.save_to_disk:
+            if not os.path.exists(archivedirname):
+                os.makedirs(archivedirname)
+
+
 class PythonZipFileBackend(BaseArchiveBackend):
     """
     Defines a baseclass backend using :class:`~ZipFile`

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_compressionutil/batchjob_mixins/assignment_mixin.py

@@ -4,6 +4,7 @@
 import os
 
 from django.template import defaultfilters
+from django.db.models import Prefetch
 
 from devilry.devilry_compressionutil.batchjob_mixins import feedbackset_mixin
 
@@ -32,10 +33,20 @@ class AssignmentBatchMixin(feedbackset_mixin.FeedbackSetBatchMixin):
         raise NotImplementedError()
 
     def add_assignment_groups(self, user, zipfile_backend, assignment):
-        for group in self.get_assignment_group_queryset(assignment=assignment, user=user):
+        group_queryset = self.get_assignment_group_queryset(assignment=assignment, user=user)
+        group_queryset = group_queryset.prefetch_related(
+            Prefetch(
+                'feedbackset_set',
+                queryset=self.get_feedbackset_queryset()
+            ),
+            'candidates__relatedstudent__user',
+        )
+
+        for group in group_queryset:
             group_path = '{}'.format(group.get_short_displayname())
             for feedback_set in group.feedbackset_set.all():
-                feedback_set_path = 'deadline-{}'.format(defaultfilters.date(feedback_set.current_deadline(), 'b.j.Y-H:i'))
+                feedback_set_path = 'deadline-{}' \
+                    .format(defaultfilters.date(feedback_set.deadline_datetime, 'Y-m-d-Hi'))
                 self.zipfile_add_feedbackset(
                     zipfile_backend=zipfile_backend,
                     feedback_set=feedback_set,

devilry-6.3.0/devilry/devilry_compressionutil/batchjob_mixins/feedbackset_mixin.py

@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+
+
+import os
+
+from django.db.models import Prefetch, F
+
+from devilry.devilry_group.models import GroupComment, FeedbackSet
+from devilry.devilry_comment.models import CommentFile
+
+
+class FeedbackSetBatchMixin(object):
+    """
+    Mixin for adding FeedbackSet files to zipfile.
+
+    Must be included in class together with
+    :class:`devilry.devilry_compressionutil.abstract_batch_action.AbstractBaseBatchAction`.
+    """
+
+    def add_file(self, zipfile_backend, sub_path, comment_file, is_duplicate=False):
+        """
+        Add file to ZIP archive.
+
+        Args:
+            zipfile_backend: A subclass of ``PythonZipFileBackend``.
+            sub_path: The path to write to inside the archive.
+            comment_file: The `CommentFile` file to write.
+            is_duplicate: Is the file a duplicate? Defaults to ``False``.
+        """
+        file_name = comment_file.filename
+        if is_duplicate:
+            file_name = comment_file.get_filename_as_unique_string()
+
+        zipfile_backend.add_file(
+            os.path.join(sub_path, file_name),
+            comment_file.file)
+
+    def get_feedbackset_queryset(self):
+        commentfile_queryset = CommentFile.objects.all().order_by('-created_datetime') \
+            .only('filename', 'file', 'created_datetime', 'comment_id')
+
+        groupcomment_queryset = GroupComment.objects \
+            .filter(
+                visibility=GroupComment.VISIBILITY_VISIBLE_TO_EVERYONE,
+                user_role=GroupComment.USER_ROLE_STUDENT
+            ) \
+            .only('comment_ptr_id', 'feedback_set_id', 'published_datetime') \
+            .order_by('-created_datetime') \
+            .prefetch_related(
+                Prefetch(
+                    'commentfile_set',
+                    queryset=commentfile_queryset,
+                )
+            )
+
+        return FeedbackSet.objects.all().only('deadline_datetime', 'group_id') \
+            .prefetch_related(
+                Prefetch(
+                    'groupcomment_set',
+                    queryset=groupcomment_queryset,
+                )
+        )
+
+    def zipfile_add_feedbackset(self, zipfile_backend, feedback_set, sub_path=''):
+        duplicates_sub_path = os.path.join(sub_path, 'old_duplicates')
+        after_deadline_sub_path = os.path.join(sub_path, 'after_deadline_not_part_of_delivery')
+        after_deadline_duplicates_sub_path = os.path.join(after_deadline_sub_path, 'old_duplicates')
+        comment_file_tree = {}
+        for group_comment in feedback_set.groupcomment_set.all():
+            for comment_file in group_comment.commentfile_set.all():
+                filename = comment_file.filename
+                if filename not in comment_file_tree:
+                    comment_file_tree[filename] = {
+                        'before_deadline': {
+                            'last': False,
+                        },
+                        'after_deadline': {
+                            'last': False,
+                        }
+                    }
+                # Before the deadline expired
+                # Set initial last delivery before deadline, and duplicates.
+                if group_comment.published_datetime <= feedback_set.deadline_datetime:
+                    if comment_file_tree[filename]['before_deadline']['last'] is False:
+                        comment_file_tree[filename]['before_deadline']['last'] = True
+                        self.add_file(zipfile_backend=zipfile_backend,
+                                      sub_path=sub_path,
+                                      comment_file=comment_file)
+                    else:
+                        self.add_file(zipfile_backend=zipfile_backend,
+                                      sub_path=duplicates_sub_path,
+                                      comment_file=comment_file,
+                                      is_duplicate=True)
+                else:
+                    if comment_file_tree[filename]['after_deadline']['last'] is False:
+                        comment_file_tree[filename]['after_deadline']['last'] = True
+                        self.add_file(zipfile_backend=zipfile_backend,
+                                      sub_path=after_deadline_sub_path,
+                                      comment_file=comment_file)
+                    else:
+                        self.add_file(zipfile_backend=zipfile_backend,
+                                      sub_path=after_deadline_duplicates_sub_path,
+                                      comment_file=comment_file,
+                                      is_duplicate=True)

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_compressionutil/tests/test_backend.py

@@ -2,6 +2,7 @@
 import io
 import os
 import shutil
+import zipfile
 
 # Django imports
 from unittest import skip
@@ -24,6 +25,41 @@ lorem_ipsum = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. In facil
               'Quisque at pellentesque magna. Morbi sagittis magna in sollicitudin viverra. ' \
               'Donec quis velit suscipit, mollis leo ut.'
 
+class TestStreamZipBackend(TestCase):
+
+    def setUp(self):
+        # Set up a backend path for testing which can be removed after each test.
+        self.backend_path = os.path.join('devilry_testfiles', 'devilry_compressed_archives', '')
+
+    def tearDown(self):
+        shutil.rmtree(self.backend_path, ignore_errors=False)
+
+    def _create_test_file(self, content=b'testcontent'):
+        testfile = io.BytesIO()
+        testfile.write(content)
+        testfile.seek(0)
+
+        return testfile
+
+    def test_add_file(self):
+        with self.settings(DEVILRY_COMPRESSED_ARCHIVES_DIRECTORY=self.backend_path):
+            mockregistry = backend_registry.MockableRegistry.make_mockregistry(
+                backend_mock.MockDevilryStreamZipBackend
+            )
+
+            backend_class = mockregistry.get('stream')
+            backend = backend_class(archive_path='testfile1', readmode=False)
+
+            file_1 = self._create_test_file()
+
+            backend.add_file('testfile.txt', file_1)
+            self.assertEqual(backend.files[0], ('testfile.txt', file_1))
+
+            backend.close()
+
+            archive = backend.read_archive()
+            self.assertEqual(b'testcontent', archive.read(archive.namelist()[0]))
+
 
 class TestZipBackend(TestCase):
 

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_cradmin/templates/cradmin_legacy/standalone-base.django.html

@@ -5,7 +5,9 @@
 {% block html-element-lang %}{{ DEVILRY_LANGUAGE_CODE }}{% endblock %}
 
 {% block jsimports %}
-    <script src='{% devilry_theme3_dist_path %}/scripts/plain_es6/latex_math.js'></script>
+    <script type='module'>
+        import '{% devilry_theme3_dist_path %}/scripts/plain_es6/latex_math.js';
+    </script>
 {% endblock %}
 
 {% block styles %}

{devilry-6.2.3 → devilry-6.3.0}/devilry/devilry_email/comment_email/comment_email.py

@@ -163,7 +163,7 @@ def send_comment_email(comment, user_list, feedbackfeed_url, crinstance_id, doma
     )
 
 
-def send_examiner_comment_email(comment_id, domain_url_start):
+def send_examiner_comment_email(comment_id, domain_url_start, before_original_deadline=True):
     """
     Send email to examiner users.
 
@@ -192,6 +192,9 @@ def send_examiner_comment_email(comment_id, domain_url_start):
             ``An admin added a new comment for <assignment name>``
     """
     comment = get_comment(comment_id=comment_id)
+    if before_original_deadline and comment.text == '':
+        return
+
     absolute_url = build_feedbackfeed_absolute_url(
         domain_scheme=domain_url_start, group_id=comment.feedback_set.group.id, instance_id='devilry_group_examiner')
 
@@ -201,8 +204,8 @@ def send_examiner_comment_email(comment_id, domain_url_start):
 
     if not recipients:
         if not has_examiner:
-            # No examiners assigned to the group. Set recipients to the subject- 
-            # and period-admin users so they receive an e-mail informing that the 
+            # No examiners assigned to the group. Set recipients to the subject-
+            # and period-admin users so they receive an e-mail informing that the
             # group has no examiners assigned.
             if comment.text.strip() == '':
                 # Do not spam admins with notifications for comments without any text.