Index: Objects/unicodeobject.c
===================================================================
--- Objects/unicodeobject.c	(revision 78945)
+++ Objects/unicodeobject.c	(working copy)
@@ -7678,8 +7678,12 @@
 Py_RETURN_FALSE;
 }
 substring = (PyUnicodeObject *)PyUnicode_FromObject(subobj);
- if (substring == NULL)
+ if (substring == NULL) {
+ if (PyErr_ExceptionMatches(PyExc_TypeError))
+ PyErr_Format(PyExc_TypeError, "startswith first arg must be str, "
+ "unicode, or tuple, not %s", Py_TYPE(subobj)->tp_name);
 return NULL;
+ }
 result = tailmatch(self, substring, start, end, -1);
 Py_DECREF(substring);
 return PyBool_FromLong(result);
@@ -7723,9 +7727,12 @@
 Py_RETURN_FALSE;
 }
 substring = (PyUnicodeObject *)PyUnicode_FromObject(subobj);
- if (substring == NULL)
+ if (substring == NULL) {
+ if (PyErr_ExceptionMatches(PyExc_TypeError))
+ PyErr_Format(PyExc_TypeError, "endswith first arg must be str, "
+ "unicode, or tuple, not %s", Py_TYPE(subobj)->tp_name);
 return NULL;
-
+ }
 result = tailmatch(self, substring, start, end, +1);
 Py_DECREF(substring);
 return PyBool_FromLong(result);
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file16538/issue6780.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file16538/issue6780.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>