PEP8-ify and change generator length calculation #3
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
circld
requested changes
Nov 10, 2017
There was a problem hiding this comment.
i like the sum(1 for ... ) ... is it demonstrably faster?
Some of the places where you suggest breaking the line into two are fine with me, but some of them are fine as is: lines 61 and 133.
Important things
- Please run the test suite... line 125 will probably break some of them.
- Please point this pull request at develop rather than master.
Thanks!
circld
requested changes
Nov 10, 2017
| @@ -101,11 +102,13 @@ def holiday_count(start, end, skip): | |||
| """ | |||
| skip = skip if skip else [] | |||
| non_weekend = (d for d in skip if d.weekday() < 5) | |||
| return len([e for e in non_weekend if e >= start and e <= end]) | |||
| # Count number of days without creating intermediate list | |||
| return sum(1 for e in non_weekend if e >= start and e <= end) | |||
| @@ -58,7 +58,8 @@ def iterate_days(current, remaining): | |||
| while guess.weekday() > 4: | |||
| guess = op(guess, timedelta(days=1)) | |||
| s, e = sorted([current, guess]) | |||
| diff = business_days_interval(s, e, skip) - (1 if current.weekday() < 5 else 0) | |||
| diff = business_days_interval(s, e, skip) - \ | |||
| (1 if current.weekday() < 5 else 0) | |||
There was a problem hiding this comment.
don't want to split this line...it's a single idea and it's not that long
| d2 = dow2 if dow2 > dow1 else dow2 + 7 | ||
|
|
||
| return len(tuple(i for i in range(dow1, d2 + 1) if i not in (5, 6))) | ||
| # Count the desired number of days without creating intermediate tuples |
There was a problem hiding this comment.
If it turns out that this approach is faster, then we can keep the change but nix the comment.
| @@ -130,9 +135,11 @@ def str_to_date(text): | |||
| def main(args): | |||
|
|
|||
| days = int(args['-n']) if args['-n'] is not None else args['-n'] | |||
| start = date.today() if args['--start'] == 'today' else str_to_date(args['--start']) | |||
| start = date.today() if args['--start'] == 'today' \ | |||
| else str_to_date(args['--start']) | |||
| end = str_to_date(args['--end']) if args['--end'] is not None else None | ||
| skip = tuple(str_to_date(d) for d in args['SKIP']) if args['SKIP'] is not None else args['SKIP'] | ||
| skip = tuple(str_to_date(d) for d in args['SKIP']) \ | ||
| if args['SKIP'] is not None else args['SKIP'] |
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.
I tinkered with the
weekdaysfunction for a while, trying to cleverly implement some modular arithmetic but it didn't pan out. Counting the number of days elapsed, skipping Saturday and Sunday, is a good method. Theitertools.dropwhilemethod would be perfect for this, if you want to go that route.