Mailing List Archive

cpython (merge 3.2 -> default): merge 3.2
http://hg.python.org/cpython/rev/d533663caee8
changeset: 76833:d533663caee8
parent: 76830:2cd9dadd5c6c
parent: 76831:197f47238753
user: Benjamin Peterson <benjamin@python.org>
date: Mon May 07 22:24:05 2012 -0400
summary:
merge 3.2

files:
Lib/io.py | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)


diff --git a/Lib/io.py b/Lib/io.py
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -34,15 +34,6 @@
"""
# New I/O library conforming to PEP 3116.

-# XXX edge cases when switching between reading/writing
-# XXX need to support 1 meaning line-buffered
-# XXX whenever an argument is None, use the default value
-# XXX read/write ops should check readable/writable
-# XXX buffered readinto should work with arbitrary buffer objects
-# XXX use incremental encoder for text output, at least for UTF-16 and UTF-8-SIG
-# XXX check writable, readable and seekable in appropriate places
-
-
__author__ = ("Guido van Rossum <guido@python.org>, "
"Mike Verdone <mike.verdone@gmail.com>, "
"Mark Russell <mark.russell@zen.co.uk>, "

--
Repository URL: http://hg.python.org/cpython
cpython (merge 3.2 -> default): merge 3.2 [ In reply to ]
http://hg.python.org/cpython/rev/5298b39fa6c0
changeset: 76930:5298b39fa6c0
parent: 76928:c5171d50e752
parent: 76929:7b64365d414f
user: Martin v. Löwis <martin@v.loewis.de>
date: Mon May 14 18:19:16 2012 +0200
summary:
merge 3.2

files:
Tools/buildbot/clean.bat | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)


diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -1,7 +1,5 @@
@rem Used by the buildbot "clean" step.
call "%VS100COMNTOOLS%vsvars32.bat"
-@echo Deleting .pyc/.pyo files ...
-del /s Lib\*.pyc Lib\*.pyo
@echo Deleting test leftovers ...
rmdir /s /q build
cd PCbuild

--
Repository URL: http://hg.python.org/cpython
cpython (merge 3.2 -> default): Merge 3.2 [ In reply to ]
http://hg.python.org/cpython/rev/07afe1ec76a7
changeset: 76936:07afe1ec76a7
parent: 76933:d1c0b57aeb1b
parent: 76935:ffe39fba03ae
user: Brian Curtin <brian@python.org>
date: Mon May 14 19:43:16 2012 -0500
summary:
Merge 3.2

files:
Tools/buildbot/external-common.bat | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)


diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -23,9 +23,6 @@
svn export http://svn.python.org/projects/external/bzip2-1.0.6
)

-@rem Sleepycat db
-if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20
-
@rem OpenSSL
if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a


--
Repository URL: http://hg.python.org/cpython
cpython (merge 3.2 -> default): merge 3.2 [ In reply to ]
http://hg.python.org/cpython/rev/61ec31dec331
changeset: 77028:61ec31dec331
parent: 77026:d2a847cd7d5a
parent: 77027:43f0c3c9187d
user: Martin v. Löwis <martin@v.loewis.de>
date: Fri May 18 14:25:54 2012 +0200
summary:
merge 3.2

files:



--
Repository URL: http://hg.python.org/cpython
cpython (merge 3.2 -> default): merge 3.2 [ In reply to ]
http://hg.python.org/cpython/rev/608105fd0edc
changeset: 77031:608105fd0edc
parent: 77028:61ec31dec331
parent: 77030:26818230822a
user: Martin v. Löwis <martin@v.loewis.de>
date: Fri May 18 15:34:22 2012 +0200
summary:
merge 3.2

files:
PC/VC6/readme.txt | 5 ++---
PC/VS8.0/pyproject.vsprops | 2 +-
PC/VS9.0/pyproject.vsprops | 2 +-
PCbuild/build_ssl.py | 2 +-
PCbuild/pyproject.props | 2 +-
PCbuild/readme.txt | 2 +-
Tools/buildbot/external-common.bat | 4 ++--
7 files changed, 9 insertions(+), 10 deletions(-)


diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -153,10 +153,9 @@

Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as
- dist/openssl-1.0.0a
+ dist/openssl-1.0.0j

- You can (theoretically) use any version of OpenSSL you like - the
- build process will automatically select the latest version.
+ You need to use version 1.0.0j of OpenSSL.

You can install the NASM assembler from
http://www.nasm.us/
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0a"
+ Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -62,7 +62,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0a"
+ Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -46,7 +46,7 @@
# is available.
def find_working_perl(perls):
for perl in perls:
- fh = os.popen('""%s" -e "use Win32;""' % perl)
+ fh = os.popen('"%s" -e "use Win32;"' % perl)
fh.read()
rc = fh.close()
if rc:
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -7,7 +7,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
- <opensslDir>$(externalsDir)\openssl-1.0.0a</opensslDir>
+ <opensslDir>$(externalsDir)\openssl-1.0.0j</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -148,7 +148,7 @@

Get the source code through

- svn export http://svn.python.org/projects/external/openssl-1.0.0a
+ svn export http://svn.python.org/projects/external/openssl-1.0.0j

** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,7 +14,7 @@
@rem if exist tk8.4.16 rd /s/q tk8.4.16
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20
-@rem if exist openssl-1.0.0a rd /s/q openssl-1.0.0a
+@rem if exist openssl-1.0.0j rd /s/q openssl-1.0.0j
@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12

@rem bzip
@@ -24,7 +24,7 @@
)

@rem OpenSSL
-if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a
+if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j

@rem tcl/tk
if not exist tcl-8.5.11.0 (

--
Repository URL: http://hg.python.org/cpython