On Mon, Apr 25, 2011 at 8:31 AM, Carl Friedrich Bolz <cfbolz@gmx.de> wrote:

Hi all,

anybody has an idea what the state of PyPy's standard library is? I assume it's at the state of CPython 2.7, right?

Then there is the branch merge-stdlib, which seems to merge in the 2.7.1 changes. Why are all the modified directories deleted there?

Carl Friedrich _______________________________________________ pypy-dev@codespeak.net http://codespeak.net/mailman/listinfo/pypy-dev

merge-stdlib was a branch Carl Meyer worked on at PyCon. The idea was we kept a single stdlib dir, modified as necessary in that dir, and just used hg to merge up with newer versions of CPython, rather than keeping a -modified dir around. "merge" therefore refers to merging -modified and no -modified, not merging with upstream. Alex -- "I disapprove of what you say, but I will defend to the death your right to say it." -- Evelyn Beatrice Hall (summarizing Voltaire) "The people's good is the highest law." -- Cicero