[Python-Dev] [Python-checkins] cpython (merge 3.2 -> default): Correctly merging #9319 into 3.3? (original) (raw)

Antoine Pitrou solipsis at pitrou.net
Mon Apr 25 13:30:31 CEST 2011

On Mon, 25 Apr 2011 04:47:03 +0200 Jesus Cea <jcea at jcea.es> wrote:

And yes, I fully realized that I should try to compile locally first. Dealing with this unexpected merge when merging my own patch was... unexpected, and the code seemed sensible enough.

You should always recompile and run the affected tests before checking in a change. Even if the changes look "trivial". By trying to save a little time on your side your may lose a lot of other people's time.

Do we have some hat-of-shame I should wear because breaking the build? :).

The tests are still broken it seems:

====================================================================== ERROR: test_issue9319 (test.test_imp.ImportTests)

Traceback (most recent call last): File "/Users/pythonbuildbot/buildarea/3.x.hansen-osx-x86-2/build/Lib/test/test_imp.py", line 181, in test_issue9319 imp.find_module, "test/badsyntax_pep3120") File "/Users/pythonbuildbot/buildarea/3.x.hansen-osx-x86-2/build/Lib/unittest/case.py", line 574, in assertRaises callableObj(*args, **kwargs) ImportError: No module named 'test/badsyntax_pep3120'

Regards

Antoine.

More information about the Python-Dev mailing list