diff options
| author | Bert JW Regeer <xistence@0x58.com> | 2020-05-28 16:58:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 16:58:54 -0700 |
| commit | 412fadefabdddda7481fba1bc86958d2f3d10631 (patch) | |
| tree | 7c0c549662d393d3657679b502f524dacd1cda79 /src | |
| parent | 683bc742f7b08db563f3385796809c09babf004b (diff) | |
| parent | b19492dbbe5cebbabb91f01ae312d951b39ee931 (diff) | |
| download | pyramid-412fadefabdddda7481fba1bc86958d2f3d10631.tar.gz pyramid-412fadefabdddda7481fba1bc86958d2f3d10631.tar.bz2 pyramid-412fadefabdddda7481fba1bc86958d2f3d10631.zip | |
Merge pull request #3588 from Pylons/fix/pytest_runner
Fix: pytest runner
Diffstat (limited to 'src')
| -rw-r--r-- | src/pyramid/config/settings.py | 2 | ||||
| -rw-r--r-- | src/pyramid/i18n.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pyramid/config/settings.py b/src/pyramid/config/settings.py index d47743ec7..076c455d4 100644 --- a/src/pyramid/config/settings.py +++ b/src/pyramid/config/settings.py @@ -78,7 +78,7 @@ def Settings(d=None, _environ_=os.environ, **kw): value = type_(value) d.update({k: value for k in keys}) - def O(settings_key, override_key): # noqa: E743 + def O(settings_key, override_key): # noqa: E743, E741 for key in expand_key(settings_key): d[key] = d[key] or d[override_key] diff --git a/src/pyramid/i18n.py b/src/pyramid/i18n.py index 8c7d01d39..8bf091c58 100644 --- a/src/pyramid/i18n.py +++ b/src/pyramid/i18n.py @@ -263,7 +263,7 @@ class Translations(gettext.GNUTranslations): if locales is not None: if not isinstance(locales, (list, tuple)): locales = [locales] - locales = [str(l) for l in locales] + locales = [str(locale) for locale in locales] if not domain: domain = cls.DEFAULT_DOMAIN filename = gettext.find(domain, dirname, locales) |