Merging the changes that we have made over the last couple of years with the upstream project code #1
Conversation
This file contains hidden or 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
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@10544 25043fe6-1616-0410-a82d-ba8f324cfe61
…ive datetime or converts a non-naive datetime to the local timezone git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@10545 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@10546 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@10573 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@10574 25043fe6-1616-0410-a82d-ba8f324cfe61
…ity over others. If multiple matches are found to `/etc/localtime`, warn, but still use the first one. git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@10851 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@11166 25043fe6-1616-0410-a82d-ba8f324cfe61
… names, then checking Olsen database. Also, raise a better error if this fails. See #3811 git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@11493 25043fe6-1616-0410-a82d-ba8f324cfe61
…ally generates this file (which can be used to keep up to date; not called by default). See #3811 git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@11495 25043fe6-1616-0410-a82d-ba8f324cfe61
…t column value setter git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@11497 25043fe6-1616-0410-a82d-ba8f324cfe61
…re we use the `standardName`. This is tested on an hactual Japanese machine. See #3811 (Also fix the spelling ''Olsen''`->`''Olson'') git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@11503 25043fe6-1616-0410-a82d-ba8f324cfe61
…tency git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@12719 25043fe6-1616-0410-a82d-ba8f324cfe61
…ing calls. Removed `add_available_sites` call from `AdminApp` which was never used and only prints out arguments (cherry picked from commit ea03ebc8d75c62edadf23fc2241491a7926eb55e) git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@13508 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@13831 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@13952 25043fe6-1616-0410-a82d-ba8f324cfe61
…icTimeZoneInformation` if possible. See #5858 git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@14014 25043fe6-1616-0410-a82d-ba8f324cfe61
…ion`), then use that directly instead of looking up the index. Name the variable more appropriately too. See #5858 git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@14015 25043fe6-1616-0410-a82d-ba8f324cfe61
…formation` not present in `win32timezones` - see #5858 git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@14016 25043fe6-1616-0410-a82d-ba8f324cfe61
…`datetime.datetime.now/utcnow` and the equivalent `datetime_tz` functions. See #6165 git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@14105 25043fe6-1616-0410-a82d-ba8f324cfe61
…e the path underneath the module. See #6165 git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@14135 25043fe6-1616-0410-a82d-ba8f324cfe61
… one is set git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@14852 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@15704 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@16489 25043fe6-1616-0410-a82d-ba8f324cfe61
…atetime with local timezone git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@16490 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@16491 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@16492 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@18172 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@18174 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@18735 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@18736 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@18737 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@18741 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@18790 25043fe6-1616-0410-a82d-ba8f324cfe61
git-svn-id: svn+ssh://svn.sjsoft.com/home/opensvn/svn/trunk@18792 25043fe6-1616-0410-a82d-ba8f324cfe61
…wards compatibility).
…coded reference to the datetime_tz class.
There was a problem hiding this comment.
This was in the original commit I pulled in - was it subsequently fixed in datetime_tz? I don't think we rely on the broken behaviour in any way, we don't call the smartparse function at all anywhere.
Author
There was a problem hiding this comment.
Yes... at first, I thought we had fixed it, so put in the backwards compatibility thing just in case. Then realised they had - but it was recent - so I figure they probably forgot about backwards compatibility and that it would still be worthwhile keeping ...
|
Otherwise looks good to me. I haven't gone through to see what they subsequently implemented that we also implemented, though |
Author
There was a problem hiding this comment.
@Dave42 Would you mind having a look at these bits for me? I'm not sure what they are about, and whether we should be using their version rather than ours, or some combination...
There was a problem hiding this comment.
I've analysed what we do and what they do, and I believe our way is better. The comparison is essentially the same, although to my mind ours reads a lot cleaner, and the one thing we do different is to search the common timezones first, which will result in quicker matches about 95% of the time. I think we can justify moving to our comparison as they're computationally the same, but the list comprehensions used by us will be faster than the loops used by them.
matthewhampton
added a commit
that referenced
this pull request
Jun 2, 2014
Merging the changes that we have made over the last couple of years with the upstream project code
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.