Skip to content

Remove Python 2 basestring compatibility tricks #1220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolandwalker merged 1 commit into from
Apr 26, 2025
Merged

Remove Python 2 basestring compatibility tricks #1220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions mycli/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
from configobj import ConfigObj, ConfigObjError
import pyaes

try:
basestring
except NameError:
basestring = str


logger = logging.getLogger(__name__)

Expand All @@ -40,7 +35,7 @@ def read_config_file(f, list_values=True):

"""

if isinstance(f, basestring):
if isinstance(f, str):
f = os.path.expanduser(f)

try:
Expand Down Expand Up @@ -284,7 +279,7 @@ def str_to_bool(s):
"""Convert a string value to its corresponding boolean value."""
if isinstance(s, bool):
return s
elif not isinstance(s, basestring):
elif not isinstance(s, str):
raise TypeError("argument must be a string")

true_values = ("true", "on", "1")
Expand All @@ -305,7 +300,7 @@ def strip_matching_quotes(s):
values.

"""
if isinstance(s, basestring) and len(s) >= 2 and s[0] == s[-1] and s[0] in ('"', "'"):
if isinstance(s, str) and len(s) >= 2 and s[0] == s[-1] and s[0] in ('"', "'"):
s = s[1:-1]
return s

Expand Down