Mercurial > cpython-lru_cache-weakref
annotate PC/python_nt.rc @ 58664:993f703a61ba
Merged revisions 77484,77487,77561,77570,77593,77603,77608,77667,77702-77703,77739,77858,77887,77889 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77484 | skip.montanaro | 2010-01-13 19:12:34 -0600 (Wed, 13 Jan 2010) | 4 lines
Update PyEval_EvalFrame to PyEval_EvalFrameEx. This looks to have been done
partially before. Also add a comment describing how this might have to work
with different versions of the interpreter.
........
r77487 | ezio.melotti | 2010-01-14 05:34:10 -0600 (Thu, 14 Jan 2010) | 1 line
Fixed typo
........
r77561 | georg.brandl | 2010-01-17 02:42:30 -0600 (Sun, 17 Jan 2010) | 1 line
#7699: improve datetime docs: straightforward linking to strftime/strptime section, mark classmethods as such.
........
r77570 | georg.brandl | 2010-01-17 06:14:42 -0600 (Sun, 17 Jan 2010) | 1 line
Add note about usage of STRINGLIB_EMPTY.
........
r77593 | georg.brandl | 2010-01-17 17:33:53 -0600 (Sun, 17 Jan 2010) | 1 line
Fix internal reference.
........
r77603 | benjamin.peterson | 2010-01-18 17:07:56 -0600 (Mon, 18 Jan 2010) | 8 lines
data descriptors do not override the class dictionary if __get__ is not defined
Adjust documentation and add a test to verify this behavior.
See http://mail.python.org/pipermail/python-dev/2010-January/095637.html for
discussion.
........
r77608 | gregory.p.smith | 2010-01-19 02:19:03 -0600 (Tue, 19 Jan 2010) | 6 lines
Do not compile stubs for the sha2 series hashes in the openssl hashlib
module when the openssl version is too old to support them. That
leads both compiled code bloat and to unittests attempting to test
implementations that don't exist for comparison purposes on such
platforms.
........
r77667 | mark.dickinson | 2010-01-21 12:32:27 -0600 (Thu, 21 Jan 2010) | 1 line
Add two more test_strtod test values.
........
r77702 | georg.brandl | 2010-01-23 02:43:31 -0600 (Sat, 23 Jan 2010) | 1 line
#7762: fix refcount annotation of PyUnicode_Tailmatch().
........
r77703 | georg.brandl | 2010-01-23 02:47:54 -0600 (Sat, 23 Jan 2010) | 1 line
#7725: fix referencing issue.
........
r77739 | benjamin.peterson | 2010-01-24 21:52:52 -0600 (Sun, 24 Jan 2010) | 1 line
mention from_float() in error message
........
r77858 | georg.brandl | 2010-01-30 11:57:48 -0600 (Sat, 30 Jan 2010) | 1 line
#7802: fix invalid example (heh).
........
r77887 | georg.brandl | 2010-01-31 12:51:49 -0600 (Sun, 31 Jan 2010) | 5 lines
Fix-up ftplib documentation:
move exception descriptions to toplevel, not inside a class
remove attribution in "versionadded"
spell and grammar check docstring of FTP_TLS
........
r77889 | michael.foord | 2010-01-31 13:59:26 -0600 (Sun, 31 Jan 2010) | 1 line
Minor modification to unittest documentation.
........
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Wed, 03 Feb 2010 02:35:45 +0000 |
| parents | df15827f3488 |
| children | cd42e85cafe7 c9f68e42ab79 |
| rev | line source |
|---|---|
|
4123
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1 // Resource script for Python core DLL. |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2 // Currently only holds version information. |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3 // |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4 #include "winver.h" |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5 |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6 #define MS_WINDOWS |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7 #include "modsupport.h" |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8 #include "patchlevel.h" |
|
30666
58fe64f7fb19
To build on windows, the manual editing of the python_nt.rc file to
Thomas Heller <theller@ctypes.org>
parents:
30030
diff
changeset
|
9 #ifdef _DEBUG |
|
58fe64f7fb19
To build on windows, the manual editing of the python_nt.rc file to
Thomas Heller <theller@ctypes.org>
parents:
30030
diff
changeset
|
10 # include "pythonnt_rc_d.h" |
|
58fe64f7fb19
To build on windows, the manual editing of the python_nt.rc file to
Thomas Heller <theller@ctypes.org>
parents:
30030
diff
changeset
|
11 #else |
|
58fe64f7fb19
To build on windows, the manual editing of the python_nt.rc file to
Thomas Heller <theller@ctypes.org>
parents:
30030
diff
changeset
|
12 # include "pythonnt_rc.h" |
|
4127
a7a9d83505c4
Use MS_DLL_ID and similar changes
Guido van Rossum <guido@python.org>
parents:
4123
diff
changeset
|
13 #endif |
|
a7a9d83505c4
Use MS_DLL_ID and similar changes
Guido van Rossum <guido@python.org>
parents:
4123
diff
changeset
|
14 |
|
16487
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
15 /* e.g., 2.1a2 |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
16 * PY_VERSION comes from patchevel.h |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
17 */ |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
18 #define PYTHON_VERSION PY_VERSION "\0" |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
19 |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
20 /* 64-bit version number as comma-separated list of 4 16-bit ints */ |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
21 #if PY_MICRO_VERSION > 64 |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
22 # error "PY_MICRO_VERSION > 64" |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
23 #endif |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
24 #if PY_RELEASE_LEVEL > 99 |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
25 # error "PY_RELEASE_LEVEL > 99" |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
26 #endif |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
27 #if PY_RELEASE_SERIAL > 9 |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
28 # error "PY_RELEASE_SERIAL > 9" |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
29 #endif |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
30 #define PYVERSION64 PY_MAJOR_VERSION, PY_MINOR_VERSION, FIELD3, PYTHON_API_VERSION |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
31 |
|
6353
666accd66878
Bump version and store DLL version in a string variable (for branding).
Guido van Rossum <guido@python.org>
parents:
4127
diff
changeset
|
32 // String Tables |
|
666accd66878
Bump version and store DLL version in a string variable (for branding).
Guido van Rossum <guido@python.org>
parents:
4127
diff
changeset
|
33 STRINGTABLE DISCARDABLE |
|
666accd66878
Bump version and store DLL version in a string variable (for branding).
Guido van Rossum <guido@python.org>
parents:
4127
diff
changeset
|
34 BEGIN |
|
16487
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
35 1000, MS_DLL_ID |
|
6353
666accd66878
Bump version and store DLL version in a string variable (for branding).
Guido van Rossum <guido@python.org>
parents:
4127
diff
changeset
|
36 END |
|
666accd66878
Bump version and store DLL version in a string variable (for branding).
Guido van Rossum <guido@python.org>
parents:
4127
diff
changeset
|
37 |
|
4123
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
38 ///////////////////////////////////////////////////////////////////////////// |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
39 // |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
40 // Version |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
41 // |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
42 |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
43 VS_VERSION_INFO VERSIONINFO |
|
16487
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
44 FILEVERSION PYVERSION64 |
|
771dbb155575
SF bug #131225: sys.winver is still '2.0' in python 2.1a2.
Tim Peters <tim.peters@gmail.com>
parents:
15971
diff
changeset
|
45 PRODUCTVERSION PYVERSION64 |
|
4123
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
46 FILEFLAGSMASK 0x3fL |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
47 #ifdef _DEBUG |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
48 FILEFLAGS 0x1L |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
49 #else |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
50 FILEFLAGS 0x0L |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
51 #endif |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
52 FILEOS 0x40004L |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
53 FILETYPE 0x1L |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
54 FILESUBTYPE 0x0L |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
55 BEGIN |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
56 BLOCK "StringFileInfo" |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
57 BEGIN |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
58 BLOCK "000004b0" |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
59 BEGIN |
|
32062
69433fc1c816
Changed company name to PSF. Added 2004 to copyright years.
Tim Peters <tim.peters@gmail.com>
parents:
30666
diff
changeset
|
60 VALUE "CompanyName", "Python Software Foundation\0" |
|
4123
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
61 VALUE "FileDescription", "Python Core\0" |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
62 VALUE "FileVersion", PYTHON_VERSION |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
63 VALUE "InternalName", "Python DLL\0" |
|
45597
df15827f3488
Copyright and version tweaks for 3.0a3.
Barry Warsaw <barry@python.org>
parents:
40582
diff
changeset
|
64 VALUE "LegalCopyright", "Copyright © 2001-2008 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" |
|
4123
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
65 VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
66 VALUE "ProductName", "Python\0" |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
67 VALUE "ProductVersion", PYTHON_VERSION |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
68 END |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
69 END |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
70 BLOCK "VarFileInfo" |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
71 BEGIN |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
72 VALUE "Translation", 0x0, 1200 |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
73 END |
|
71b43d4b7cd0
Added dllbase_nt.txt and python_nt.rc;
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
74 END |
