1445387: Set locale fact to Unknown if value cannot be determined #1605
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cnsnyder
reviewed
Apr 25, 2017
| @@ -67,7 +67,10 @@ def get_all(self): | |||
| host_facts.update(firmware_info_dict) | |||
|
|
|||
| locale_info = {} | |||
| locale_info['system.default_locale'] = ".".join(locale.getdefaultlocale()) | |||
| effective_locale = 'Unknown' | |||
| if locale.getdefaultlocale()[0] is not None: | |||
There was a problem hiding this comment.
Is it not possible for locale.getdefaultlocale() to return ("Something_not_none", None)?
Perhaps the following to be safe:
if all(local_entry is not None for locale_entry in locale.getdefaultlocale()):
...There was a problem hiding this comment.
Hrmmm. Good question actually... I tried
$ LC_ALL=en_us python -c 'import locale; print locale.getdefaultlocale()'
('en_US', 'ISO8859-1')but lemme code for that just in case...
cnsnyder
reviewed
Apr 25, 2017
| class HostCollectorTest(unittest.TestCase): | ||
|
|
||
| @mock.patch('locale.getdefaultlocale') | ||
| def test_unknown_locale(self, mock_locale): |
There was a problem hiding this comment.
If we think it's useful, I would suggest adding one more test for the case of ("Not_None", None) being returned from locale.getdefaultlocale()
That is if the language code from `getdefaultlocale`[1] is `None`, then special case this as 'Unknown'. If encoding is `None`, then it won't be included. [1]: https://docs.python.org/2/library/locale.html#locale.getdefaultlocale
kahowell
force-pushed
the
khowell/1445387
branch
from
387aef3
to
9c43204
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
That is if the language code from
getdefaultlocale1 isNone, thenspecial case this as 'Unknown'.