Commit Graph

57 Commits

Author SHA1 Message Date
Kristján Valur Jónsson c014df7edf Merge with 3.2: use ws2_32.lib rather than wsock32.lib on windows. 2012-04-15 11:14:46 +00:00
Kristján Valur Jónsson 473fde60dc Make all socket related modules link with ws2_32.lib on windows, like
_socket does.  Some were using the older wsock32.lib.
2012-04-15 11:12:57 +00:00
Amaury Forgeot d'Arc 8963943fc3 hg merge 3.2 2012-04-13 02:23:59 +02:00
Amaury Forgeot d'Arc a9d33a21b3 Issue14559: Fix build files old Microft compilers.
With VS8.0 at least Python compiles and works correctly.
2012-04-13 02:14:28 +02:00
Antoine Pitrou c61c8d7a5e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists.
This introduces a small private API for this common pattern.
The issue has been discovered thanks to Martin's huge-mem buildbot.
2011-10-06 19:04:12 +02:00
Antoine Pitrou eeb7eea1f9 Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists.
This introduces a small private API for this common pattern.
The issue has been discovered thanks to Martin's huge-mem buildbot.
2011-10-06 18:57:27 +02:00
Martin v. Löwis c142389218 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:24:49 +01:00
Martin v. Löwis bb3e937a18 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:23:39 +01:00
Martin v. Löwis 21967d0b4d 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 11:28:23 +01:00
Georg Brandl 49857f8a93 Add updated .hgeol file and fix newlines in the 3.2 branch. 2011-03-05 15:11:35 +01:00
Georg Brandl 5537d298ea Add updated .hgeol file and fix newlines in the 3.1 branch. 2011-03-05 15:10:38 +01:00
Antoine Pitrou 7f1e174c7a Make svn:eol-style's more consistent 2011-02-25 14:19:48 +00:00
Georg Brandl fa2c61a222 More automated version replacement. 2011-02-20 10:41:31 +00:00
Hirokazu Yamamoto 59b7c70d58 Recorded merge of revisions 86117 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86117 | hirokazu.yamamoto | 2010-11-02 23:06:03 +0900 | 2 lines

  Defined Py_BUILD_CORE_MODULE also on VC7.1.
  # I don't have this compiler, so I couldn't test it.
........
2010-11-02 15:44:18 +00:00
Hirokazu Yamamoto f74ed2ea4c Defined Py_BUILD_CORE_MODULE also on VC7.1.
# I don't have this compiler, so I couldn't test it.
2010-11-02 14:06:03 +00:00
Hirokazu Yamamoto e75bc2c6f9 Follows Python/fileutils.c addition. 2010-10-08 08:46:30 +00:00
Hirokazu Yamamoto 35aa08376b Applied r84870 to older compilers. 2010-09-18 04:02:52 +00:00
Hirokazu Yamamoto 13bba43e25 Merged revisions 84644 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84644 | hirokazu.yamamoto | 2010-09-09 15:14:23 +0900 | 1 line

  Updated VS7.1 project file. (I cannot test this file because I don't have VS7.1)
........
2010-09-10 02:59:55 +00:00
Hirokazu Yamamoto d72461a7ed Updated VS7.1 project file. (I cannot test this file because I don't have VS7.1) 2010-09-09 06:14:23 +00:00
Antoine Pitrou 7f14f0d8a0 Recorded merge of revisions 81032 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81032 | antoine.pitrou | 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) | 9 lines

  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 16:14:21 +00:00
Antoine Pitrou f95a1b3c53 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:52:27 +00:00
Jeffrey Yasskin 39370830a9 Make (most of) Python's tests pass under Thread Sanitizer.
http://code.google.com/p/data-race-test/wiki/ThreadSanitizer is a dynamic data
race detector that runs on top of valgrind. With this patch, the binaries at
http://code.google.com/p/data-race-test/wiki/ThreadSanitizer#Binaries pass many
but not all of the Python tests. All of regrtest still passes outside of tsan.

I've implemented part of the C1x atomic types so that we can explicitly mark
variables that are used across threads, and get defined behavior as compilers
advance.

I've added tsan's client header and implementation to the codebase in
dynamic_annotations.{h,c} (docs at
http://code.google.com/p/data-race-test/wiki/DynamicAnnotations).
Unfortunately, I haven't been able to get helgrind and drd to give sensible
error messages, even when I use their client annotations, so I'm not supporting
them.
2010-05-03 19:29:34 +00:00
Mark Dickinson 664b511c0a Merged revisions 76861 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76861 | mark.dickinson | 2009-12-16 20:13:40 +0000 (Wed, 16 Dec 2009) | 3 lines

  Issue #3366: Add expm1 function to math module.  Thanks Eric Smith for
  testing on Windows.
........
2009-12-16 20:23:42 +00:00
Amaury Forgeot d'Arc 514ae0178d Merged revisions 73998 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73998 | amaury.forgeotdarc | 2009-07-13 21:14:17 +0200 (lun., 13 juil. 2009) | 3 lines

  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:17:00 +00:00
Hirokazu Yamamoto 63dce79e24 Updated MSVC project files to follow PyCObject removal (r73729) 2009-07-01 02:36:00 +00:00
Martin v. Löwis f7a6b508ce Bump Windows versions to 3.2. 2009-06-27 23:00:59 +00:00
Georg Brandl 1158a33fab #3791: remove last traces of bsddb. 2009-06-04 09:30:30 +00:00
Hirokazu Yamamoto 0a0728522d Added Objects/capsule.c to project files. 2009-05-06 04:02:39 +00:00
Eric Smith 6dc46f5eaa Merged revisions 72040 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72040 | eric.smith | 2009-04-27 15:04:37 -0400 (Mon, 27 Apr 2009) | 1 line

  Issue #5793: rationalize isdigit / isalpha / tolower, etc. Will port to py3k. Should fix Windows buildbot errors.
........
2009-04-27 20:39:49 +00:00
Hirokazu Yamamoto f498113f3f Added Python/dtoa.c to project files. 2009-04-18 13:10:51 +00:00
Alexandre Vassalotti 8d8d630003 Issue 5682: Move _io module into its own subdirectory.
Reviewed by: Antoine Pitrou
2009-04-04 19:58:40 +00:00
Martin v. Löwis ffe431d8bd Merged revisions 68203 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68203 | martin.v.loewis | 2009-01-03 18:19:26 +0100 (Sa, 03 Jan 2009) | 2 lines

  Issue #4817: Remove unused function PyOS_GetLastModificationTime.
........
2009-01-03 17:22:40 +00:00
Christian Heimes fd44062a7f More 3.0 -> 3.1 transistions 2008-12-03 18:35:13 +00:00
Amaury Forgeot d'Arc b0c29161a2 Merged revisions 67295,67301-67302,67318,67330,67342-67343 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67295 | benjamin.peterson | 2008-11-20 05:05:12 +0100 (jeu., 20 nov. 2008) | 1 line

  move useful sys.settrace information to the function's documentation from the debugger
........
  r67301 | benjamin.peterson | 2008-11-20 22:25:31 +0100 (jeu., 20 nov. 2008) | 1 line

  fix indentation and a sphinx warning
........
  r67302 | benjamin.peterson | 2008-11-20 22:44:23 +0100 (jeu., 20 nov. 2008) | 1 line

  oops! didn't mean to disable that test
........
  r67318 | amaury.forgeotdarc | 2008-11-21 23:05:48 +0100 (ven., 21 nov. 2008) | 4 lines

  #4363: Let uuid.uuid1() and uuid.uuid4() run even if the ctypes module is not present.

  Will backport to 2.6
........
  r67330 | georg.brandl | 2008-11-22 09:34:14 +0100 (sam., 22 nov. 2008) | 2 lines

  #4364: fix attribute name on ctypes object.
........
  r67342 | amaury.forgeotdarc | 2008-11-22 20:39:38 +0100 (sam., 22 nov. 2008) | 3 lines

  yuvconvert.c is a part of the "sv" module, an old IRIX thing
  and certainly not useful for any Windows build.
........
  r67343 | amaury.forgeotdarc | 2008-11-22 21:01:18 +0100 (sam., 22 nov. 2008) | 5 lines

  #3996: On Windows, PyOS_CheckStack is supposed to protect the interpreter from
  stack overflow. But doing this, it always crashes when the stack is nearly full.

  Reviewed by Martin von Loewis. Will backport to 2.6.
........
2008-11-22 22:18:04 +00:00
Amaury Forgeot d'Arc 696af9772e Align the VS2003 and VS2005 build files with the VS2008 ones
(VC6 was done before)
2008-09-06 00:11:20 +00:00
Amaury Forgeot d'Arc ebad7f0d47 Merged revisions 66167 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66167 | amaury.forgeotdarc | 2008-09-02 23:50:47 +0200 (mar., 02 sept. 2008) | 5 lines

  Attempt to correct the build files for the Microsoft VS7.1 compiler.

  I don't have a working VS7.1, but VS2005 can automatically convert
  the project and build a working python interpreter.
........
2008-09-02 23:08:07 +00:00
Amaury Forgeot d'Arc 9d865c9650 On Windows, repair compilation of builtin modules _stringio and _pickle.
(Alexandre, the MSVC build files are in PCBuild.
the PC/Vxxx directories try to support older compilers)
2008-06-12 22:27:27 +00:00
Alexandre Vassalotti b1549092ea Removed _stringio from Windows build.
For some yet unknown reason, MSVC's linker fails to resolve
_stringio's module initializer (PyInit__stringio). This probably means
the module is not build correctly. Therefore, I am removing Windows
support temporarily until I find how to add new modules properly for
MSVC.
2008-06-12 18:35:39 +00:00
Benjamin Peterson 75f25f2c9a revert the addition of _pickle because it was causing havok with 64-bit 2008-06-12 03:10:02 +00:00
Alexandre Vassalotti 3c415a26e3 Attempt to fix the Windows build for _stringio and _pickle.
I don't have any win32 machine in my reach. So, I can't test this.
2008-06-12 00:52:32 +00:00
Thomas Heller 12f8a0538b Fix the Windows build by removing references to the cStringIO module
which no longer exists.
2008-06-10 15:01:24 +00:00
Georg Brandl e1b5ac6408 Remove meaning of -ttt, but still accept -t option on cmdline for compatibility. 2008-06-04 13:06:58 +00:00
Georg Brandl a26f8ca668 Revert r63934 -- it was mixing two patches. 2008-06-04 13:01:30 +00:00
Georg Brandl f954c4b9fb Remove meaning of -ttt, but still accept -t option on cmdline for compatibility. 2008-06-04 11:41:32 +00:00
Georg Brandl 2067bfdf25 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. 2008-05-25 13:05:15 +00:00
Georg Brandl 38feaf0fef #2879: rename _winreg to winreg. 2008-05-25 07:45:51 +00:00
Georg Brandl 6e47a33e49 Tkinter, step 5: remove lib-tk subdirectory and update all places where it was mentioned. 2008-05-17 19:15:58 +00:00
Christian Heimes 90540004d3 Merged revisions 62734,62736,62748,62769 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62734 | brett.cannon | 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) | 5 lines

  Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob
  Ippolito.

  Closes issue #2750.
........
  r62736 | georg.brandl | 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) | 2 lines

  Fix JSON module docs.
........
  r62748 | benjamin.peterson | 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) | 2 lines

  PEP 8 nits in json package
........
  r62769 | christian.heimes | 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) | 2 lines

  Intern static string
  Use float constructors instead of magic code for float constants
........
2008-05-08 14:29:10 +00:00
Christian Heimes 53876d9cd8 Merged revisions 62380,62382-62383 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62380 | christian.heimes | 2008-04-19 01:13:07 +0200 (Sat, 19 Apr 2008) | 3 lines

  I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math.

  The patch also adds acosh, asinh, atanh, log1p and copysign to all platforms. Finally it fixes differences between platforms like different results or exceptions for edge cases. Have fun :)
........
  r62382 | christian.heimes | 2008-04-19 01:40:40 +0200 (Sat, 19 Apr 2008) | 2 lines

  Added new files to Windows project files
  More Windows related fixes are coming soon
........
  r62383 | christian.heimes | 2008-04-19 01:49:11 +0200 (Sat, 19 Apr 2008) | 1 line

  Stupid me. Py_RETURN_NAN should actually return something ...
........
2008-04-19 00:31:39 +00:00
Neal Norwitz 32dde22186 Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62128,62130,62132,62134-62135,62137,62139-62140,62144,62146,62151,62155,62157,62162-62166,62171-62172,62175-62176,62178,62181-62186,62188-62192,62196,62200-62203,62206,62211-62213,62215-62218,62222,62224-62226,62228,62232,62236,62240-62245,62248,62250-62254,62256-62258,62262,62264-62265,62267-62270,62272-62276,62280-62288,62291-62292,62299-62301,62307,62312,62316-62318,62322-62331,62333-62337,62339-62344,62346-62348 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62323 | brett.cannon | 2008-04-13 10:09:43 -0700 (Sun, 13 Apr 2008) | 3 lines

  Add an explicit check for output in a test to try to diagnose a failure on
  Windows.
........
  r62324 | brett.cannon | 2008-04-13 10:41:31 -0700 (Sun, 13 Apr 2008) | 3 lines

  Fix spliting on colons on Windows machines with a file path by limiting the
  number of splits.
........
  r62329 | benjamin.peterson | 2008-04-13 13:35:56 -0700 (Sun, 13 Apr 2008) | 2 lines

  #2627 Let it be known what pgen generates
........
  r62330 | benjamin.peterson | 2008-04-13 13:40:03 -0700 (Sun, 13 Apr 2008) | 2 lines

  Added an ignore file for Bazaar #2510
........
  r62331 | georg.brandl | 2008-04-13 13:50:29 -0700 (Sun, 13 Apr 2008) | 2 lines

  Improve -X error message.
........
  r62334 | andrew.kuchling | 2008-04-13 15:39:12 -0700 (Sun, 13 Apr 2008) | 1 line

  Add example
........
  r62340 | amaury.forgeotdarc | 2008-04-14 12:55:40 -0700 (Mon, 14 Apr 2008) | 2 lines

  Update project files for all Windows supported compilers
........
  r62341 | amaury.forgeotdarc | 2008-04-14 13:07:48 -0700 (Mon, 14 Apr 2008) | 6 lines

  Correct a refleak found by "regrtest.py -R:: test_structmembers"

  Some other minor updates in _warnings.c:
  - make a function static
  - rename a shadowing local variable
........
  r62347 | andrew.kuchling | 2008-04-14 19:24:15 -0700 (Mon, 14 Apr 2008) | 1 line

  Various items; begin writing the SSL section
........
  r62348 | neal.norwitz | 2008-04-14 20:46:21 -0700 (Mon, 14 Apr 2008) | 1 line

  Prevent namespace pollution, add static for internal functions
........
2008-04-15 06:43:13 +00:00