summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2011-03-17 11:16:38 -0700
committerBrett Cannon <brett@python.org>2011-03-17 11:16:38 -0700
commiteb8cee83833830630f9d7388bd09d1fcb638b1a2 (patch)
tree651105352b4f7b17a4e747886562546082e9aaee /Python
parentecc2db515202456a67e9702ed94ce19fe5b4711f (diff)
parente9ff2ef20488eb3d1e8bba04516939585f35a148 (diff)
downloadcpython-git-eb8cee83833830630f9d7388bd09d1fcb638b1a2.tar.gz
merge
Diffstat (limited to 'Python')
-rw-r--r--Python/ceval.c4
-rw-r--r--Python/pystate.c2
-rw-r--r--Python/thread.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 9572918dc3..d2444aa9f0 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -26,7 +26,7 @@
typedef unsigned long long uint64;
-/* PowerPC suppport.
+/* PowerPC support.
"__ppc__" appears to be the preprocessor definition to detect on OS X, whereas
"__powerpc__" appears to be the correct one for Linux with GCC
*/
@@ -1266,7 +1266,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
if (_Py_atomic_load_relaxed(&eval_breaker)) {
if (*next_instr == SETUP_FINALLY) {
/* Make the last opcode before
- a try: finally: block uninterruptable. */
+ a try: finally: block uninterruptible. */
goto fast_next_opcode;
}
tstate->tick_counter++;
diff --git a/Python/pystate.c b/Python/pystate.c
index d5d98b0c6d..922e9a3780 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -512,7 +512,7 @@ _PyThread_CurrentFrames(void)
/* for i in all interpreters:
* for t in all of i's thread states:
* if t's frame isn't NULL, map t's id to its frame
- * Because these lists can mutute even when the GIL is held, we
+ * Because these lists can mutate even when the GIL is held, we
* need to grab head_mutex for the duration.
*/
HEAD_LOCK();
diff --git a/Python/thread.c b/Python/thread.c
index 09beaef795..d224046e64 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -40,7 +40,7 @@
#endif
/* Check if we're running on HP-UX and _SC_THREADS is defined. If so, then
- enough of the Posix threads package is implimented to support python
+ enough of the Posix threads package is implemented to support python
threads.
This is valid for HP-UX 11.23 running on an ia64 system. If needed, add