summaryrefslogtreecommitdiffstats
path: root/Python/pythonrun.c
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-10-30 15:43:30 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-10-30 15:43:30 (GMT)
commit3d89751c7aaa243fbc2ac4704ad6a620d65e63f6 (patch)
treec3dbe09adc854e348f71b10c65205a7808915e37 /Python/pythonrun.c
parent7529afce3c8e0e012738c5671d583beb3b85e270 (diff)
downloadcpython-3d89751c7aaa243fbc2ac4704ad6a620d65e63f6.zip
cpython-3d89751c7aaa243fbc2ac4704ad6a620d65e63f6.tar.gz
cpython-3d89751c7aaa243fbc2ac4704ad6a620d65e63f6.tar.bz2
Merged revisions 85980 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85980 | hirokazu.yamamoto | 2010-10-31 00:08:15 +0900 | 1 line Issue #10157: Fixed refleaks in pythonrun.c. Patch by Stefan Krah. ........
Diffstat (limited to 'Python/pythonrun.c')
-rw-r--r--Python/pythonrun.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 3dbe754..c6cf088 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -259,6 +259,7 @@ Py_InitializeEx(int install_sigs)
Py_FatalError("Py_Initialize: can't set preliminary stderr");
PySys_SetObject("stderr", pstderr);
PySys_SetObject("__stderr__", pstderr);
+ Py_DECREF(pstderr);
_PyImport_Init();
@@ -595,6 +596,7 @@ Py_NewInterpreter(void)
Py_FatalError("Py_Initialize: can't set preliminary stderr");
PySys_SetObject("stderr", pstderr);
PySys_SetObject("__stderr__", pstderr);
+ Py_DECREF(pstderr);
_PyImportHooks_Init();
if (initstdio() < 0)
@@ -940,6 +942,7 @@ initstdio(void)
if (encoding != NULL) {
_PyCodec_Lookup(encoding);
}
+ Py_DECREF(encoding_attr);
}
PyErr_Clear(); /* Not a fatal error if codec isn't available */
-number: QTBUG-17724 Reviewed-by: TrustMe | | | * Increased EPOCHEAPSIZE for few benchmarksMiikka Heikkinen2011-05-182-0/+3 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Insufficient heap size was causing containers-sequential and qgraphicsscene benchmarks to panic in Symbian^1 devices. Task-number: QTBUG-17725 Reviewed-by: Sami Merila | | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-18181-8895/+10907 | | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (37 commits) Update Symbian DEF-files Revert all QScroller and QFlickGesture related code. Improve DEFINES crossplatform compatibility in Symbian builds. Fix regression that caused waitForXXX(-1) to fail. Freezing the QtCore defs again for 4.8. X11: Keep the menubar inside the widgetbox window in toplevel mode Retain ABI and API compatibility when Qt is built with EGL. Allow 'typeinfo <file>' lines in qmldir. qmlplugindump: Use command line options with a single dash. qmlplugindump: Allow dumping by path without URI. Move qmldump from Qt Creator to Qt. QmlDebug: Fix QmlOstPlugin compilation failure Fix GLES2 include path for applications when not using the dash shell fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e QmlDebug: Fix QmlOstPlugin compilation failure Enable performance monitoring at application startup. Remove not supported qmake api Added Wayland selection support. Added Wayland selection support. Add the wayland client libraries to rpath if we use rpath ... | | | * Update Symbian DEF-filesSami Merila2011-05-184-1489/+1183 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to removal of QScroller and related classes, QtGui DEF files needed to be updated. Additionally, there was some new functionality in QDeclarative that required updation of QtDeclarative DEF-files. Reviewed-by: Trust Me | | | * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-1744-7233/+55 | | | |\ | | | * | Improve DEFINES crossplatform compatibility in Symbian builds.Miikka Heikkinen2011-05-162-4/+42 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEFINES statements that define strings needed separate statements for symbian-sbsv2 builds and Makefile based plaforms, as there is one extra layer of escaping needed in Makefile builds. Improved compatibility by making qmake remove one layer of escaping before writing the .mmp MACROs based on DEFINES. Note: Symbian-abld builds still do not support string DEFINES as the toolchain simply can't handle them in .mmp files, no matter how they are escaped. Note2: Symbian-sbsv2 support for escaped DEFINES is not perfect either, as bld.inf files do not like doubly escaped characters in extension rules (e.g. double-quotation mark as part of a string). This makes it impossible to pass such DEFINES to extra compilers. Task-number: QTBUG-19232 Reviewed-by: Oswald Buddenhagen | | | * | Freezing the QtCore defs again for 4.8.Laszlo Agocs2011-05-162-139/+153 | | | | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-05-198439-140110/+140237 | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Re-apply licenseheader text in source files for qt4.8 Updating file with CRLF line endings for the updated header Update licenseheader text in source files for qt4.8 Updated DEF files for QtGui and QtOpenGl Updated DEF files for QtGui and QtOpenGL | | * \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-1919-97/+154 | | |\ \ \ \ | | * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-05-18246-8489/+2405 | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (195 commits) Re-apply licenseheader text in source files for qt4.8 Revert all QScroller and QFlickGesture related code. Fix regression that caused waitForXXX(-1) to fail. Fix thread safety regression of QNetworkConfigurationManager Fix instability in QNetworkConfigurationManager autotest Support word selection list with predictive text from splitview Fix softkey icon positioning in S60 5.3 QDeclarativeMouseArea: block context menu events ListViews loses items if all visible items are removed. Make TextEdit word selection more natural. Fixed license header. Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile Clear confusion between QMainWindow and QMainWindowLayout. Fix for rounded corners bug in QMenu Compile QWidgetPrivate::setParent_sys might be using null pointer Ensure the TextEdit cursor delegate is repositioned on mouse events. Don't crash on an invalid replacementStart from an input method. Fix QGLWidget::renderPixmap for raster engine on Mac Check if OES_texture_npot is present on OpenGL ES 2. ... | | | * | | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-05-185-86/+86 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New files after merged from qt/4.8 Reviewed-by: Trust Me | | | * | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-18243-8438/+2354 | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp | | * | \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-05-178447-140171/+141250 | | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Updating file with CRLF line endings for the updated header Update licenseheader text in source files for qt4.8 X11: Keep the menubar inside the widgetbox window in toplevel mode Retain ABI and API compatibility when Qt is built with EGL. Allow 'typeinfo <file>' lines in qmldir. qmlplugindump: Use command line options with a single dash. qmlplugindump: Allow dumping by path without URI. Move qmldump from Qt Creator to Qt. | | | * | | | | | Updating file with CRLF line endings for the updated headerSergio Ahumada2011-05-171-29/+29 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file requires CRLF line terminators to pass the tst_moc test after a license update. | | | * | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-1612-2/+1081 | | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | | | * | | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-138441-140180/+140180 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me | | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-05-13176-409/+9968 | | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (54 commits) Fix QtOpenGL def file for armv5. Disable QtConcurrent for Symbian winscw builds. Fix loss of focus and activation when hiding a child widget Symbian build failure for Armv5 QmlDebug: Fix QmlOstPlugin compilation failure Fix GLES2 include path for applications when not using the dash shell fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e QmlDebug: Fix QmlOstPlugin compilation failure update def files Fix softkeys in case a dialog with softkeys that have icons is closed. Update softkeys after orientation switch. Enable performance monitoring at application startup. ifdef out mac/no_coreservices path more cleanly fix build on symbian Provide internal API to avoid automatic translation of input widget Remove not supported qmake api Added Wayland selection support. Added Wayland selection support. Add the wayland client libraries to rpath if we use rpath Fix the wayland windowsurface so that we have stencil and depth buffer ... | | | * | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-13136-186/+8628 | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtOpenGLu.def | | | * \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-1142-223/+1340 | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def | | * | \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-05-06