Update __all__ for cookielib, csv, os, and urllib2 for objects imported into

the module but exposed as part of the API.

6 files changed, 11 insertions, 6 deletions

diff --git a/Lib/cookielib.py b/Lib/cookielib.py
index 9439b5c..6b59794 100644
--- a/Lib/cookielib.py
+++ b/Lib/cookielib.py
@@ -26,7 +26,8 @@ http://wwwsearch.sf.net/):
 """
 
 __all__ = ['Cookie', 'CookieJar', 'CookiePolicy', 'DefaultCookiePolicy',
-           'FileCookieJar', 'LWPCookieJar', 'LoadError', 'MozillaCookieJar']
+           'FileCookieJar', 'LWPCookieJar', 'lwp_cookie_str', 'LoadError',
+           'MozillaCookieJar']
 
 import re, urlparse, copy, time, urllib
 try:
diff --git a/Lib/csv.py b/Lib/csv.py
index 4f6e5c0..ff51a86 100644
--- a/Lib/csv.py
+++ b/Lib/csv.py
@@ -18,7 +18,8 @@ except ImportError:
     from StringIO import StringIO
 
 __all__ = [ "QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE",
-            "Error", "Dialect", "excel", "excel_tab", "reader", "writer",
+            "Error", "Dialect", "__doc__", "excel", "excel_tab",
+            "field_size_limit", "reader", "writer",
             "register_dialect", "get_dialect", "list_dialects", "Sniffer",
             "unregister_dialect", "__version__", "DictReader", "DictWriter" ]
 
diff --git a/Lib/os.py b/Lib/os.py
index def448f..715ff20 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -28,7 +28,7 @@ import sys, errno
 _names = sys.builtin_module_names
 
 # Note:  more names are added to __all__ later.
-__all__ = ["altsep", "curdir", "pardir", "sep", "pathsep", "linesep",
+__all__ = ["altsep", "curdir", "pardir", "sep", "extsep", "pathsep", "linesep",
            "defpath", "name", "path", "devnull",
            "SEEK_SET", "SEEK_CUR", "SEEK_END"]
 
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 @@ except ImportError:
     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
diff --git a/Lib/weakref.py b/Lib/weakref.py
index 70b383e..78b74ad 100644
--- a/Lib/weakref.py
+++ b/Lib/weakref.py
@@ -26,7 +26,7 @@ from exceptions import ReferenceError
 ProxyTypes = (ProxyType, CallableProxyType)
 
 __all__ = ["ref", "proxy", "getweakrefcount", "getweakrefs",
-           "WeakKeyDictionary", "ReferenceType", "ProxyType",
+           "WeakKeyDictionary", "ReferenceError", "ReferenceType", "ProxyType",
            "CallableProxyType", "ProxyTypes", "WeakValueDictionary"]
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 665b185..76459d6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -48,6 +48,9 @@ Core and Builtins
 Library
 -------
 
+- Update __all__ for cookielib, csv, os, urllib2, and weakref to include things
+  imported into the module but exposed as part of the module's API.
+
 - Remove an unneeded import of abc.ABCMeta from 'inspect'.
 
 - Remove unneeded imports of 'sys' and 'warnings' from 'io'.