Mercurial > cpython-lru_cache-weakref
annotate Python/getcopyright.c @ 60174:255a401c19b0
(partially)
Merged revisions 79534,79537,79539,79558,79606 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer, 31 mar 2010) | 2 lines
Fix test for xml.etree when using a non-ascii path. And use check_warnings instead of catch_warnings.
........
r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer, 31 mar 2010) | 2 lines
Fix typo
........
r79539 | florent.xicluna | 2010-04-01 00:01:03 +0200 (jeu, 01 avr 2010) | 2 lines
Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests.
........
r79558 | florent.xicluna | 2010-04-01 20:17:09 +0200 (jeu, 01 avr 2010) | 2 lines
#7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
........
r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven, 02 avr 2010) | 2 lines
Backport some robotparser test and skip the test if the external resource is not available.
........
| author | Florent Xicluna <florent.xicluna@gmail.com> |
|---|---|
| date | Fri, 02 Apr 2010 18:52:12 +0000 |
| parents | 68a754abcfb6 |
| children | 7bb37a4cd7cf 550b38caf5c1 |
| rev | line source |
|---|---|
| 2896 | 1 /* Return the copyright string. This is updated manually. */ |
| 2 | |
| 3101 | 3 #include "Python.h" |
| 4 | |
|
12658
e2e436a62898
At Bob Kahn's request, add CNRI to the copyright string (but not to
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
5 static char cprt[] = |
|
15985
17f23f8cd8c7
Add my name to the copyright notice.
Guido van Rossum <guido@python.org>
parents:
14395
diff
changeset
|
6 "\ |
|
58060
68a754abcfb6
Merged revisions 77203 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
50568
diff
changeset
|
7 Copyright (c) 2001-2010 Python Software Foundation.\n\ |
|
15985
17f23f8cd8c7
Add my name to the copyright notice.
Guido van Rossum <guido@python.org>
parents:
14395
diff
changeset
|
8 All Rights Reserved.\n\ |
|
17f23f8cd8c7
Add my name to the copyright notice.
Guido van Rossum <guido@python.org>
parents:
14395
diff
changeset
|
9 \n\ |
|
17f23f8cd8c7
Add my name to the copyright notice.
Guido van Rossum <guido@python.org>
parents:
14395
diff
changeset
|
10 Copyright (c) 2000 BeOpen.com.\n\ |
|
14395
532c9ce6c87c
All right. More uniformity, and extra blank lines.
Guido van Rossum <guido@python.org>
parents:
14394
diff
changeset
|
11 All Rights Reserved.\n\ |
|
532c9ce6c87c
All right. More uniformity, and extra blank lines.
Guido van Rossum <guido@python.org>
parents:
14394
diff
changeset
|
12 \n\ |
|
17458
0d0546bd8448
Because this code was derived from Python 1.6.1 (amongst others), the
Guido van Rossum <guido@python.org>
parents:
17443
diff
changeset
|
13 Copyright (c) 1995-2001 Corporation for National Research Initiatives.\n\ |
|
14384
6fb61b83435d
Change the copyright notice according to CNRI's wishes, with
Guido van Rossum <guido@python.org>
parents:
14375
diff
changeset
|
14 All Rights Reserved.\n\ |
|
14395
532c9ce6c87c
All right. More uniformity, and extra blank lines.
Guido van Rossum <guido@python.org>
parents:
14394
diff
changeset
|
15 \n\ |
|
14394
2eeb58b43eb1
Use periods, not semicolons between Copyright and All Rights Reserved.
Guido van Rossum <guido@python.org>
parents:
14384
diff
changeset
|
16 Copyright (c) 1991-1995 Stichting Mathematisch Centrum, Amsterdam.\n\ |
|
14384
6fb61b83435d
Change the copyright notice according to CNRI's wishes, with
Guido van Rossum <guido@python.org>
parents:
14375
diff
changeset
|
17 All Rights Reserved."; |
|
12658
e2e436a62898
At Bob Kahn's request, add CNRI to the copyright string (but not to
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
18 |
| 2896 | 19 const char * |
|
13658
f79434ee41fa
Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents:
13255
diff
changeset
|
20 Py_GetCopyright(void) |
| 2896 | 21 { |
|
12658
e2e436a62898
At Bob Kahn's request, add CNRI to the copyright string (but not to
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
22 return cprt; |
| 2896 | 23 } |
