How can I percent-encode URL parameters in Python?

If I do

url = "http://example.com?p=" + urllib.quote(query)

1. It doesn't encode / to %2F (breaks OAuth normalization)
2. It doesn't handle Unicode (it throws an exception)

Is there a better library?