Skip to content

Fix deprecated usage of getLevelName #19959

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
seanbudd merged 5 commits into from
Apr 21, 2026
Merged

Fix deprecated usage of getLevelName #19959

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b46612
Fix deprecated usage of getLevelName
seanbudd Apr 16, 2026
a849787
Update source/logHandler.py
seanbudd Apr 16, 2026
bafb140
fix other instance
seanbudd Apr 21, 2026
3effa80
Pre-commit auto-fix
pre-commit-ci[bot] Apr 21, 2026
7bb44c0
Apply suggestion from @seanbudd
seanbudd Apr 21, 2026
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
13 changes: 9 additions & 4 deletions source/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ def _initBaseConf(self, factoryDefaults=False):
self.profiles.append(profile)
self._handleProfileSwitch()

def _loadConfig(self, fn, fileError=False):
def _loadConfig(self, fn: str, fileError: bool = False) -> ConfigObj:
Comment thread
seanbudd marked this conversation as resolved.
Outdated
log.info("Loading config: {0}".format(fn))
profile = ConfigObj(fn, indent_type="\t", encoding="UTF-8", file_error=fileError)
# Python converts \r\n to \n when reading files in Windows, so ConfigObj can't determine the true line ending.
Expand All @@ -609,10 +609,15 @@ def _loadConfig(self, fn, fileError=False):
# since profile settings are not yet imported we have to "peek" to see
# if debug level logging is enabled.
try:
logLevelName = profile["general"]["loggingLevel"]
logLevelName: str = profile["general"]["loggingLevel"]
if not logLevelName:
level = None
else:
level = logging.getLevelNamesMapping().get(logLevelName)
except KeyError:
logLevelName = None
if log.isEnabledFor(log.DEBUG) or (logLevelName and DEBUG >= logging.getLevelName(logLevelName)):
level = None

if log.isEnabledFor(log.DEBUG) or (level and DEBUG >= level):
# Log at level info to ensure that the profile is logged.
log.info(
"Config loaded (after upgrade, and in the state it will be used by NVDA):\n{0}".format(
Expand Down
7 changes: 3 additions & 4 deletions source/logHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,12 +657,11 @@ def setLogLevelFromConfig():
return
import config

levelName = config.conf["general"]["loggingLevel"]
# logging.getLevelName can give you a level number if given a name.
level = logging.getLevelName(levelName)
levelName: str = config.conf["general"]["loggingLevel"]
level = logging.getLevelNamesMapping().get(levelName)
# The lone exception to level higher than INFO is "OFF" (100).
# Setting a log level to something other than options found in the GUI is unsupported.
if level not in (log.DEBUG, log.IO, log.DEBUGWARNING, log.INFO, log.OFF):
if level is None or level not in (log.DEBUG, log.IO, log.DEBUGWARNING, log.INFO, log.OFF):
log.warning("invalid setting for logging level: %s" % levelName)
level = log.INFO
config.conf["general"]["loggingLevel"] = logging.getLevelName(log.INFO)
Expand Down
Loading