[Python-3000-checkins] r65796 - in python/branches/py3k: Lib/csv.py Lib/os.py Lib/weakref.py

[brett.cannon]

Author: brett.cannon
Date: Mon Aug 18 02:51:19 2008
New Revision: 65796

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/csv.py
   python/branches/py3k/Lib/os.py
   python/branches/py3k/Lib/weakref.py

Modified: python/branches/py3k/Lib/csv.py
==============================================================================
--- python/branches/py3k/Lib/csv.py	(original)
+++ python/branches/py3k/Lib/csv.py	Mon Aug 18 02:51:19 2008
@@ -14,7 +14,8 @@
 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" ]
 

Modified: python/branches/py3k/Lib/os.py
==============================================================================
--- python/branches/py3k/Lib/os.py	(original)
+++ python/branches/py3k/Lib/os.py	Mon Aug 18 02:51:19 2008
@@ -27,7 +27,7 @@
 _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"]
 

Modified: python/branches/py3k/Lib/weakref.py
==============================================================================
--- python/branches/py3k/Lib/weakref.py	(original)
+++ python/branches/py3k/Lib/weakref.py	Mon Aug 18 02:51:19 2008
@@ -25,7 +25,7 @@
 ProxyTypes = (ProxyType, CallableProxyType)
 
 __all__ = ["ref", "proxy", "getweakrefcount", "getweakrefs",
-           "WeakKeyDictionary", "ReferenceType", "ProxyType",
+           "WeakKeyDictionary", "ReferenceError", "ReferenceType", "ProxyType",
            "CallableProxyType", "ProxyTypes", "WeakValueDictionary",
            "WeakSet"]