ladok3 4.10__tar.gz → 4.12__tar.gz

{ladok3-4.10 → ladok3-4.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ladok3
-Version: 4.10
+Version: 4.12
 Summary: Python wrapper and CLI for the LADOK3 REST API.
 Home-page: https://github.com/dbosk/ladok3
 License: MIT

{ladok3-4.10 → ladok3-4.12}/doc/preamble.tex

@@ -13,7 +13,7 @@
 \renewcommand{\foreignfullfont}{}
 \renewcommand{\foreignabbrfont}{}
 
-\usepackage{newclude}
+%\usepackage{newclude}
 \usepackage{import}
 
 \usepackage[strict]{csquotes}

{ladok3-4.10 → ladok3-4.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ladok3"
-version = "4.10"
+version = "4.12"
 description = "Python wrapper and CLI for the LADOK3 REST API."
 authors = [
   "Daniel Bosk <dbosk@kth.se>",

{ladok3-4.10 → ladok3-4.12}/src/ladok3/cli.nw

@@ -522,6 +522,9 @@ def load_credentials(filename="config.json"):
 
 First we try the newest format.
 We try to fetch the institution and vars from the keyring.
+
+Note that [[keyring]] returns [[None]] if the key doesn't exist, it doesn't 
+raise an exception.
 <<fetch vars from keyring>>=
 try:
   institution = keyring.get_password("ladok3", "institution")
@@ -529,7 +532,9 @@ try:
 
   vars = {}
   for key in vars_keys.split(";"):
-    vars[key] = keyring.get_password("ladok3", key)
+    value = keyring.get_password("ladok3", key)
+    if value:
+      vars[key] = value
 
   if institution and vars:
     return institution, vars
@@ -542,12 +547,10 @@ supported KTH.
 <<fetch username and password from keyring>>=
 try:
   institution = "KTH Royal Institute of Technology"
-  vars = {
-    "username": keyring.get_password("ladok3", "username"),
-    "password": keyring.get_password("ladok3", "password")
-  }
-  if vars:
-    return institution, vars
+  username = keyring.get_password("ladok3", "username")
+  password = keyring.get_password("ladok3", "password")
+  if username and password:
+    return institution, {"username": username, "password": password}
 except:
   pass
 @
@@ -567,7 +570,7 @@ try:
     "username": os.environ["LADOK_USER"],
     "password": os.environ["LADOK_PASS"]
   }
-  if institution and vars:
+  if institution and vars["username"] and vars["password"]:
     return institution, vars
 except:
   pass
@@ -581,7 +584,12 @@ try:
 
   vars = {}
   for key in vars_keys.split(":"):
-    vars[key] = os.environ[key]
+    try:
+      value = os.environ[key]
+      if value:
+        vars[key] = value
+    except KeyError:
+      <<print warning about missing variable in [[LADOK_VARS]]>>
 
   if institution and vars:
     return institution, vars
@@ -589,6 +597,14 @@ except:
   pass
 @
 
+Unlike in the other cases, we don't just ignore the exception of the key not 
+existing.
+Since the user has explicitly specified the variable, we should warn them that 
+it doesn't exist.
+<<print warning about missing variable in [[LADOK_VARS]]>>=
+warn(f"Variable {key} not set, ignoring.")
+@
+
 If none of the above worked, the last resort is to try to read the 
 configuration file.
 We pop the institution from the configuration file (a dictionary), because then 
@@ -599,7 +615,7 @@ try:
     config = json.load(conf_file)
 
   institution = config.pop("institution",
-                            "KTH Royal Institute of Technology")
+                           "KTH Royal Institute of Technology")
   return institution, config
 except:
   pass