[Python-checkins] cpython (merge 3.3 -> default): Closes #18627: merge from 3.3

[ned.deily]

http://hg.python.org/cpython/rev/454e9db1c750
changeset:   84972:454e9db1c750
parent:      84970:634a8e8816d4
parent:      84971:3716d64f846b
user:        Ned Deily <nad at acm.org>
date:        Thu Aug 01 22:13:30 2013 -0700
summary:
  Closes #18627: merge from 3.3

files:
  Modules/hashlib.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/hashlib.h b/Modules/hashlib.h
--- a/Modules/hashlib.h
+++ b/Modules/hashlib.h
@@ -2,7 +2,7 @@
 
 /*
  * Given a PyObject* obj, fill in the Py_buffer* viewp with the result
- * of PyObject_GetBuffer.  Sets and exception and issues a return NULL
+ * of PyObject_GetBuffer.  Sets an exception and issues a return NULL
  * on any errors.
  */
 #define GET_BUFFER_VIEW_OR_ERROUT(obj, viewp) do { \

-- 
Repository URL: http://hg.python.org/cpython