Merged revisions 67950,67962,67968-67969,68027,68075,68091,68093 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r67950 | benjamin.peterson | 2008-12-27 18:00:44 +0100 (Sat, 27 Dec 2008) | 1 line fix 2.x isms in distutils test ........ r67962 | georg.brandl | 2008-12-27 20:08:11 +0100 (Sat, 27 Dec 2008) | 2 lines #4697: clarify that the functions are Unix-only. ........ r67968 | georg.brandl | 2008-12-28 00:12:09 +0100 (Sun, 28 Dec 2008) | 2 lines Remove confusing error message in bytes.translate. ........ r67969 | georg.brandl | 2008-12-28 00:33:20 +0100 (Sun, 28 Dec 2008) | 5 lines Document bytes.translate(). BTW, having str.maketrans() as a static method and string.maketrans() as a function that creates translation tables for bytes objects is not very consistent :) ........ r68027 | benjamin.peterson | 2008-12-29 21:52:09 +0100 (Mon, 29 Dec 2008) | 1 line hexdigest() doesn't return bytes #4771 ........ r68075 | benjamin.peterson | 2008-12-30 19:05:46 +0100 (Tue, 30 Dec 2008) | 2 lines use $(RUNSHARED) to run plat-mac/regen ........ r68091 | benjamin.peterson | 2008-12-31 04:43:28 +0100 (Wed, 31 Dec 2008) | 1 line #4788 qualify remove a bare except ........ r68093 | benjamin.peterson | 2008-12-31 05:10:35 +0100 (Wed, 31 Dec 2008) | 1 line fix name usage ........

--- a/Objects/bytesobject.c	Sat Jan 03 23:39:10 2009 +0000
+++ b/Objects/bytesobject.c	Sat Jan 03 23:47:58 2009 +0000
@@ -1884,11 +1884,6 @@
 			del_table = PyBytes_AS_STRING(delobj);
 			dellen = PyBytes_GET_SIZE(delobj);
 		}
-		else if (PyUnicode_Check(delobj)) {
-			PyErr_SetString(PyExc_TypeError,
-			"deletions are implemented differently for unicode");
-			return NULL;
-		}
 		else if (PyObject_AsCharBuffer(delobj, &del_table, &dellen))
 			return NULL;
 	}