Fix to configuration loads with %(month[+\-][1-12])s that go out of range #264
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
| end_date = datetime.datetime( | ||
| start_date.year + years, new_month, start_date.day) | ||
| except ValueError: | ||
| max_day = calendar.monthrange(start_date.year + years, new_month)[1] |
There was a problem hiding this comment.
max_day, _ = calendar... would be more pythonic (remove the [1])
|
Missing tests! I think this calls for some new unit tests for |
| return_value=datetime.datetime(2013, 7, 31)) as now_patch: | ||
| self.mcp.config = manager.ConfigManager(temp_dir) | ||
| self.mcp._load_config() | ||
| now_patch.assert_any_call() |
There was a problem hiding this comment.
You could also assert that the action.command is the string you expect.
There was a problem hiding this comment.
It's still 'echo %(month-1)s' after the config is loaded (this test only loads and validates the config, it doesn't apply it), so I'm not sure what doing that in this test would accomplish.
|
Looks good, just a couple minor things |
dnephin
added a commit
that referenced
this pull request
Aug 7, 2013
Fix to configuration loads with %(month[+\-][1-12])s that go out of range
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.
This is a fix to #249. The core of the issue comes from when something with
%(month[+\-][1-12])sin its command context tries to be loaded on a day of the current month that isn't in the month targeted by the command context. For example, having%(month-1)son the 31st of most months will cause an attempted creation of adatetimeobject ofdatetime(year, month, 31)whenmonthis something like06(June, current month is July).This fix simply checks if the day was greater than it should have been, and if so, sets it to whatever the last day of the desired month is/was/will be. If this isn't what caused the exception, we raise it again.
We don't have to worry about not raising an exception in a case where the original starting day was invalid, as day deltas are handled differently (it just is a movement of that exact number of days, regardless of month or year), and this issue only happens in the creation of the second datetime object used for week and month delta calculation (so if the original day was invalid, we'll still get an exception).