diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2008-04-15 06:43:13 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2008-04-15 06:43:13 (GMT) |
| commit | 32dde22186efbbfcfb275ac9542b3e62a9b5cf1b (patch) | |
| tree | 70fae01420cd0287afb1565f4e80bba035b85540 /PC | |
| parent | d6372b94a5a240da980a7973dc693e4998978edb (diff) | |
| download | cpython-32dde22186efbbfcfb275ac9542b3e62a9b5cf1b.zip cpython-32dde22186efbbfcfb275ac9542b3e62a9b5cf1b.tar.gz cpython-32dde22186efbbfcfb275ac9542b3e62a9b5cf1b.tar.bz2 | |
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
........
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VC6/pythoncore.dsp | 4 | ||||
| -rw-r--r-- | PC/VS7.1/pythoncore.vcproj | 3 | ||||
| -rw-r--r-- | PC/VS8.0/pythoncore.vcproj | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index 001c821..de8860f 100644 --- a/PC/VC6/pythoncore.dsp +++ b/PC/VC6/pythoncore.dsp @@ -193,6 +193,10 @@ SOURCE=..\..\Modules\arraymodule.c # End Source File
# Begin Source File
+SOURCE=..\..\Python\_warnings.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Python\asdl.c
# End Source File
# Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj index 552f199..304b119 100644 --- a/PC/VS7.1/pythoncore.vcproj +++ b/PC/VS7.1/pythoncore.vcproj @@ -410,6 +410,9 @@ RelativePath="..\..\Modules\arraymodule.c"> </File> <File + RelativePath="..\..\Python\_warnings.c"> + </File> + <File RelativePath="..\..\Python\asdl.c"> </File> <File diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj index a4189e1..b63ed88 100644 --- a/PC/VS8.0/pythoncore.vcproj +++ b/PC/VS8.0/pythoncore.vcproj @@ -1587,6 +1587,10 @@ Name="Python"
>
<File
+ RelativePath="..\..\Python\_warnings.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Python\asdl.c"
>
</File>
|