[Python-checkins] r77488 - in python/branches/release26-maint: Objects/bytearrayobject.c

[ezio.melotti]

Author: ezio.melotti
Date: Thu Jan 14 12:39:50 2010
New Revision: 77488

Log:
Merged revisions 77487 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77487 | ezio.melotti | 2010-01-14 13:34:10 +0200 (Thu, 14 Jan 2010) | 1 line
  
  Fixed typo
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Objects/bytearrayobject.c

Modified: python/branches/release26-maint/Objects/bytearrayobject.c
==============================================================================
--- python/branches/release26-maint/Objects/bytearrayobject.c	(original)
+++ python/branches/release26-maint/Objects/bytearrayobject.c	Thu Jan 14 12:39:50 2010
@@ -1029,7 +1029,7 @@
         PyObject_IsInstance(other, (PyObject*)&PyUnicode_Type)) {
         if (Py_BytesWarningFlag && op == Py_EQ) {
             if (PyErr_WarnEx(PyExc_BytesWarning,
-                            "Comparsion between bytearray and string", 1))
+                            "Comparison between bytearray and string", 1))
                 return NULL;
         }