> Therefore, I propose to change this error message to:
>  "unicode argument expected, got '%s'"
>  as Terry suggested.
>

Sounds good to me.

Terry, what are your thoughts?
Can I commit the fix?