Mercurial > cpython-lru_cache-weakref
annotate Python/sigcheck.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 | 6f6f965c5e2d |
| children |
| rev | line source |
|---|---|
|
1660
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1 |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2 /* Sigcheck is similar to intrcheck() but sets an exception when an |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3 interrupt occurs. It can't be in the intrcheck.c file since that |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4 file (and the whole directory it is in) doesn't know about objects |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5 or exceptions. It can't be in errors.c because it can be |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6 overridden (at link time) by a more powerful version implemented in |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7 signalmodule.c. */ |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8 |
|
5373
5880384d7c71
Quickly renamed the remaining files -- this directory is done.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
9 #include "Python.h" |
|
1660
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
10 |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
11 /* ARGSUSED */ |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
12 int |
|
13658
f79434ee41fa
Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents:
13256
diff
changeset
|
13 PyErr_CheckSignals(void) |
|
1660
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
14 { |
|
5373
5880384d7c71
Quickly renamed the remaining files -- this directory is done.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
15 if (!PyOS_InterruptOccurred()) |
|
1660
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
16 return 0; |
|
5373
5880384d7c71
Quickly renamed the remaining files -- this directory is done.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
17 PyErr_SetNone(PyExc_KeyboardInterrupt); |
|
1660
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
18 return -1; |
|
ffd495bacbd4
Replace intrcheck() by sigcheck() in many places.
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
19 } |
