Tarek Ziadé <ziade.ta...@gmail.com> added the comment: I am not sure what is the best way to merge it from 3k branch to release30-maint since the original change was done with an automatic merge from trunk to 3k branch with several other changes, then a slight fix so the 2.x code works under 3.x.
Should I do a manual merge in release30-maint or there's a special way to handle it ? _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue4400> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
