Author: Mark Young
Branch: py3k
Changeset: r85279:ae756a654002
Date: 2016-05-29 11:56 -0400
http://bitbucket.org/pypy/pypy/changeset/ae756a654002/
Log:Merge with upstream.
diff too long, truncating to 2000 out of 3066 lines
diff --git a/lib-python/3/ensurepip/__init__.py
b/lib-python/3/ens
Author: Mark Young
Branch: py3k
Changeset: r85272:abc95a8adea5
Date: 2016-05-24 13:04 -0400
http://bitbucket.org/pypy/pypy/changeset/abc95a8adea5/
Log:Merge with upstream.
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pyp
Author: Mark Young
Branch: py3k
Changeset: r85266:1f829b014269
Date: 2016-05-20 21:22 -0400
http://bitbucket.org/pypy/pypy/changeset/1f829b014269/
Log:Merge with upstream.
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -22,3 +22,4 @@
bbd45126bc691f669c4ebdfbd74456cd274c6b92 r
Author: Mark Young
Branch: py3k
Changeset: r85267:57b204adccaa
Date: 2016-05-22 13:06 -0400
http://bitbucket.org/pypy/pypy/changeset/57b204adccaa/
Log:Merge with upstream I hope.
diff --git a/lib-python/3/test/test_descr.py b/lib-python/3/test/test_descr.py
--- a/lib-python/3/test/test_descr
Author: Mark Young
Branch: py3k
Changeset: r85271:96a0f86b3857
Date: 2016-05-23 16:59 -0400
http://bitbucket.org/pypy/pypy/changeset/96a0f86b3857/
Log:Merge with upstream.
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@
Author: Marius Gedminas
Branch: py3k
Changeset: r77997:404f7178d54f
Date: 2015-06-09 19:45 +0300
http://bitbucket.org/pypy/pypy/changeset/404f7178d54f/
Log:Merge with upstream
diff too long, truncating to 2000 out of 61469 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@
