summaryrefslogtreecommitdiffstats
path: root/pgcli
diff options
context:
space:
mode:
authorDamien Baty <damien@damienbaty.com>2023-03-18 10:22:12 +0100
committerDamien Baty <damien@damienbaty.com>2023-03-18 10:22:12 +0100
commit1c071770bb037196bd3830258c33c6ad9031c0b3 (patch)
treeac28b289ef317d241b057d6ca589fd69e0a5ea08 /pgcli
parent5e34e0b55766099a2965eaa61e77795fa577f9f4 (diff)
Remove leftovers of Python 2 support
Diffstat (limited to 'pgcli')
-rw-r--r--pgcli/auth.py2
-rw-r--r--pgcli/main.py5
2 files changed, 2 insertions, 5 deletions
diff --git a/pgcli/auth.py b/pgcli/auth.py
index 342c4127..3d2fbeb9 100644
--- a/pgcli/auth.py
+++ b/pgcli/auth.py
@@ -26,7 +26,7 @@ def keyring_initialize(keyring_enabled, *, logger):
try:
keyring = importlib.import_module("keyring")
- except Exception as e: # ImportError for Python 2, ModuleNotFoundError for Python 3
+ except ModuleNotFoundError as e:
logger.warning("import keyring failed: %r.", e)
diff --git a/pgcli/main.py b/pgcli/main.py
index 5a263f56..cb8d4c1e 100644
--- a/pgcli/main.py
+++ b/pgcli/main.py
@@ -70,10 +70,7 @@ from .__init__ import __version__
click.disable_unicode_literals_warning = True
-try:
- from urlparse import urlparse
-except ImportError:
- from urllib.parse import urlparse
+from urllib.parse import urlparse
from getpass import getuser