Commit Graph

621 Commits

Author SHA1 Message Date
Martin v. Löwis e7f67b5b98 Upgrade to bzip2 1.0.6. 2012-05-14 14:19:09 +02:00
Benjamin Peterson 5037677170 fix for real this time... 2012-02-20 22:00:46 -05:00
Benjamin Peterson 6949299e64 belately resolve conflicts here 2012-02-20 21:57:25 -05:00
Benjamin Peterson aee9dfba4a merge 2.6 with hash randomization fix 2012-02-20 21:44:56 -05:00
Barry Warsaw 1e13eb084f - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED
environment variable, to provide an opt-in way to protect against denial of
  service attacks due to hash collisions within the dict and set types.  Patch
  by David Malcolm, based on work by Victor Stinner.
2012-02-20 20:42:21 -05:00
Martin v. Löwis 90f00ea624 Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that the files
will have the right line ending even if the extension is not active.
2011-03-06 12:27:30 +01:00
Georg Brandl faa9ad2a46 Add updated .hgeol file and fix newlines in the 2.7 branch. 2011-03-05 15:06:13 +01:00
Hirokazu Yamamoto 59734be36c Merged revisions 85071-85072,85894,87132 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85071 | hirokazu.yamamoto | 2010-09-29 03:29:57 +0900 (水, 29 9 2010) | 1 line

  Now perl path with spaces can be used.
........
  r85072 | hirokazu.yamamoto | 2010-09-29 03:36:04 +0900 (水, 29 9 2010) | 1 line

  Updated PC/VC6 openssl build script. (for openssl-1.0.0a)
........
  r85894 | hirokazu.yamamoto | 2010-10-29 02:57:25 +0900 (金, 29 10 2010) | 1 line

  Updated readme.txt about OpenSSL.
........
  r87132 | hirokazu.yamamoto | 2010-12-08 23:47:07 +0900 (水, 08 12 2010) | 3 lines

  Mention NASM which is needed to build openssl-1.0.0a original source.
  (PC/VC6/readme.txt)
........
2010-12-09 08:01:18 +00:00
Kristján Valur Jónsson f6f3c4aa53 issue 10295
Make selectmodule.c use winsock2 like socketmodule does.
2010-11-03 13:27:33 +00:00
Hirokazu Yamamoto 26236880b8 Merged revisions 84763,85135 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84763 | hirokazu.yamamoto | 2010-09-13 15:21:54 +0900 | 1 line

  Cosmetic fix to project files.
........
  r85135 | hirokazu.yamamoto | 2010-10-01 19:40:49 +0900 | 1 line

  Cosmetic fix for PCBuild/readme.txt.
........
2010-10-08 10:22:55 +00:00
Hirokazu Yamamoto f5e607f25a Cosmetic fix to use print function. 2010-10-01 10:48:47 +00:00
Hirokazu Yamamoto b046529b7d Recorded rollback of revisions 84857,84870,84875 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
2010-09-29 08:38:37 +00:00
Hirokazu Yamamoto 63e9b50653 Recorded rollback of revisions 84902 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
2010-09-21 16:25:21 +00:00
Hirokazu Yamamoto 25278efac7 Recorded merge of revisions 84902 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84902 | hirokazu.yamamoto | 2010-09-19 18:24:20 +0900 | 1 line

  Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
........
2010-09-19 10:00:19 +00:00
Hirokazu Yamamoto 0dd078a736 Merged revisions 84857,84870,84875 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84857 | hirokazu.yamamoto | 2010-09-17 17:53:31 +0900 | 1 line

  Let's see if tcl/tk test runs on windows buildbot with this fix.
........
  r84870 | hirokazu.yamamoto | 2010-09-18 09:31:44 +0900 | 3 lines

  regrtest.py now runs python in build/test_python_xxx. (deeper than here)
  So failed to load tcl/tk dll because $(dist)/tcltk/bin was set to PATH as
  relative path. (Windows)
........
  r84875 | hirokazu.yamamoto | 2010-09-18 13:02:52 +0900 | 1 line

  Applied r84870 to older compilers.
........
2010-09-19 09:10:40 +00:00
Hirokazu Yamamoto c4caa9c400 Merged revisions 84851 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84851 | hirokazu.yamamoto | 2010-09-17 02:50:57 +0900 | 3 lines

  Issue #9810: Compile bzip2 source files in python's project file
  directly. It used to be built with bzip2's makefile.
........
2010-09-18 22:33:33 +00:00
Hirokazu Yamamoto ec74233088 PCBuild cosmetic fixes.
* pythoncore.vcproj: Removed doubled entries, and sorted entries a bit.
* _multiprocessing.vcproj: Converted ProjectGUID to uppercase. Otherwise,
  VS8 _multiprocessing.vcproj created by vs9to8.py was modified every time
  loads it in VS8 IDE.
2010-09-10 03:08:24 +00:00
Georg Brandl 0771591fe1 Merged revisions 83593 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83593 | georg.brandl | 2010-08-02 23:44:25 +0200 (Mo, 02 Aug 2010) | 57 lines

  Merged revisions 83536,83546-83548,83550,83554-83555,83558,83563,83565,83571,83574-83575 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line

    #8578: mention danger of not incref'ing weak referenced object.
  ........
    r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line

    #7973: Fix distutils options spelling.
  ........
    r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line

    #7386: add example that shows that trailing path separators are stripped.
  ........
    r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line

    #8172: how does one use a property?
  ........
    r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line

    #9451: strengthen warning about __*__ special name usage.
  ........
    r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line

    #7280: note about nasmw.exe.
  ........
    r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line

    #8861: remove unused variable.
  ........
    r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line

    #8648: document UTF-7 codec functions.
  ........
    r83563 | georg.brandl | 2010-08-02 22:21:21 +0200 (Mo, 02 Aug 2010) | 1 line

    #9037: add example how to raise custom exceptions from C code.
  ........
    r83565 | georg.brandl | 2010-08-02 22:27:20 +0200 (Mo, 02 Aug 2010) | 1 line

    #9111: document that do_help() looks at docstrings.
  ........
    r83571 | georg.brandl | 2010-08-02 22:44:34 +0200 (Mo, 02 Aug 2010) | 1 line

    Clarify that abs() is not a namespace.
  ........
    r83574 | georg.brandl | 2010-08-02 22:47:56 +0200 (Mo, 02 Aug 2010) | 1 line

    #6867: epoll.register() returns None.
  ........
    r83575 | georg.brandl | 2010-08-02 22:52:10 +0200 (Mo, 02 Aug 2010) | 1 line

    #9238: zipfile does handle archive comments.
  ........
................
2010-08-02 21:45:43 +00:00
Georg Brandl 7d4bfb338d Merged revisions 83536,83546-83548,83550,83554-83555,83558,83563,83565,83571,83574-83575 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line

  #8578: mention danger of not incref'ing weak referenced object.
........
  r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line

  #7973: Fix distutils options spelling.
........
  r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line

  #7386: add example that shows that trailing path separators are stripped.
........
  r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line

  #8172: how does one use a property?
........
  r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line

  #9451: strengthen warning about __*__ special name usage.
........
  r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line

  #7280: note about nasmw.exe.
........
  r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line

  #8861: remove unused variable.
........
  r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line

  #8648: document UTF-7 codec functions.
........
  r83563 | georg.brandl | 2010-08-02 22:21:21 +0200 (Mo, 02 Aug 2010) | 1 line

  #9037: add example how to raise custom exceptions from C code.
........
  r83565 | georg.brandl | 2010-08-02 22:27:20 +0200 (Mo, 02 Aug 2010) | 1 line

  #9111: document that do_help() looks at docstrings.
........
  r83571 | georg.brandl | 2010-08-02 22:44:34 +0200 (Mo, 02 Aug 2010) | 1 line

  Clarify that abs() is not a namespace.
........
  r83574 | georg.brandl | 2010-08-02 22:47:56 +0200 (Mo, 02 Aug 2010) | 1 line

  #6867: epoll.register() returns None.
........
  r83575 | georg.brandl | 2010-08-02 22:52:10 +0200 (Mo, 02 Aug 2010) | 1 line

  #9238: zipfile does handle archive comments.
........
2010-08-02 21:44:25 +00:00
Thomas Heller f180099ec6 Fix #8959 by reverting revision 80761. 2010-06-21 14:00:24 +00:00
Antoine Pitrou c7c96a90bc Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines

  Untabify C files. Will watch buildbots.
........
2010-05-09 15:15:40 +00:00
Antoine Pitrou c83ea137d7 Untabify C files. Will watch buildbots. 2010-05-09 14:46:46 +00:00
Thomas Heller f3c157f639 Remove reference to unused source file. 2010-05-04 19:08:18 +00:00
Thomas Heller 06a7e2069a On Windows, ctypes does no longer check the stack before and after
calling a foreign function.  This allows to use the unmodified libffi
library.

Remove most files from _ctypes/libffi_msvc, only two include files
stay (updated from _ctypes/libffi/...).  Other files are used in the
cross-platform _ctypes/libffi directory.
2010-05-04 18:44:42 +00:00
Larry Hastings 5ac006dfd3 Capsule-related changes:
* PyCObject_AsVoidPtr() can now open capsules.  This addresses
  most of the remaining backwards-compatibility concerns about
  the conversion of Python 2.7 from CObjects to capsules.
* CObjects were marked Pending Deprecation.
* Documentation about this pending deprecation was added to
  cobject.h.
* The capsule source files were added to the legacy PC build
  processes.
2010-04-02 11:01:35 +00:00
Ezio Melotti 4fcf7d445c Add -Wd and -3 to the flags used to run the tests on Windows. 2010-03-31 22:43:31 +00:00
Thomas Heller b102ddadcb Revert rev. 79509; ctypes doesn't build on linux. 2010-03-30 20:57:06 +00:00
Thomas Heller 5006ba0fef Merged revisions 79115,79424,79491 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/branch_libffi-3_0_10-win

........
  r79115 | thomas.heller | 2010-03-19 22:14:47 +0100 (Fr, 19 Mrz 2010) | 7 lines

  Work in progress.  2 tests fail on x86/win32 because the stack
  checking code in ffi_call_win32 is not yet implemented.

  Remove most files from _ctypes/libffi_msvc, only two include files
  stay (updated from _ctypes/libffi/...).  Other files are used in the
  cross-platform _ctypes/libffi directory.
........
  r79424 | thomas.heller | 2010-03-25 19:28:02 +0100 (Do, 25 Mrz 2010) | 1 line

  Build _ctypes on Win64.
........
  r79491 | thomas.heller | 2010-03-29 21:30:33 +0200 (Mo, 29 Mrz 2010) | 4 lines

  On Windows, ctypes does no longer check the stack before and after
  calling a foreign function.
  This allows to use the unmodified libffi library.
........
2010-03-30 19:46:23 +00:00
Benjamin Peterson ff33e2f5e9 make an attempt to add capsule to the Windows build 2010-03-25 03:44:24 +00:00
Martin v. Löwis 7f898e3dc5 Merged revisions 78213,78215 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78213 | martin.v.loewis | 2010-02-18 10:22:20 +0100 (Do, 18 Feb 2010) | 3 lines

  Stop providing crtassem.h symbols when compiling with
  Visual Studio 2010, as msvcr100.dll is not a platform
  assembly anymore.
........
  r78215 | martin.v.loewis | 2010-02-18 13:45:45 +0100 (Do, 18 Feb 2010) | 1 line

  Move bsddb47 macros before their use, to make VS 2010 happy.
........
2010-02-18 16:24:56 +00:00
Martin v. Löwis c0de8bb6f8 Move bsddb47 macros before their use, to make VS 2010 happy. 2010-02-18 12:45:45 +00:00
Antoine Pitrou 6467213bfd Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
methods of bytes, bytearray and unicode objects by using a common
implementation based on stringlib's fast search.  Patch by Florent Xicluna.
2010-01-13 07:55:48 +00:00
Martin v. Löwis 4b2c064ed8 Make script work with 2.5. 2010-01-02 09:53:18 +00:00
Martin v. Löwis f477b93d9d Update Windows build to sqlite 3.6.21. 2010-01-02 09:25:21 +00:00
Martin v. Löwis 331411d37d Merged revisions 76990-76991 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76990 | martin.v.loewis | 2009-12-21 20:27:15 +0100 (Mo, 21 Dez 2009) | 1 line

  Switch to OpenSSL 0.9.8l.
........
  r76991 | martin.v.loewis | 2009-12-21 20:29:59 +0100 (Mo, 21 Dez 2009) | 1 line

  Add NEWS for OpenSSL changes.
........
2009-12-21 19:41:15 +00:00
Martin v. Löwis 55e1a697ab Switch to OpenSSL 0.9.8l. 2009-12-21 19:27:15 +00:00
Martin v. Löwis c3f5ca10e6 Drop 2.4 compatibility. 2009-12-21 19:25:56 +00:00
Mark Dickinson 9cae178f21 Issue #3366: Add expm1 function to math module. Thanks Eric Smith for
testing on Windows.
2009-12-16 20:13:40 +00:00
Mark Dickinson bb28285ea2 Issue #7117: Prepare for backport of py3k float repr.
Add the Python/dtoa.c file containing the main algorithms;
add corresponding include file and include in Python.h;
include license information for Python/dtoa.c;
add dtoa.c and dtoa.h to Makefile.
2009-10-24 12:13:30 +00:00
Amaury Forgeot d'Arc f31fd0179e Set svn:eol-style=CRLF on all Visual Studio solution files.
This should allow direct compilation from a downloaded source tar ball.
2009-07-13 19:14:17 +00:00
Hirokazu Yamamoto e69041db56 Updated MSVC files to follow r73394. 2009-06-14 03:05:54 +00:00
Eric Smith cac7af6863 Issue #5793: rationalize isdigit / isalpha / tolower, etc. Will port to py3k. Should fix Windows buildbot errors. 2009-04-27 19:04:37 +00:00
Martin v. Löwis 24bd65f7d3 Merged revisions 69589 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69589 | martin.v.loewis | 2009-02-13 21:11:34 +0100 (Fr, 13 Feb 2009) | 2 lines

  Move amd64 properties further to the top, so that they override
  the linker options correctly.
........
2009-04-07 16:00:51 +00:00
Hirokazu Yamamoto 957320a08a Fixed compile error on windows. 2009-04-03 03:54:08 +00:00
Martin v. Löwis a63b99575e Update Tix build procedure. 2009-02-13 20:26:16 +00:00
Martin v. Löwis 416d31a5d2 Move amd64 properties further to the top, so that they override
the linker options correctly.
2009-02-13 20:11:34 +00:00
Martin v. Löwis a2a21eed02 Merged revisions 69489-69490 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69489 | martin.v.loewis | 2009-02-10 14:09:19 +0100 (Di, 10 Feb 2009) | 1 line

  Issue #5134: Silence compiler warnings when compiling sqlite with VC++.
........
  r69490 | martin.v.loewis | 2009-02-10 14:12:12 +0100 (Di, 10 Feb 2009) | 1 line

  Set eol-style to native
........
2009-02-10 13:17:53 +00:00
Martin v. Löwis de7cdeefb5 Set eol-style to native 2009-02-10 13:12:12 +00:00
Martin v. Löwis a3e3cb7ee0 Issue #5134: Silence compiler warnings when compiling sqlite with VC++. 2009-02-10 13:09:19 +00:00
Mark Hammond fa7e69dc51 Merged revisions 69094 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69094 | mark.hammond | 2009-01-29 23:13:31 +1100 (Thu, 29 Jan 2009) | 2 lines

  Fix issue5075: bdist_wininst should not depend on the vc runtime?
........
2009-01-29 12:31:51 +00:00