Skip to content

Commit d41063a

Browse files
author
brett.cannon
committed
Update __all__ for cookielib, csv, os, and urllib2 for objects imported into
the module but exposed as part of the API. git-svn-id: http://svn.python.org/projects/python/trunk@65795 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent 1f77c17 commit d41063a

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

Lib/cookielib.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"""
2727

2828
__all__ = ['Cookie', 'CookieJar', 'CookiePolicy', 'DefaultCookiePolicy',
29-
'FileCookieJar', 'LWPCookieJar', 'LoadError', 'MozillaCookieJar']
29+
'FileCookieJar', 'LWPCookieJar', 'lwp_cookie_str', 'LoadError',
30+
'MozillaCookieJar']
3031

3132
import re, urlparse, copy, time, urllib
3233
try:

Lib/csv.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
from StringIO import StringIO
1919

2020
__all__ = [ "QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE",
21-
"Error", "Dialect", "excel", "excel_tab", "reader", "writer",
21+
"Error", "Dialect", "__doc__", "excel", "excel_tab",
22+
"field_size_limit", "reader", "writer",
2223
"register_dialect", "get_dialect", "list_dialects", "Sniffer",
2324
"unregister_dialect", "__version__", "DictReader", "DictWriter" ]
2425

Lib/os.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
_names = sys.builtin_module_names
2929

3030
# Note: more names are added to __all__ later.
31-
__all__ = ["altsep", "curdir", "pardir", "sep", "pathsep", "linesep",
31+
__all__ = ["altsep", "curdir", "pardir", "sep", "extsep", "pathsep", "linesep",
3232
"defpath", "name", "path", "devnull",
3333
"SEEK_SET", "SEEK_CUR", "SEEK_END"]
3434

Lib/urllib2.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
from StringIO import StringIO
108108

109109
from urllib import (unwrap, unquote, splittype, splithost, quote,
110-
addinfourl, splitport, splitquery,
111-
splitattr, ftpwrapper, noheaders, splituser, splitpasswd, splitvalue)
110+
addinfourl, splitport,
111+
splitattr, ftpwrapper, splituser, splitpasswd, splitvalue)
112112

113113
# support for FileHandler, proxies via environment variables
114114
from urllib import localhost, url2pathname, getproxies

Lib/weakref.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
ProxyTypes = (ProxyType, CallableProxyType)
2727

2828
__all__ = ["ref", "proxy", "getweakrefcount", "getweakrefs",
29-
"WeakKeyDictionary", "ReferenceType", "ProxyType",
29+
"WeakKeyDictionary", "ReferenceError", "ReferenceType", "ProxyType",
3030
"CallableProxyType", "ProxyTypes", "WeakValueDictionary"]
3131

3232

Misc/NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ Core and Builtins
4848
Library
4949
-------
5050

51+
- Update __all__ for cookielib, csv, os, urllib2, and weakref to include things
52+
imported into the module but exposed as part of the module's API.
53+
5154
- Remove an unneeded import of abc.ABCMeta from 'inspect'.
5255

5356
- Remove unneeded imports of 'sys' and 'warnings' from 'io'.

0 commit comments

Comments
 (0)