Author: Philip Jenvey
Branch: py3.3
Changeset: r75211:81a7ee6adad6
Date: 2015-01-02 13:16 -0800
http://bitbucket.org/pypy/pypy/changeset/81a7ee6adad6/
Log:merge py3k
diff too long, truncating to 2000 out of 15188 lines
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -28,7 +28,
Author: Philip Jenvey
Branch: py3.3
Changeset: r75152:c393dc8e0fc4
Date: 2014-12-29 13:15 -0800
http://bitbucket.org/pypy/pypy/changeset/c393dc8e0fc4/
Log:merge py3k
diff too long, truncating to 2000 out of 15290 lines
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@
Author: Philip Jenvey
Branch: py3.3
Changeset: r74317:9f7f71f179bb
Date: 2014-10-31 11:31 -0700
http://bitbucket.org/pypy/pypy/changeset/9f7f71f179bb/
Log:merge py3k
diff --git a/pypy/objspace/std/formatting.py b/pypy/objspace/std/formatting.py
--- a/pypy/objspace/std/formatting.py
+++ b/pyp
Author: Philip Jenvey
Branch: py3.3
Changeset: r74304:50061af2dd26
Date: 2014-10-30 11:55 -0700
http://bitbucket.org/pypy/pypy/changeset/50061af2dd26/
Log:merge py3k
diff too long, truncating to 2000 out of 3718 lines
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/
Author: Philip Jenvey
Branch: py3.3
Changeset: r74307:d7ac21574776
Date: 2014-10-30 12:24 -0700
http://bitbucket.org/pypy/pypy/changeset/d7ac21574776/
Log:merge py3k
diff --git a/pypy/module/array/interp_array.py
b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
++
Author: Philip Jenvey
Branch: py3.3
Changeset: r74269:27d01c9572b0
Date: 2014-10-28 13:40 -0700
http://bitbucket.org/pypy/pypy/changeset/27d01c9572b0/
Log:merge py3k
diff --git a/pypy/module/select/test/test_select.py
b/pypy/module/select/test/test_select.py
--- a/pypy/module/select/test/te
Author: Philip Jenvey
Branch: py3.3
Changeset: r74263:2c4e59799687
Date: 2014-10-27 16:50 -0700
http://bitbucket.org/pypy/pypy/changeset/2c4e59799687/
Log:merge py3k
diff --git a/pypy/module/_codecs/locale.c b/pypy/module/_codecs/locale.c
deleted file mode 100644
--- a/pypy/module/_codecs/lo
Author: Philip Jenvey
Branch: py3.3
Changeset: r74255:9cf2c4e710ad
Date: 2014-10-26 22:18 -0700
http://bitbucket.org/pypy/pypy/changeset/9cf2c4e710ad/
Log:merge py3k
diff too long, truncating to 2000 out of 29774 lines
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -8
Author: Philip Jenvey
Branch: py3.3
Changeset: r74191:3820173e81e3
Date: 2014-10-24 13:48 -0700
http://bitbucket.org/pypy/pypy/changeset/3820173e81e3/
Log:merge py3k
diff too long, truncating to 2000 out of 5270 lines
diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py
--- a/li
Author: Philip Jenvey
Branch: py3.3
Changeset: r74098:e134e7d8f49f
Date: 2014-10-22 17:13 -0700
http://bitbucket.org/pypy/pypy/changeset/e134e7d8f49f/
Log:merge py3k
diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpr
Author: Philip Jenvey
Branch: py3.3
Changeset: r74008:02cf2f6a3032
Date: 2014-10-17 15:46 -0700
http://bitbucket.org/pypy/pypy/changeset/02cf2f6a3032/
Log:merge py3k
diff too long, truncating to 2000 out of 18832 lines
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -3,8 +3,8
Author: Philip Jenvey
Branch: py3.3
Changeset: r73636:ac2759ae7eb6
Date: 2014-09-18 21:14 -0700
http://bitbucket.org/pypy/pypy/changeset/ac2759ae7eb6/
Log:merge py3k
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -85,10 +85,1
Author: Philip Jenvey
Branch: py3.3
Changeset: r73638:de00ce0a7596
Date: 2014-09-21 16:20 -0700
http://bitbucket.org/pypy/pypy/changeset/de00ce0a7596/
Log:merge py3k
diff --git a/pypy/module/posix/__init__.py b/pypy/module/posix/__init__.py
--- a/pypy/module/posix/__init__.py
+++ b/pypy/modu
Author: Philip Jenvey
Branch: py3.3
Changeset: r73493:6a2b74eae1e7
Date: 2014-09-11 15:57 -0700
http://bitbucket.org/pypy/pypy/changeset/6a2b74eae1e7/
Log:merge py3k
diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/m
Author: Philip Jenvey
Branch: py3.3
Changeset: r73486:d25d0c52e0f8
Date: 2014-09-11 14:57 -0700
http://bitbucket.org/pypy/pypy/changeset/d25d0c52e0f8/
Log:merge py3k
diff too long, truncating to 2000 out of 41356 lines
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -35,280 +3
Author: Philip Jenvey
Branch: py3.3
Changeset: r73491:a4b792a114c2
Date: 2014-09-11 15:14 -0700
http://bitbucket.org/pypy/pypy/changeset/a4b792a114c2/
Log:merge py3k
diff --git a/pypy/interpreter/test/test_app_main.py
b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test
Author: Philip Jenvey
Branch: py3.3
Changeset: r73077:664cef61a119
Date: 2014-08-26 14:22 -0700
http://bitbucket.org/pypy/pypy/changeset/664cef61a119/
Log:merge py3k
diff too long, truncating to 2000 out of 11591 lines
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -354,6 +35
Author: Philip Jenvey
Branch: py3.3
Changeset: r72972:818fa7069ba0
Date: 2014-08-22 15:55 -0700
http://bitbucket.org/pypy/pypy/changeset/818fa7069ba0/
Log:merge py3k
diff --git a/pypy/module/select/interp_select.py
b/pypy/module/select/interp_select.py
--- a/pypy/module/select/interp_select
Author: Philip Jenvey
Branch: py3.3
Changeset: r72837:3d71999bc05e
Date: 2014-08-16 18:04 -0700
http://bitbucket.org/pypy/pypy/changeset/3d71999bc05e/
Log:merge py3k
diff --git a/pypy/interpreter/astcompiler/ast.py
b/pypy/interpreter/astcompiler/ast.py
--- a/pypy/interpreter/astcompiler/ast
Author: Philip Jenvey
Branch: py3.3
Changeset: r72823:1d47dd6f19e4
Date: 2014-08-15 18:02 -0700
http://bitbucket.org/pypy/pypy/changeset/1d47dd6f19e4/
Log:merge py3k
diff --git a/pypy/doc/faq.rst b/pypy/doc/faq.rst
--- a/pypy/doc/faq.rst
+++ b/pypy/doc/faq.rst
@@ -147,12 +147,25 @@
programm
Author: Philip Jenvey
Branch: py3.3
Changeset: r72784:d121572ebfcd
Date: 2014-08-12 17:16 -0700
http://bitbucket.org/pypy/pypy/changeset/d121572ebfcd/
Log:merge py3k
diff --git a/pypy/module/cpyext/buffer.py b/pypy/module/cpyext/buffer.py
--- a/pypy/module/cpyext/buffer.py
+++ b/pypy/module/
Author: Philip Jenvey
Branch: py3.3
Changeset: r72782:ed05d05aefb3
Date: 2014-08-12 16:44 -0700
http://bitbucket.org/pypy/pypy/changeset/ed05d05aefb3/
Log:merge py3k
diff too long, truncating to 2000 out of 11009 lines
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
--- a/_pytest/__i
Author: Philip Jenvey
Branch: py3.3
Changeset: r72677:7aed11f278e7
Date: 2014-08-03 11:25 -0700
http://bitbucket.org/pypy/pypy/changeset/7aed11f278e7/
Log:merge py3k
diff --git a/pypy/module/__builtin__/app_inspect.py
b/pypy/module/__builtin__/app_inspect.py
--- a/pypy/module/__builtin__/ap
Author: Philip Jenvey
Branch: py3.3
Changeset: r72672:8c32f11d3e94
Date: 2014-08-03 10:49 -0700
http://bitbucket.org/pypy/pypy/changeset/8c32f11d3e94/
Log:merge py3k
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailma
Author: Philip Jenvey
Branch: py3.3
Changeset: r72658:a85416828246
Date: 2014-08-02 18:45 -0700
http://bitbucket.org/pypy/pypy/changeset/a85416828246/
Log:merge py3k
diff --git a/pypy/interpreter/astcompiler/assemble.py
b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/astco
Author: Philip Jenvey
Branch: py3.3
Changeset: r72653:777f424bdd72
Date: 2014-08-01 18:11 -0700
http://bitbucket.org/pypy/pypy/changeset/777f424bdd72/
Log:merge py3k
diff --git a/pypy/interpreter/test/test_typedef.py
b/pypy/interpreter/test/test_typedef.py
--- a/pypy/interpreter/test/test_t
Author: Philip Jenvey
Branch: py3.3
Changeset: r72639:64027c84d8c6
Date: 2014-08-01 15:21 -0700
http://bitbucket.org/pypy/pypy/changeset/64027c84d8c6/
Log:merge py3k
diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst
--- a/pypy/doc/coding-guide.rst
+++ b/pypy/doc/coding-guide
Author: Philip Jenvey
Branch: py3.3
Changeset: r72587:544362d4110b
Date: 2014-07-27 16:49 -0700
http://bitbucket.org/pypy/pypy/changeset/544362d4110b/
Log:merge py3k
diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py
--- a/lib_pypy/_curses.py
+++ b/lib_pypy/_curses.py
@@ -309,11 +309,9 @
Author: Philip Jenvey
Branch: py3.3
Changeset: r72482:fc86a76771f4
Date: 2014-07-20 11:06 -0700
http://bitbucket.org/pypy/pypy/changeset/fc86a76771f4/
Log:merge py3k
diff --git a/lib-python/3/json/__init__.py b/lib-python/3/json/__init__.py
--- a/lib-python/3/json/__init__.py
+++ b/lib-pytho
Author: Philip Jenvey
Branch: py3.3
Changeset: r72463:7536507ca6e5
Date: 2014-07-16 14:50 -0700
http://bitbucket.org/pypy/pypy/changeset/7536507ca6e5/
Log:merge py3k
diff --git a/lib-python/2.7/xml/sax/saxutils.py
b/lib-python/2.7/xml/sax/saxutils.py
--- a/lib-python/2.7/xml/sax/saxutils.py
Author: Philip Jenvey
Branch: py3.3
Changeset: r72103:7c07509a944c
Date: 2014-06-19 22:41 -0700
http://bitbucket.org/pypy/pypy/changeset/7c07509a944c/
Log:merge py3k
diff --git a/lib_pypy/gdbm.py b/lib_pypy/_gdbm.py
rename from lib_pypy/gdbm.py
rename to lib_pypy/_gdbm.py
--- a/lib_pypy/gdbm
31 matches
Mail list logo
