From aa3bcd7d5eb8dfa763ccade470abaf2f7a45f4f0 Mon Sep 17 00:00:00 2001
From: Alex Kashuba <o.kashuba@gmail.com>
Date: Wed, 9 Apr 2025 16:52:07 +0200
Subject: [PATCH] Better None or syntaxis
---
src/main.py | 5 +----
tests/test_keyring.py | 17 +++++++++--------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main.py b/src/main.py
index 44b82f2..7c302bb 100644
--- a/src/main.py
+++ b/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:
diff --git a/tests/test_keyring.py b/tests/test_keyring.py
index bd3844e..5b5cc2f 100644
--- a/tests/test_keyring.py
+++ b/tests/test_keyring.py
@@ -3,16 +3,17 @@ from pytest import fixture, mark
from main import parse_credentials
import sys, os
+@fixture(scope='session')
+def whoami():
+ if sys.platform == 'darwin':
+ return os.getenv('USER')
+ else:
+ return os.getlogin()
+
@fixture
-def ex_whoami(ex_user):
- if ex_user is None:
- if sys.platform == 'darwin':
- return os.getenv('USER')
- else:
- return os.getlogin()
- else:
- return ex_user
+def ex_whoami(ex_user, whoami):
+ return ex_user or whoami
@fixture
--
GitLab