ladok3 4.11__py3-none-any.whl → 4.12__py3-none-any.whl

ladok3/cli.nw

@@ -570,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
@@ -585,7 +585,9 @@ try:
   vars = {}
   for key in vars_keys.split(":"):
     try:
-      vars[key] = os.environ[key]
+      value = os.environ[key]
+      if value:
+        vars[key] = value
     except KeyError:
       <<print warning about missing variable in [[LADOK_VARS]]>>
 

ladok3/cli.py

@@ -255,7 +255,7 @@ def load_credentials(filename="config.json"):
             "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
@@ -265,7 +265,9 @@ def load_credentials(filename="config.json"):
         vars = {}
         for key in vars_keys.split(":"):
             try:
-                vars[key] = os.environ[key]
+                value = os.environ[key]
+                if value:
+                    vars[key] = value
             except KeyError:
                 warn(f"Variable {key} not set, ignoring.")
 

{ladok3-4.11.dist-info → ladok3-4.12.dist-info}/METADATA

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

{ladok3-4.11.dist-info → ladok3-4.12.dist-info}/RECORD

@@ -1,10 +1,10 @@
-doc/ltxobj/ladok3.pdf,sha256=WZ3PoQ8-IPNLUNiOwv9P0pxsFHaRx2vTTgbQjtfGajo,1407824
+doc/ltxobj/ladok3.pdf,sha256=KL6Tkwv2CkkJvrYsYUDKNtbWXqHAzjiQEMxxHrRCRIk,1408326
 ladok3/.gitignore,sha256=QOcCshtjIsFasi4vaqFcooBWPJkxVWaoYEWOBBtdY_w,81
 ladok3/Makefile,sha256=Jy6OFjoVLU9YivnVxctxI_zrUOK9ysEOiistJ3ST6Nw,557
 ladok3/__init__.py,sha256=3z1Lys2ygnuDyYFvm4O4Um6vgYud470W3xX4gYJ4bMc,245725
 ladok3/api.nw,sha256=pHFU8T2tr2N4kJfyo7uKzNd1lpkd7KICK8lHzV6b1-Y,43304
-ladok3/cli.nw,sha256=cwooD_hc9ZpgnRhQ9TebbeWp_ZjKDTWjcV9Qqiqxu28,22378
-ladok3/cli.py,sha256=pLAVt2XhaGJ50knOlRNX_lcS3NFExu5ChHPgItRRGvI,12093
+ladok3/cli.nw,sha256=SD75vD-uSn-0yo6aOIUY4lgx9EjQf4M-HPHFZrNHMG0,22449
+ladok3/cli.py,sha256=1oUlrI9N7ooGfB-pYt1rkCCX9YKatb4MwP9ivGniK00,12186
 ladok3/data.nw,sha256=3o6-kmeMtCGoSJ5yL8qFCuIINQeym_WtW_2mhItuR-s,11785
 ladok3/data.py,sha256=kPRO9l5DTQb9lGnN2kU-YYPSyg31t0bq5HCw986hbPk,6747
 ladok3/ladok.bash,sha256=zGfTFdtos2zLjV13pzfK-1uCy2b_lF2qUKMoL2ExW7c,1441
@@ -14,8 +14,8 @@ ladok3/report.py,sha256=1K7cRaedemiOGDDAMI9wqnctLeic5ZlMYHw5hzhnvQw,5627
 ladok3/student.nw,sha256=zayn9_b9jCKeMnZxSGS_EuSmF3ojOBHQDMUMMkpRssI,3747
 ladok3/student.py,sha256=TaYn2rpbQnzummB-8xz-sUEV31Gh0CUmU0QkF6VgEic,1703
 ladok3/undoc.nw,sha256=NyHuVIzrRqJPM39MyAlZNEE7PbXdUDJFQ2kJ0NfdwQI,180333
-ladok3-4.11.dist-info/LICENSE,sha256=s_C5qznXAvDRrzU7vRd4eqzshyIkAfPwGyVBihGeOdM,1155
-ladok3-4.11.dist-info/METADATA,sha256=b_1jNYsFOsiXR11udNkWFRzBZepydHwWfRAu9PTRlFo,8822
-ladok3-4.11.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-ladok3-4.11.dist-info/entry_points.txt,sha256=pi-KKP5Obo0AyuDjXQUpadS9kIvAY2_5ORhPgEYlJv8,41
-ladok3-4.11.dist-info/RECORD,,
+ladok3-4.12.dist-info/LICENSE,sha256=s_C5qznXAvDRrzU7vRd4eqzshyIkAfPwGyVBihGeOdM,1155
+ladok3-4.12.dist-info/METADATA,sha256=2FZemXYNZcWIVuygpwfKm6UMI6UfmOFWnX8ONF4KVx4,8822
+ladok3-4.12.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+ladok3-4.12.dist-info/entry_points.txt,sha256=pi-KKP5Obo0AyuDjXQUpadS9kIvAY2_5ORhPgEYlJv8,41
+ladok3-4.12.dist-info/RECORD,,