Mailing List Archive: Python: Checkins

cpython (merge default -> default): Merge heads

Index | Next | Previous | View Threaded

python-checkins at python

Aug 3, 2013, 9:31 AM

Post #1 of 3 (9 views)
Permalink

cpython (merge default -> default): Merge heads

http://hg.python.org/cpython/rev/ab1859ba1a78
changeset: 84992:ab1859ba1a78
parent: 84990:36702442ffe0
parent: 84988:d86aec3f61b0
user: Serhiy Storchaka <storchaka [at] gmail>
date: Sat Aug 03 19:28:28 2013 +0300
summary:
Merge heads

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

diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py
--- a/Lib/test/test_wave.py
+++ b/Lib/test/test_wave.py
@@ -75,7 +75,6 @@
with self.assertRaises(wave.Error):
with wave.open(TESTFN, 'wb') as f:
pass
- print('in test:', f._file)
with self.assertRaises(wave.Error):
with open(TESTFN, 'wb') as testfile:
with wave.open(testfile):

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

python-checkins at python

Aug 3, 2013, 11:20 AM

Post #2 of 3 (6 views)
Permalink

cpython (merge default -> default): Merge heads [In reply to]

http://hg.python.org/cpython/rev/673ef3f96919
changeset: 84998:673ef3f96919
parent: 84996:4fd48a807812
parent: 84994:7d661f47f73b
user: Serhiy Storchaka <storchaka [at] gmail>
date: Sat Aug 03 21:17:27 2013 +0300
summary:
Merge heads

files:
Misc/NEWS | 3 +++
Tools/msi/msi.py | 5 ++++-
2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -765,6 +765,9 @@
Build
-----

+- Issue #16067: Add description into MSI file to replace installer's
+ temporary name.
+
- Issue #18257: Fix readlink usage in python-config. Install the python
version again on Darwin.

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1415,7 +1415,10 @@
# certname (from config.py) should be (a substring of)
# the certificate subject, e.g. "Python Software Foundation"
if certname:
- os.system('signtool sign /n "%s" /t http://timestamp.verisign.com/scripts/timestamp.dll %s' % (certname, msiname))
+ os.system('signtool sign /n "%s" '
+ '/t http://timestamp.verisign.com/scripts/timestamp.dll '
+ '/d "Python %s" '
+ '%s' % (certname, full_current_version, msiname))

if pdbzip:
build_pdbzip()

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

python-checkins at python

Aug 10, 2013, 3:40 PM

Post #3 of 3 (2 views)
Permalink

cpython (merge default -> default): Merge heads [In reply to]

http://hg.python.org/cpython/rev/febe4f36e020
changeset: 85116:febe4f36e020
parent: 85115:d9a9fe5e700d
parent: 85111:4d0c938870bc
user: Terry Jan Reedy <tjreedy [at] udel>
date: Sat Aug 10 18:33:37 2013 -0400
summary:
Merge heads

files:
Misc/NEWS | 2 ++
Modules/_tkinter.c | 9 +++++++++
2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,8 @@
- Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get
docstrings and ValueError messages. Patch by Zhongyue Luo

+- Fix refcounting issue with extension types in tkinter.
+
- Issue #8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error
if methods have annotations; it now correctly displays the annotations.

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -516,6 +516,7 @@
v = PyObject_New(TkappObject, (PyTypeObject *) Tkapp_Type);
if (v == NULL)
return NULL;
+ Py_INCREF(Tkapp_Type);

v->interp = Tcl_CreateInterp();
v->wantobjects = wantobjects;
@@ -674,6 +675,7 @@
self = PyObject_New(PyTclObject, (PyTypeObject *) PyTclObject_Type);
if (self == NULL)
return NULL;
+ Py_INCREF(PyTclObject_Type);
Tcl_IncrRefCount(arg);
self->value = arg;
self->string = NULL;
@@ -683,9 +685,11 @@
static void
PyTclObject_dealloc(PyTclObject *self)
{
+ PyObject *tp = (PyObject *) Py_TYPE(self);
Tcl_DecrRefCount(self->value);
Py_XDECREF(self->string);
PyObject_Del(self);
+ Py_DECREF(tp);
}

static char*
@@ -2196,6 +2200,7 @@
v = PyObject_New(TkttObject, (PyTypeObject *) Tktt_Type);
if (v == NULL)
return NULL;
+ Py_INCREF(Tktt_Type);

Py_INCREF(func);
v->token = NULL;
@@ -2211,10 +2216,12 @@
{
TkttObject *v = (TkttObject *)self;
PyObject *func = v->func;
+ PyObject *tp = (PyObject *) Py_TYPE(self);

Py_XDECREF(func);

PyObject_Del(self);
+ Py_DECREF(tp);
}

static PyObject *
@@ -2520,11 +2527,13 @@
static void
Tkapp_Dealloc(PyObject *self)
{
+ PyObject *tp = (PyObject *) Py_TYPE(self);
/*CHECK_TCL_APPARTMENT;*/
ENTER_TCL
Tcl_DeleteInterp(Tkapp_Interp(self));
LEAVE_TCL
PyObject_Del(self);
+ Py_DECREF(tp);
DisableEventHook();
}

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

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads