Merged revisions 65795 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65795 | brett.cannon | 2008-08-17 17:46:22 -0700 (Sun, 17 Aug 2008) | 3 lines

  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/csv.py b/Lib/csv.py
index e0558c78d464e4f46f18c19abb3ad2c63038f43a..ee62abe5dc6f159d07a9ee0f06c2010476d554af 100644 (file)
--- a/Lib/csv.py
+++ b/Lib/csv.py
@@ -14,7 +14,8 @@ from _csv import Dialect as _Dialect
 from io 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 2fdf6688a94bea970c2c318040197774524df2fb..19a045a01d8bd6962ff5553dd0800b1863826311 100644 (file)
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -27,7 +27,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/weakref.py b/Lib/weakref.py
index 64d962c351ff332b395679bb2b6a683980fd016b..330107097b7de5fef5dbf33914a525ad47cd607e 100644 (file)
--- a/Lib/weakref.py
+++ b/Lib/weakref.py
@@ -25,7 +25,7 @@ from _weakrefset import WeakSet
 ProxyTypes = (ProxyType, CallableProxyType)
 
 __all__ = ["ref", "proxy", "getweakrefcount", "getweakrefs",
-           "WeakKeyDictionary", "ReferenceType", "ProxyType",
+           "WeakKeyDictionary", "ReferenceError", "ReferenceType", "ProxyType",
            "CallableProxyType", "ProxyTypes", "WeakValueDictionary",
            "WeakSet"]