canvaslms 5.8__py3-none-any.whl → 5.9__py3-none-any.whl

canvaslms/cli/assignments.nw

@@ -1338,7 +1338,8 @@ content, accept it (which triggers the update), edit further, or discard changes
 title = attributes.get('name', assignment.name)
 result = canvaslms.cli.content.interactive_confirm_and_edit(
     title, body_content, attributes,
-    canvaslms.cli.content.ASSIGNMENT_SCHEMA, "Assignment")
+    canvaslms.cli.content.ASSIGNMENT_SCHEMA, "Assignment",
+    content_attr='description')
 
 if result is None:
   print("Discarded changes for this assignment.", file=sys.stderr)

canvaslms/cli/assignments.py

@@ -768,6 +768,7 @@ def assignments_edit_command(config, canvas, args):
                 attributes,
                 canvaslms.cli.content.ASSIGNMENT_SCHEMA,
                 "Assignment",
+                content_attr="description",
             )
 
             if result is None:

canvaslms/cli/content.nw

@@ -985,9 +985,14 @@ loop. Users can preview their content, choose to accept it, edit it further,
 or discard their changes.
 
 The function is generalized to work with any content type by accepting the
-schema for re-editing.
+schema for re-editing. When the user chooses to edit again, we need to pass
+the current content back to [[get_content_from_editor]]. Since that function
+expects content to be stored in the attributes dictionary under a named key
+(e.g., \enquote{message} for announcements, \enquote{body} for pages), we accept
+a [[content_attr]] parameter specifying which key to use.
 <<interactive functions>>=
-def interactive_confirm_and_edit(title, message, attributes, schema, content_type="Content"):
+def interactive_confirm_and_edit(title, message, attributes, schema,
+                                 content_type="Content", content_attr='message'):
     """Interactive loop for confirming or editing content.
 
     Args:
@@ -996,6 +1001,7 @@ def interactive_confirm_and_edit(title, message, attributes, schema, content_typ
         attributes: Current attributes
         schema: Schema for re-editing
         content_type: Type label for display
+        content_attr: Name of attribute that holds body content (for re-editing)
 
     Returns:
         Tuple of (attributes, message), or None if cancelled
@@ -1021,7 +1027,9 @@ def interactive_confirm_and_edit(title, message, attributes, schema, content_typ
         if choice in ['a', 'accept']:
             return current_attributes, current_message
         elif choice in ['e', 'edit']:
-            result = get_content_from_editor(schema, current_attributes, current_message)
+            edit_attrs = current_attributes.copy()
+            edit_attrs[content_attr] = current_message
+            result = get_content_from_editor(schema, edit_attrs, content_attr=content_attr)
             if result is None:
                 print("Editor cancelled or failed. Keeping previous content.", file=sys.stderr)
             else:

canvaslms/cli/content.py

@@ -479,7 +479,7 @@ def render_content_preview(
 
 
 def interactive_confirm_and_edit(
-    title, message, attributes, schema, content_type="Content"
+    title, message, attributes, schema, content_type="Content", content_attr="message"
 ):
     """Interactive loop for confirming or editing content.
 
@@ -489,6 +489,7 @@ def interactive_confirm_and_edit(
         attributes: Current attributes
         schema: Schema for re-editing
         content_type: Type label for display
+        content_attr: Name of attribute that holds body content (for re-editing)
 
     Returns:
         Tuple of (attributes, message), or None if cancelled
@@ -516,8 +517,10 @@ def interactive_confirm_and_edit(
         if choice in ["a", "accept"]:
             return current_attributes, current_message
         elif choice in ["e", "edit"]:
+            edit_attrs = current_attributes.copy()
+            edit_attrs[content_attr] = current_message
             result = get_content_from_editor(
-                schema, current_attributes, current_message
+                schema, edit_attrs, content_attr=content_attr
             )
             if result is None:
                 print(

canvaslms/cli/discussions.nw

@@ -394,7 +394,8 @@ for course in course_list:
 
 result = canvaslms.cli.content.interactive_confirm_and_edit(
   title, message, attributes,
-  canvaslms.cli.content.ANNOUNCEMENT_SCHEMA, "Announcement")
+  canvaslms.cli.content.ANNOUNCEMENT_SCHEMA, "Announcement",
+  content_attr='message')
 if result is None:
   print("Cancelled.", file=sys.stderr)
   sys.exit(0)
@@ -775,7 +776,8 @@ After editing, we enter the interactive confirm loop.
 title = edited_attrs.get('title', announcement.title)
 result = canvaslms.cli.content.interactive_confirm_and_edit(
     title, body_content, edited_attrs,
-    canvaslms.cli.content.ANNOUNCEMENT_SCHEMA, "Announcement")
+    canvaslms.cli.content.ANNOUNCEMENT_SCHEMA, "Announcement",
+    content_attr='message')
 
 if result is None:
   print("Discarded changes.", file=sys.stderr)

canvaslms/cli/discussions.py

@@ -143,6 +143,7 @@ def announce_command(config, canvas, args):
             attributes,
             canvaslms.cli.content.ANNOUNCEMENT_SCHEMA,
             "Announcement",
+            content_attr="message",
         )
         if result is None:
             print("Cancelled.", file=sys.stderr)
@@ -436,6 +437,7 @@ def discussions_edit_command(config, canvas, args):
                 edited_attrs,
                 canvaslms.cli.content.ANNOUNCEMENT_SCHEMA,
                 "Announcement",
+                content_attr="message",
             )
 
             if result is None:

canvaslms/cli/pages.nw

@@ -744,7 +744,8 @@ content, accept it (which triggers the update), edit further, or discard changes
 title = attributes.get('title', full_page.title)
 result = canvaslms.cli.content.interactive_confirm_and_edit(
     title, body_content, attributes,
-    canvaslms.cli.content.PAGE_SCHEMA, "Page")
+    canvaslms.cli.content.PAGE_SCHEMA, "Page",
+    content_attr='body')
 
 if result is None:
   print("Discarded changes for this page.", file=sys.stderr)

canvaslms/cli/pages.py

@@ -525,6 +525,7 @@ def pages_edit_command(config, canvas, args):
                 attributes,
                 canvaslms.cli.content.PAGE_SCHEMA,
                 "Page",
+                content_attr="body",
             )
 
             if result is None:

canvaslms/cli/quizzes.nw

@@ -3426,7 +3426,8 @@ def edit_quiz_interactive(quiz, requester, html_mode=False):
     message=body,
     attributes=attributes,
     schema=QUIZ_SCHEMA,
-    content_type="Quiz"
+    content_type="Quiz",
+    content_attr='instructions'
   )
 
   if result is None:

canvaslms/cli/quizzes.py

@@ -2499,6 +2499,7 @@ def edit_quiz_interactive(quiz, requester, html_mode=False):
         attributes=attributes,
         schema=QUIZ_SCHEMA,
         content_type="Quiz",
+        content_attr="instructions",
     )
 
     if result is None:

{canvaslms-5.8.dist-info → canvaslms-5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: canvaslms
-Version: 5.8
+Version: 5.9
 Summary: Command-line interface to Canvas LMS
 License-Expression: MIT
 License-File: LICENSE

{canvaslms-5.8.dist-info → canvaslms-5.9.dist-info}/RECORD

@@ -2,30 +2,30 @@ canvaslms/Makefile,sha256=9zE09HzyU-S2B1RI72UV1S9mmqXKiE9gIn-NuhyQP08,119
 canvaslms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 canvaslms/cli/Makefile,sha256=8uQf6xKYRr_4mrYA-FnYYh7xAq7CcBvF3rbqDTNLUyY,820
 canvaslms/cli/__init__.py,sha256=KiOWz1mshRZeqQAmj_l27ZP2krgX-ta0X18Rs4KX8Ng,6515
-canvaslms/cli/assignments.nw,sha256=3XyaP_xl42tcMyNmmZ2Bi5vdYuRBx0jEC6Wh2Vwo7t4,54749
-canvaslms/cli/assignments.py,sha256=4M8cguSPBuUE7V4sjfFJ3oSL3XiGz7bfEquXFzY9TKU,38710
+canvaslms/cli/assignments.nw,sha256=bgKytV48ya0cGJsuur6sIZ_V7ZvuNR1qF7qPvg1xf2U,54781
+canvaslms/cli/assignments.py,sha256=gphQuMgB0H_y-w4flidu9QRPREheBtuLF8zg70-9gZs,38754
 canvaslms/cli/cache.nw,sha256=TV9nUkwSUrFyltH98uUJ-3BLXT_-yNGsilaFlbByaxU,13350
 canvaslms/cli/cache.py,sha256=EBD2YLYa7Efq_RWsDgZOf44SaUemsyPWgeYVS-eW1uk,8217
 canvaslms/cli/calendar.nw,sha256=-dN8Sx9LWGBwhq2wc3w0GjQL3ywwPKfvi9gjsRJ6qVg,22887
 canvaslms/cli/calendar.py,sha256=f8af6McSxg5G2Etf6TAxwp1cnYodlcyw7SJgcJJLBks,20898
 canvaslms/cli/canvas_calendar.py,sha256=AbA6nOZ7e-zACfAqwK1utBjuShVGsaERxIJ4xRKEUZc,22196
 canvaslms/cli/cli.nw,sha256=f3xbi1kzjVSsFzEmOS_7Pfy7nJbkYuAcR11RVqkSSsE,23675
-canvaslms/cli/content.nw,sha256=cFl2raYWrXJXXcjZ2cuzWIHdezUMlBypJhq95ZGEENg,36404
-canvaslms/cli/content.py,sha256=BXpQxhTfsNBgdRd3bz4E997gsBtPmk8_ILJqZnwEnHA,17149
+canvaslms/cli/content.nw,sha256=hg_KBHAPXTGyZFMV2Y96oE3VUHaVxsY2hvJBQDDHvOA,36995
+canvaslms/cli/content.py,sha256=OQiyhtwNenOZ1V0665f7p9VE9P3Zz3AX6vIzz0VqpKo,17362
 canvaslms/cli/courses.nw,sha256=W8hNE8wQYPoSRDbqdU_qFvmOFWF6mRap0NLaz-edHH0,14569
 canvaslms/cli/courses.py,sha256=XKeV43xNT1or_qv40_IATJgey2zbVEg8qHqnz-Z7qUo,3743
-canvaslms/cli/discussions.nw,sha256=IPavr0m43OeCsUvZVqnpSEDb9UZ_oh6IDpsAXW0wMmY,46633
-canvaslms/cli/discussions.py,sha256=R6GbFbHYXCa0vyDf4eegGp74Pj6WGC38MEb6kY0PkWY,40388
+canvaslms/cli/discussions.nw,sha256=woTvzURp10kimseuYTZs2RTFpCKnpxCsCnDTFK_4jNI,46687
+canvaslms/cli/discussions.py,sha256=fNhJlfzWLzH7Z_fP95w6Scp_ZS7R5Io7zRKQtKa68YU,40464
 canvaslms/cli/grade.nw,sha256=ms7sBiGRPbK0CJLKxxYx_CDY9LMWgKxUuf2M3FYepMs,2197
 canvaslms/cli/grade.py,sha256=b7YkFIz64oXzcV2FcptpYJphevuCU3cdx9CilZHcG_A,662
 canvaslms/cli/login.nw,sha256=93LyHO_LXL1WdEvMg3OLhWulgkdoO8pfjYZVLwUbX4I,4419
 canvaslms/cli/login.py,sha256=wbA5Q9fTsW1J-vraRcdq2kG4h_LFtvH_MTEay6h8GcE,2737
 canvaslms/cli/modules.nw,sha256=rvrZe4AU_ok955GZ_ZwwFNFIHIKzft1LR9zTVLW_gic,24122
 canvaslms/cli/modules.py,sha256=8fZpW_x7eUMUgcn8JrvbGuwtrmHsbVdNvqfcRgfF4x8,12953
-canvaslms/cli/pages.nw,sha256=njm6oQT22ryI8Z7O62d-qivQjbMX_je5OwhgHEvtVUg,28934
-canvaslms/cli/pages.py,sha256=lW8DpMeyQQoVcu7ztSj_PdW-oUJC0HSh5mDeo8BuaRc,27713
-canvaslms/cli/quizzes.nw,sha256=xgivQGColOzayvMn3OcxJf0V7E2K2lzindzPeBqymBw,262940
-canvaslms/cli/quizzes.py,sha256=1gX16Mo49rO4j98xy_j7xSuIs0E9DcOJigB90imBNR4,198225
+canvaslms/cli/pages.nw,sha256=ZCv1NAwwXRzSy27ePJ3CI1ET1BBZJsM2scnoZxCW4n4,28959
+canvaslms/cli/pages.py,sha256=7E6gjEfs3L6A9_c84gRHvx7auDDV7MQWUXDwQ2-dkz4,27750
+canvaslms/cli/quizzes.nw,sha256=c1zco19uSt9ULIyYWqoCYgNvK4PeSfC6otUpA_b7Flg,262973
+canvaslms/cli/quizzes.py,sha256=jLb1vVU7WClqaDVfXk9akgfii4X_Z5IO1FV6hEhdAAs,198262
 canvaslms/cli/results.nw,sha256=SQIiCwcQUO-irUD6-Ya-4QBVHo19uv5QHH7GXNvdrDg,26862
 canvaslms/cli/results.py,sha256=2KGcqGzmrfqc2Jj5ddQcrm33qF_DYHoljTol4qI9pSg,16845
 canvaslms/cli/results.py.broken,sha256=njHu8mKfPHqH4daxy-4LMpO6FdUBLPHiVKFFmyH8aJQ,13047
@@ -59,8 +59,8 @@ canvaslms/hacks/attachment_cache.py,sha256=LcOZqaa6jPrEJWUD-JYN5GTc3bxCbv2fr_vqu
 canvaslms/hacks/canvasapi.nw,sha256=ixmIHn4tgy-ZKtQ1rqWSw97hfY2m0qtGX0de2x89lwA,136470
 canvaslms/hacks/canvasapi.py,sha256=A-r48x7gO6143_QkuZ8n6EW66i-a2AXXr7X7oeehOAU,31868
 canvaslms/hacks/test_hacks.py,sha256=JSJNvZqHu1E_s51HsPD7yr1gC-R-xVe-tuMMAKU9Gj8,66709
-canvaslms-5.8.dist-info/METADATA,sha256=Xz-kANG9wsPDHQvYbkE_0HfRM1jLN3z8qhmwA0w75pM,6078
-canvaslms-5.8.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-canvaslms-5.8.dist-info/entry_points.txt,sha256=lyblfkLbodN5yb7q1c6-rwIoJPV-ygXrB9PYb5boHXM,48
-canvaslms-5.8.dist-info/licenses/LICENSE,sha256=N_TKsbzzD5Ax5fWJqEQk9bkwtf394MJkNeFld4HV6-E,1074
-canvaslms-5.8.dist-info/RECORD,,
+canvaslms-5.9.dist-info/METADATA,sha256=KADA9jxYVaKQdgBMTccpmz794RWGkw7l296vT6UvxFg,6078
+canvaslms-5.9.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+canvaslms-5.9.dist-info/entry_points.txt,sha256=lyblfkLbodN5yb7q1c6-rwIoJPV-ygXrB9PYb5boHXM,48
+canvaslms-5.9.dist-info/licenses/LICENSE,sha256=N_TKsbzzD5Ax5fWJqEQk9bkwtf394MJkNeFld4HV6-E,1074
+canvaslms-5.9.dist-info/RECORD,,