Better None or syntaxis

src/main.py

@@ -5,10 +5,7 @@ import sys
 
 def parse_credentials(url):
     result = urlparse(url)
-    if result.username is None:
-        username = getpass.getuser()
-    else:
-        username = result.username
+    username = result.username or getpass.getuser()
     if result.port is None:
         hostname = result.hostname
     else:

tests/test_keyring.py

@@ -3,16 +3,17 @@ from pytest import fixture, mark
 from main import parse_credentials
 import sys, os
 
-
-@fixture
-def ex_whoami(ex_user):
-    if ex_user is None:
+@fixture(scope='session')
+def whoami():
     if sys.platform == 'darwin':
         return os.getenv('USER')
     else:
         return os.getlogin()
-    else:
-        return ex_user
+
+
+@fixture
+def ex_whoami(ex_user, whoami):
+    return ex_user or whoami
 
 
 @fixture