cornellGrading 2.27.0__tar.gz → 2.27.1__tar.gz

{cornellgrading-2.27.0/cornellGrading.egg-info → cornellgrading-2.27.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cornellGrading
-Version: 2.27.0
+Version: 2.27.1
 Summary: Routines for interacting with Cornell installations of Canvas and Qualtrics
 Home-page: https://github.com/dsavransky/grading
 Author: Dmitry Savransky

{cornellgrading-2.27.0 → cornellgrading-2.27.1}/cornellGrading/__init__.py

@@ -1,5 +1,5 @@
 name = "cornellGrading"
-__version__ = "2.27.0"
+__version__ = "2.27.1"
 from .cornellGrading import cornellGrading
 from .cornellQualtrics import cornellQualtrics
 from .simplelists import simplelists

{cornellgrading-2.27.0 → cornellgrading-2.27.1}/cornellGrading/cornellGrading.py

@@ -62,6 +62,19 @@ class cornellGrading:
         """
 
         token = keyring.get_password("canvas_test_token1", "canvas")
+        # try to use token on disk and give user option to overwrite
+        if token is not None:
+            try:
+                canvas = Canvas(canvasurl, token)
+                canvas.get_current_user()
+            except InvalidAccessToken:
+                res = input("Token saved to keychain is invalid. Update token? [Y]/n ?")
+                if res == "n":
+                    print("Exiting")
+                else:
+                    token = None
+
+        # no token on disk or token on disk is invalid and user asked to overwrite
         if token is None:
             if canvas_token_file is None:
                 token = getpass.getpass("Enter canvas token:\n")
@@ -76,11 +89,9 @@ class cornellGrading:
                 print("Connected.  Token Saved")
             except InvalidAccessToken:
                 print("Could not connect. Token not saved.")
-        else:
-            canvas = Canvas(canvasurl, token)
-            canvas.get_current_user()
-            print("Connected to Canvas.")
+                return
 
+        print("Connected to Canvas.")
         self.canvas = canvas
 
     def listCourses(self):

{cornellgrading-2.27.0 → cornellgrading-2.27.1/cornellGrading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cornellGrading
-Version: 2.27.0
+Version: 2.27.1
 Summary: Routines for interacting with Cornell installations of Canvas and Qualtrics
 Home-page: https://github.com/dsavransky/grading
 Author: Dmitry Savransky