summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorJust van Rossum <just@letterror.com>2003-02-25 20:25:12 (GMT)
committerJust van Rossum <just@letterror.com>2003-02-25 20:25:12 (GMT)
commit5bfba3aeb9f451599b89f6239467d485f4370b81 (patch)
treeecbbb187c97a8b86297dec1a26d9a3694eabe9f9 /Python
parent7322b1ad46d6eeb7af609082f2a4896719e382d6 (diff)
downloadcpython-5bfba3aeb9f451599b89f6239467d485f4370b81.zip
cpython-5bfba3aeb9f451599b89f6239467d485f4370b81.tar.gz
cpython-5bfba3aeb9f451599b89f6239467d485f4370b81.tar.bz2
Addendum to #683658:
import warnings.py _after_ site.py has run. This ensures that site.py is again the first .py to be imported, giving it back full control over sys.path.
Diffstat (limited to 'Python')
-rw-r--r--Python/pythonrun.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 2845d24..908bc42 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -174,13 +174,13 @@ Py_Initialize(void)
_PyImportHooks_Init();
- PyModule_WarningsModule = PyImport_ImportModule("warnings");
-
initsigs(); /* Signal handling stuff, including initintr() */
initmain(); /* Module __main__ */
if (!Py_NoSiteFlag)
initsite(); /* Module site */
+
+ PyModule_WarningsModule = PyImport_ImportModule("warnings");
}
#ifdef COUNT_ALLOCS
amp;id=7462a7ef1c3542b8812c8da86e79b15ce22d21cb'>Collapse)AuthorAgeFilesLines * [svn-r26329] Merge of r26069, r26070, and r26072 from the ↵Dana Robinson2015-02-272-9/+0 | | | | | | | | | | | | | | | | | | features/autotools_rework branch. Removed the configure option that allows selective disabling of individual internal filters (fletcher32, shuffle, etc.). This feature mucked up the code with a lot of #ifdefs, saved very little space, and was not scalable to a general scheme for library size reduction. We've decided to remove the feature while we investigate a more general scheme for decreasing the library size. Part of: HDFFV-9086 Tested on: h5committest * [svn-r26303] remove files with .clog2 extension generated by MPE when doing ↵Mohamad Chaarawi2015-02-251-2/+2 | | | | make clean. * [svn-r26208] Update cmake minimumsAllen Byrne2015-02-181-1/+1 | * [svn-r26188] Merged autotools fixes into the trunk:Scot Breitenfeld2015-02-161-1/+2 | | | | HDFFV-9089, HDFFV-9091, HDFFV-9092, HDFFV-9094, HDFFV-9095 * [svn-r26180] merge configure fixes for HDFFV-9068,9069,9096,9097,9135 from ↵Mohamad Chaarawi2015-02-161-1/+0 | | | | | | | | | | | | autotools_rework branch: - Remove Infering parallel compilers (C and Fortran) from configure.ac - Remove restriction to build shared with parallel - Cleanup parallel sections in configure.ac - remove large file support checks - MPE fixes. tested with h5committest. * [svn-r25570] UNDO:Added option to build tools static when building shared ↵Allen Byrne2014-09-031-7/+2 | | | | | | | | libraries. This will prevent 'dll' being appended to the tool name on windows. See HDFFV-8292. Windows DLL linkage problem because of defines needed. Tested: local linux * [svn-r25569] Added option to build tools static when building shared ↵Allen Byrne2014-09-031-2/+7 | | | | | | libraries. This will prevent 'dll' being appended to the tool name on windows. See HDFFV-8292. Tested: local linux * [svn-r25397] - remove configure checks for MPI_File_get_size and BigMohamad Chaarawi2014-07-071-1/+0 | | | | | MPI_File_set_size as they are supported by most MPI implementations. - fix bug in t_mpi.c (HDFFV-8856) * [svn-r25188] Implement change to cmake_ext_mod config folderAllen Byrne2014-05-141-1/+1 | | | | Tested: local linux * [svn-r25117] Removed LT_ADD_LIBHDF5_DEPENDENCY configure conditional to roll ↵Larry Knox2014-04-251-1/+0 | | | | | | | | | | | back fix for removing rpaths from l ib files. The fix also removed dependencies on libhdf5, etc. when the --disable-sharedlib-rpath co nfigure option was invoked. Added instead configure variable hardcode_into_lib=no. This removes rpath from lib files on Linux and solaris machines. Tested with h5committest on jam, koala, ostrich and platypus (cmake), and with configure option --disable-sharedlib-rpath on emu, platypus and quail. * [svn-r25113] Fixed Subversion EOL and executable attributes. No code changes.Dana Robinson2014-04-251-3/+3 | * [svn-r24932] HDFFV-8290: Remove unnecessary $(srcdir) and use AM_CPPFLAGS ↵Allen Byrne2014-03-312-77/+440 | | | | | | instead of INCLUDES. Update automake to 1.14.1 h5committest * [svn-r24864] Description:Quincey Koziol2014-03-211-1/+0 | | | | | | | | | | | | | | | | | | Remove all traces of MPI-POSIX VFD and GPFS detection/code. Remove remaining traces of stream VFD. Remove testpar/t_posix_compliant test (it's not actually verifying anything). Clean up H5D__mpio_opt_possible() further. Moved environment variable that disables MPI collective operations into MPI-IO VFD (instead of it being in src/H5S.c). A few other small code cleanups. Tested on: Mac OSX/64 10.9.2 (amazon) w/parallel & serial * [svn-r24789] Bump up the minimum cmake versionAllen Byrne2014-03-131-1/+1 | * [svn-r24782] HDFFV-8700 -Allen Byrne2014-03-112-9/+9 | | | | KitWare recommendations: Change CMake commands to lower case. * [svn-r24781] HDFFV-8700 -Allen Byrne2014-03-112-37/+37 | | | | | | | KitWare recommendations: Change CMake commands to lower case. Remove INCLUDE_DIRECTORIES in src for target level includes. Change ADD_DEFINITIONS package debug defines into CMake option. Remove -DNDEBUG * [svn-r24646] HDFFV-8640: Remove xlate_utility by fixing reference files to ↵Allen Byrne2014-01-2733-98/+2 | | | | | | not add extra lines. Tested: cmake and autotools local linux * [svn-r24392] Cleanup testfiles from scripts. Update lists of files to be ↵Allen Byrne2013-11-011-0/+17 | | | | | | cleaned. CMake update to clean testfiles. Tested: local cmake, autools, and h5committest * [svn-r24376] Updated all code to use HDmalloc, HDcalloc, and HDfree.Dana Robinson2013-10-311-4/+4 | | | | | | | | | | | | | Prep work for adding a memory free function, part of HDFFV-8551. Tested on: 32-bit LE linux (jam) * with C++, Fortran * with thread safety on These are minor changes (almost entirely renaming foo functions to HDfoo) that don't change functionality. This should not require a full commit test. * [svn-r24194] Don't add hdf5 library dependencies to lib files when ↵Larry Knox2013-09-241-0/+1 | | | | | | --disable-sharedlib-rpath configure option is invoked. Fix for HDFFV-8276. Tested with h5committest and on hdf-duck. * [svn-r24029] Move TESTS to seperate file to allow easier editing by all ↵Allen Byrne2013-08-192-255/+258 | | | | | | developers. Tested: local linux * [svn-r24023] Added tests to CMakeLists.txt that were only added to the *nix ↵Allen Byrne2013-08-191-0/+91 | | | | | | script. Tested: local linux * [svn-r24015] A bug fix when merging changes from the trunk to 1.8 for h5stat ↵Vailin Choi2013-08-161-15/+24 | | | | | | | bug fix HDFFV-1238: Fix a problem when using opt_arg that is NULL for the new options added: -l N, -m N, -a N. h5committested. * [svn-r23976] The following files were missing from previous checkin rev ↵Vailin Choi2013-08-0817-0/+440 | | | | | | #23975 for bug HDFFV-1238. h5committested. * [svn-r23975] This checkin contains--Vailin Choi2013-08-0813-124/+535 | | | | | | | | | A) Fix for HDFFV-1238: --Add 3 new options to allow users in setting threshold for small groups/datasets/attributes (tools/h5stat/h5stat.c) --Generate new test file for testing the new options (tools/h5stat/h5stat_gentest.c) --Add tests for the new options (tools/h5stat/testh5stat.sh.in) --Update expected output files (tools/h5stat/testfiles/*.ddl) B) Fix a bug in determining maximum dimension size for 1-D dataset in dataset_stats() (tools/h5stat/h5stat.c) * [svn-r23745] HDFFV-8461: Add Windows /MT supportAllen Byrne2013-06-101-0/+2 | | | | This adds the UserMacros.cmake support needed. * [svn-r23695] Description:Quincey Koziol2013-05-11