Skip to content
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

Jump to bottom

Allow to use_given_order for languages too #997

Merged
merged 5 commits into from Oct 27, 2021
Merged

Allow to use_given_order for languages too #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fab5e91
allow use_given_order for languages
whalebot-helmsman Oct 7, 2021
c8f520f
fix typo
whalebot-helmsman Oct 8, 2021
4fb0601
remove obsolete test
whalebot-helmsman Oct 8, 2021
b104a72
bring test back
whalebot-helmsman Oct 8, 2021
585a8db
test for loading languages only
whalebot-helmsman Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions dateparser/date.py
View file
Open in desktop
Expand Up @@ -358,8 +358,8 @@ def __init__(self, languages=None, locales=None, region=None, try_previous_local
raise TypeError("use_given_order argument must be a boolean (%r given)"
% type(use_given_order))

if not locales and use_given_order:
raise ValueError("locales must be given if use_given_order is True")
if not locales and not languages and use_given_order:
raise ValueError("locales or languages must be given if use_given_order is True")

check_settings(settings)

Expand Down
7 changes: 5 additions & 2 deletions tests/test_date.py
View file
Open in desktop
Expand Up @@ -652,10 +652,13 @@ def test_error_raised_for_invalid_use_given_order_argument(self, use_given_order
TypeError, ["use_given_order argument must be a boolean (%r given)"
% type(use_given_order)])

def test_error_is_raised_when_use_given_order_is_True_and_locales_is_None(self):
def test_error_is_raised_when_use_given_order_is_True_and_locales_and_languages_is_None(self):
self.when_parser_is_initialized(use_given_order=True)
self.then_error_was_raised(
ValueError, ["locales must be given if use_given_order is True"])
ValueError, ["locales or languages must be given if use_given_order is True"])

def test_no_error_for_order_with_languages_without_locales(self):
self.when_parser_is_initialized(languages=['en', 'fr'], use_given_order=True)

def when_parser_is_initialized(self, languages=None, locales=None, region=None,
try_previous_locales=True, use_given_order=False):
Expand Down