Mailman 3 August 2009 - python-committers

Misc/NEWS entries added to released versions
by Matthias Klose 14 Sep '09

14 Sep '09

While looking at the diffs between the 261 release tags and the 26 branch, I noticed many items in Misc/NEWS appearing in the 2.6.1 or even 2.6 sections. I moved all of these to 2.6.2, after checking some of them, and found all of the checked ones be backported after the 2.6.1 release. Is there anything what could be done to avoid these wrong merges? I plan to check the items on the 3.0 branch soon. Matthias

8 11

3.1 maint open
by Benjamin Peterson 17 Aug '09

17 Aug '09

3.1.1 is out, so the maintence branch is open for 3.1.2. -- Regards, Benjamin

1 0

Anyone having issues with svnmerge.py and 2.6 (possibly OS X problem)?
by Brett Cannon 14 Aug '09

14 Aug '09

I am trying to backport something to 2.6 and I am getting the following error from svnmerge.py: > svnmerge.py merge -r74429t property 'svnmerge-integrated' deleted from '.'. property 'svnmerge-blocked' deleted from '.'. --- Merging r74429 into '.': C Misc/NEWS U Misc/ACKS U Lib/test/test_pyexpat.py U Modules/expat/xmltok_impl.c Summary of conflicts: Text conflicts: 1 property 'svnmerge-integrated' set on '.' property 'svnmerge-blocked' set on '.' Traceback (most recent call last): File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 2361, in <module> main(sys.argv[1:]) File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 2356, in main cmd(branch_dir, branch_props) File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 1810, in __call__ return self.func(*args, **kwargs) File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 1560, in action_merge print >>f, construct_merged_log_message(opts["source-url"], revs), File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 1136, in construct_merged_log_message message = get_commit_log(url, r) File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 1122, in get_commit_log return recode_stdout_to_file("".join(out[1:])) File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 229, in recode_stdout_to_file return u.encode(locale.getdefaultlocale()[1]) File "/Users/brett/.slash/python/lib/python2.6/encodings/mac_roman.py", line 12, in encode return codecs.charmap_encode(input,errors,encoding_table) UnicodeEncodeError: 'charmap' codec can't encode character u'\u0107' in position 191: character maps to <undefined> Anyone else running into this? I tried backing up svnmerge.py to r36767 (sometime in March; random choice) and I am still having the problem. -Brett

5 7

3.1 maint frozen
by Benjamin Peterson 13 Aug '09

13 Aug '09

I'm going to start working on 3.1.1 now. Please no commits to it. -- Regards, Benjamin

3 3

Data corruption issue (C IO library)
by Antoine Pitrou 10 Aug '09

10 Aug '09

Hello, A data corruption issue has been discovered in the C IO lib in Python 3.1 (http://bugs.python.org/issue6629). I've applied a fix, and I wonder whether we should make a release quickly to minimize the probability of users hitting the problem? (Georg tells me Benjamin is on holiday, however) Regards Antoine.

13 19

www & svn . python.org down?
by Gregory P. Smith 08 Aug '09

08 Aug '09

i assume someone already knows, just pointing it out.

2 1

python-committers August 2009