Update __all__ for cookielib, csv, os, and urllib2 for objects imported into
the module but exposed as part of the API.
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 7b209d4..ef8bbc8 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -107,8 +107,8 @@
     from StringIO import StringIO
 
 from urllib import (unwrap, unquote, splittype, splithost, quote,
-     addinfourl, splitport, splitquery,
-     splitattr, ftpwrapper, noheaders, splituser, splitpasswd, splitvalue)
+     addinfourl, splitport,
+     splitattr, ftpwrapper, splituser, splitpasswd, splitvalue)
 
 # support for FileHandler, proxies via environment variables
 from urllib import localhost, url2pathname, getproxies