Skip to content

bpo-24643: Fix "#define timezone _timezone" clashes on Windows#12019

Merged
zooba merged 1 commit into
python:masterfrom
ZackerySpytz:bpo-24643-timezone-clashes
Feb 25, 2019
Merged

bpo-24643: Fix "#define timezone _timezone" clashes on Windows#12019
zooba merged 1 commit into
python:masterfrom
ZackerySpytz:bpo-24643-timezone-clashes

Conversation

@ZackerySpytz

@ZackerySpytz ZackerySpytz commented Feb 24, 2019 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

Several solutions were proposed on the bug tracker.

https://bugs.python.org/issue24643

@ZackerySpytz ZackerySpytz requested a review from a team as a code owner February 24, 2019 14:55
@zooba zooba merged commit 6673dec into python:master Feb 25, 2019
@miss-islington

miss-islington commented Feb 25, 2019

Copy link
Copy Markdown
Contributor

Thanks @ZackerySpytz for the PR, and @zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 25, 2019
@ZackerySpytz @miss-islington
bpo-24643: Fix "GH-define timezone _timezone" clashes on Windows (pyt…
91a87cc 
…honGH-12019)

(cherry picked from commit 6673dec)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
@bedevere-bot

bedevere-bot commented Feb 25, 2019

Copy link
Copy Markdown

GH-12040 is a backport of this pull request to the 3.7 branch.

miss-islington added a commit that referenced this pull request Feb 26, 2019
@miss-islington @ZackerySpytz
bpo-24643: Fix "GH-define timezone _timezone" clashes on Windows (GH-…
0b3019a 
…12019)

(cherry picked from commit 6673dec)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
@bedevere-bot

bedevere-bot commented Feb 26, 2019

Copy link
Copy Markdown

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot s390x Debian 3.x has failed when building commit 6673dec.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/13/builds/2414) and take a look at the build logs.
  4. Check if the failure is related to this commit (6673dec) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/13/builds/2414

Click to see traceback logs 
Traceback (most recent call last):
  File "/home/dje/cpython-buildarea/3.x.edelsohn-debian-z/build/Lib/test/_test_multiprocessing.py", line 2754, in test_mymanager_context_prestarted
    self.assertEqual(manager._process.exitcode, 0)
AssertionError: -11 != 0

----------------------------------------------------------------------

Ran 344 tests in 101.444s

FAILED (failures=1, skipped=32)


Traceback (most recent call last):
  File "/home/dje/cpython-buildarea/3.x.edelsohn-debian-z/build/Lib/test/test_descr.py", line 4341, in test_vicious_descriptor_nonsense
    self.assertEqual(c.attr, 1)
  File "/home/dje/cpython-buildarea/3.x.edelsohn-debian-z/build/Lib/test/test_descr.py", line 4328, in __eq__
    del C.attr
AttributeError: attr

----------------------------------------------------------------------

Ran 140 tests in 1.368s

FAILED (errors=1, expected failures=2)


Traceback (most recent call last):
  File "/home/dje/cpython-buildarea/3.x.edelsohn-debian-z/build/Lib/test/test_descr.py", line 4341, in test_vicious_descriptor_nonsense
    self.assertEqual(c.attr, 1)
  File "/home/dje/cpython-buildarea/3.x.edelsohn-debian-z/build/Lib/test/test_descr.py", line 4328, in __eq__
    del C.attr
AttributeError: attr

----------------------------------------------------------------------

Ran 140 tests in 1.567s

FAILED (errors=1, expected failures=2)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zooba zooba zooba approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ZackerySpytz @miss-islington @bedevere-bot @zooba @the-knights-who-say-ni