[pypy-commit] pypy wrap-bytes: hg merge SomeString-charclass

2014-07-15 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: wrap-bytes Changeset: r72446:a160002e8499 Date: 2014-07-13 23:02 +0200 http://bitbucket.org/pypy/pypy/changeset/a160002e8499/ Log:hg merge SomeString-charclass diff --git a/rpython/annotator/binaryop.py b/rpython/annotator/binaryop.py --- a/rpython/annota

[pypy-commit] pypy wrap-bytes: hg merge SomeString-charclass

2014-07-15 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: wrap-bytes Changeset: r72444:a5ac58fb49e1 Date: 2014-07-13 21:42 +0200 http://bitbucket.org/pypy/pypy/changeset/a5ac58fb49e1/ Log:hg merge SomeString-charclass diff --git a/rpython/annotator/model.py b/rpython/annotator/model.py --- a/rpython/annotator/mo

[pypy-commit] pypy wrap-bytes: hg merge SomeString-charclass, directly into py3k

2014-07-15 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: wrap-bytes Changeset: r72440:65a411f16d55 Date: 2014-07-13 20:29 +0200 http://bitbucket.org/pypy/pypy/changeset/65a411f16d55/ Log:hg merge SomeString-charclass, directly into py3k diff --git a/rpython/annotator/binaryop.py b/rpython/annotator/binaryop.py