← Back to branch summary

~ubuntu-branches/ubuntu/trusty/python3.3/trusty

« back to all changes in this revision

Viewing changes to Python/pythonrun.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2013-11-19 08:46:55 UTC
  • mfrom: (22.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20131119084655-pueqfadzs5v1xf53
Tags: 3.3.3-1
http://bugs.debian.org/725240
* Python 3.3.3 release.
* Update to 20131119 from the 3.3 branch.
* Regenerate the patches.
* Update the symbols files.
* Fix test support when the running kernel doesn't handle port reuse.
* libpython3.3-minimal replaces libpython3.3-stdlib (<< 3.2.3-7).
  Closes: #725240.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Python/pythonrun.c
96
96
 
97
97
PyThreadState *_Py_Finalizing = NULL;
98
98
 
 
99
/* Hack to force loading of object files */
 
100
int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \
 
101
    PyOS_mystrnicmp; /* Python/pystrcmp.o */
 
102
 
99
103
/* PyModule_GetWarningsModule is no longer necessary as of 2.6
100
104
since _warnings is builtin.  This API should not be used. */
101
105
PyObject *
1880
1884
{
1881
1885
    PyObject *seen;
1882
1886
    PyObject *f = PySys_GetObject("stderr");
 
1887
    if (PyExceptionInstance_Check(value)
 
1888
        && tb != NULL && PyTraceBack_Check(tb)) {
 
1889
        /* Put the traceback on the exception, otherwise it won't get
 
1890
           displayed.  See issue #18776. */
 
1891
        PyObject *cur_tb = PyException_GetTraceback(value);
 
1892
        if (cur_tb == NULL)
 
1893
            PyException_SetTraceback(value, tb);
 
1894
        else
 
1895
            Py_DECREF(cur_tb);
 
1896
    }
1883
1897
    if (f == Py_None) {
1884
1898
        /* pass */
1885
1899
    }