mailpipe|handler: with the Response framework, handlers don't need `original`.

diff --git a/pygrader/handler/get.py b/pygrader/handler/get.py
index c5797fa95dca2cc53bc0f449042fa9d989bd8f50..911b26e31c5391c483a336b42d2ead2943ffbb1d 100644 (file)
--- a/pygrader/handler/get.py
+++ b/pygrader/handler/get.py
@@ -35,7 +35,7 @@ class InvalidStudent (_InvalidSubjectMessage):
         self.students = students
 
 
-def run(basedir, course, original, message, person, subject,
+def run(basedir, course, message, person, subject,
         trust_email_infrastructure=False,
         use_color=None, dry_run=False, **kwargs):
     """
@@ -61,8 +61,8 @@ def run(basedir, course, original, message, person, subject,
     Unauthenticated messages are refused by default.
 
     >>> process(
-    ...     basedir=course.basedir, course=course.course, original=message,
-    ...     message=message, person=person, subject='[get]', max_late=0)
+    ...     basedir=course.basedir, course=course.course, message=message,
+    ...     person=person, subject='[get]', max_late=0)
     UnsignedMessage error:
     unsigned message
 
@@ -79,8 +79,8 @@ def run(basedir, course, original, message, person, subject,
     Students without grades get a reasonable response.
 
     >>> process(
-    ...     basedir=course.basedir, course=course.course, original=message,
-    ...     message=message, person=person, subject='[get]', max_late=0,
+    ...     basedir=course.basedir, course=course.course, message=message,
+    ...     person=person, subject='[get]', max_late=0,
     ...     trust_email_infrastructure=True)
     ... # doctest: +ELLIPSIS, +REPORT_UDIFF
     respond with:
@@ -94,8 +94,8 @@ def run(basedir, course, original, message, person, subject,
 
     >>> message.authenticated = True
     >>> process(
-    ...     basedir=course.basedir, course=course.course, original=message,
-    ...     message=message, person=person, subject='[get]', max_late=0)
+    ...     basedir=course.basedir, course=course.course, message=message,
+    ...     person=person, subject='[get]', max_late=0)
     ... # doctest: +ELLIPSIS, +REPORT_UDIFF
     respond with:
     Content-Type: text/plain; charset="us-ascii"
@@ -125,9 +125,8 @@ def run(basedir, course, original, message, person, subject,
     ...     points=10, comment='Looks good.')
     >>> course.course.grades.append(grade)
     >>> process(
-    ...     basedir=course.basedir, course=course.course, original=message,
-    ...     message=message, person=person, subject='[get]',
-    ...     max_late=0)
+    ...     basedir=course.basedir, course=course.course, message=message,
+    ...     person=person, subject='[get]', max_late=0)
     ... # doctest: +ELLIPSIS, +REPORT_UDIFF
     respond with:
     Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="pgp-sha1"; boundary="===============...=="
@@ -181,9 +180,8 @@ def run(basedir, course, original, message, person, subject,
     ...     course.course.find_people(email='eye@tower.edu'))[0]
     >>> person.pgp_key = None
     >>> process(
-    ...     basedir=course.basedir, course=course.course, original=message,
-    ...     message=message, person=person, subject='[get]',
-    ...     max_late=0)
+    ...     basedir=course.basedir, course=course.course, message=message,
+    ...     person=person, subject='[get]', max_late=0)
     ... # doctest: +ELLIPSIS, +REPORT_UDIFF
     respond with:
     Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="pgp-sha1"; boundary="===============...=="
@@ -224,9 +222,8 @@ def run(basedir, course, original, message, person, subject,
     They can also request grades for a particular student.
 
     >>> process(
-    ...     basedir=course.basedir, course=course.course, original=message,
-    ...     message=message, person=person,
-    ...     subject='[get] {}'.format(student.name),
+    ...     basedir=course.basedir, course=course.course, message=message,
+    ...     person=person, subject='[get] {}'.format(student.name),
     ...     max_late=0)
     ... # doctest: +ELLIPSIS, +REPORT_UDIFF
     respond with:
@@ -288,7 +285,7 @@ def run(basedir, course, original, message, person, subject,
     >>> try:
     ...     _handle_submission(
     ...         basedir=course.basedir, course=course.course,
-    ...         original=submission, message=submission, person=student,
+    ...         message=submission, person=student,
     ...         subject='[submit] Assignment 1')
     ... except _Response:
     ...     pass
@@ -296,8 +293,8 @@ def run(basedir, course, original, message, person, subject,
     Now lets request the submissions.
 
     >>> process(
-    ...     basedir=course.basedir, course=course.course, original=message,
-    ...     message=message, person=person,
+    ...     basedir=course.basedir, course=course.course, message=message,
+    ...     person=person,
     ...     subject='[get] {}, {}'.format(student.name, 'Assignment 1'),
     ...     max_late=0)
     ... # doctest: +ELLIPSIS, +REPORT_UDIFF
@@ -366,24 +363,24 @@ def run(basedir, course, original, message, person, subject,
     if trust_email_infrastructure:
         authenticated = True
     else:
-        authenticated = hasattr(message, 'authenticated') and message.authenticated
+        authenticated = (
+            hasattr(message, 'authenticated') and message.authenticated)
     if not authenticated:
         raise _UnsignedMessage()
     if 'assistants' in person.groups or 'professors' in person.groups:
         email = _get_admin_email(
-            basedir=basedir, course=course, original=original,
-            person=person, subject=subject, use_color=use_color)
+            basedir=basedir, course=course, person=person, subject=subject,
+            use_color=use_color)
     elif 'students' in person.groups:
         email = _get_student_email(
-            basedir=basedir, course=course, original=original,
-            person=person, use_color=use_color)
+            basedir=basedir, course=course, person=person,
+            use_color=use_color)
     else:
         raise NotImplementedError(
             'strange groups {} for {}'.format(person.groups, person))
     raise _Response(message=email)
 
-def _get_student_email(basedir, course, original, person, student=None,
-                       use_color=None):
+def _get_student_email(basedir, course, person, student=None, use_color=None):
     if student is None:
         student = person
         targets = None
@@ -411,7 +408,7 @@ def _get_student_email(basedir, course, original, person, student=None,
     return email
 
 def _get_student_submission_email(
-    basedir, course, original, person, assignments, student, use_color=None):
+    basedir, course, person, assignments, student, use_color=None):
     subject = '{} assignment submissions for {}'.format(
         course.name, student.name)
     text = '{}:\n  * {}\n'.format(
@@ -437,8 +434,7 @@ def _get_student_submission_email(
         author=course.robot, targets=[person], subject=subject,
         message=message)
 
-def _get_admin_email(basedir, course, original, person, subject,
-                     use_color=None):
+def _get_admin_email(basedir, course, person, subject, use_color=True):
     lsubject = subject.lower()
     students = [p for p in course.find_people()
                 if p.name.lower() in lsubject]
@@ -456,13 +452,11 @@ def _get_admin_email(basedir, course, original, person, subject,
                        if a.name.lower() in lsubject]
         if len(assignments) == 0:
             email = _get_student_email(
-                basedir=basedir, course=course, original=original,
-                person=person, student=student, use_color=use_color)
+                basedir=basedir, course=course, person=person, student=student)
         else:
             email = _get_student_submission_email(
-                basedir=basedir, course=course, original=original,
-                person=person, student=student, assignments=assignments,
-                use_color=use_color)
+                basedir=basedir, course=course, person=person, student=student,
+                assignments=assignments, use_color=use_color)
     else:
         raise InvalidStudent(students=students)
     return email

diff --git a/pygrader/handler/submission.py b/pygrader/handler/submission.py
index 9021da2cd41ebdc26647fd3444541c49c5aa6843..ac9a1b36b7db6f36efa2173a18edb9b09bf9f14b 100644 (file)
--- a/pygrader/handler/submission.py
+++ b/pygrader/handler/submission.py
@@ -33,7 +33,7 @@ class InvalidAssignment (_InvalidMessage):
         self.assignment = assignment
 
 
-def run(basedir, course, original, message, person, subject,
+def run(basedir, course, message, person, subject,
         max_late=0, use_color=None, dry_run=None, **kwargs):
     """
     >>> from pgp_mime.email import encodedMIMEText
@@ -50,9 +50,8 @@ def run(basedir, course, original, message, person, subject,
     ...     'for <wking@tremily.us>; Sun, 09 Oct 2011 11:50:46 -0400 (EDT)')
     >>> subject = '[submit] assignment 1'
     >>> try:
-    ...     run(basedir=course.basedir, course=course.course, original=message,
-    ...         message=message, person=person, subject=subject,
-    ...         max_late=0)
+    ...     run(basedir=course.basedir, course=course.course, message=message,
+    ...         person=person, subject=subject, max_late=0)
     ... except Response as e:
     ...     print('respond with:')
     ...     print(e.message.as_string())

diff --git a/pygrader/mailpipe.py b/pygrader/mailpipe.py
index 053bf413f97c837cac742b44dc2ad124e857c2d2..e63a6e5aa3c53aca61dae2a0cbed286078cfeb45 100644 (file)
--- a/pygrader/mailpipe.py
+++ b/pygrader/mailpipe.py
@@ -562,8 +562,8 @@ def mailpipe(basedir, course, stream=None, mailbox=None, input_=None,
         try:
             handler = _get_handler(handlers=handlers, target=target)
             handler(
-                basedir=basedir, course=course, original=original,
-                message=message, person=person, subject=subject,
+                basedir=basedir, course=course, message=message,
+                person=person, subject=subject,
                 max_late=max_late, use_color=use_color, dry_run=dry_run)
         except _InvalidMessage as error:
             if not continue_after_invalid_message: