Fix "+00:00" and 0 being treated as UTC by Time#localtime and Time.at#9010
Merged
enebo merged 2 commits intojruby:masterfrom Sep 19, 2025
Merged
Fix "+00:00" and 0 being treated as UTC by Time#localtime and Time.at#9010enebo merged 2 commits intojruby:masterfrom
enebo merged 2 commits intojruby:masterfrom
Conversation
Time#utc? should return false when setting the offset to either "+00:00" or 0. Fixes jruby#8998.
Contributor
Author
|
The test failure is unrelated to this change. |
Member
|
@philr not sure if you tried running mspec without ci options on Time after this fix but there are other UTC/number failures which are tagged out (spec/tags/ruby/core/time/*). Thanks for the fix. Time and Date have been tough to address all failures. |
Member
|
@philr Just tried and nothing else passed as a result of this which I guess makes sense. |
Member
|
@philr Nice, thank you for the patch! This turned out easier than expected. |
Contributor
Author
|
@enebo thanks for merging this. I looked through the tagged out tests expecting to see something related, but found it wasn't covered. I hadn't run without the ci option, but wasn't expecting anything else to start passing. |
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
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 PR changes
Time#localtimeandTime.at, so that it no longer treats a zone of"+00:00"or0as UTC (i.e.Time#utc?will returnfalse). It resolves #8998.I've included some additional test cases from ruby/spec#1285.
The fixes to both methods reset
isTzRelativetofalseand then usehandleUTCDateTimeZoneto determine the time zone instead ofgetTimeZoneFromUtcOffset.handleUTCDateTimeZonecallsgetTimeZoneFromUtcOffsetand contains the necessary checks to determine if the specified zone should be treated as UTC. It setsisTzRelativetotrueif not. The call toadjustTimeZoneis then made with the newly setisTzRelativevalue.