diff --git a/Lib/Queue.py b/Lib/Queue.py index 050a9660405..0e6bbf055a4 100644 --- a/Lib/Queue.py +++ b/Lib/Queue.py @@ -1,7 +1,5 @@ """A multi-producer, multi-consumer queue.""" -__all__ = ["Queue","Empty","Full"] - class Empty(Exception): "Exception raised by Queue.get(block=0)/get_nowait()." pass diff --git a/Lib/UserDict.py b/Lib/UserDict.py index 38f0d2631bd..b642db73b57 100644 --- a/Lib/UserDict.py +++ b/Lib/UserDict.py @@ -1,7 +1,5 @@ """A more or less complete user-defined wrapper around dictionary objects.""" -__all__ = ["UserDict"] - class UserDict: def __init__(self, dict=None): self.data = {} diff --git a/Lib/UserList.py b/Lib/UserList.py index 6867332b70e..ee2658939ff 100644 --- a/Lib/UserList.py +++ b/Lib/UserList.py @@ -1,7 +1,5 @@ """A more or less complete user-defined wrapper around list objects.""" -__all__ = ["UserList"] - class UserList: def __init__(self, initlist=None): self.data = [] diff --git a/Lib/anydbm.py b/Lib/anydbm.py index 9352fbff561..ba6fa7b54aa 100644 --- a/Lib/anydbm.py +++ b/Lib/anydbm.py @@ -42,8 +42,6 @@ only if it doesn't exist; and 'n' always creates a new database. """ -__all__ = ["error","open"] - try: class error(Exception): pass diff --git a/Lib/bisect.py b/Lib/bisect.py index f521babc0e4..d311337271e 100644 --- a/Lib/bisect.py +++ b/Lib/bisect.py @@ -1,7 +1,5 @@ """Bisection algorithms.""" -__all__ = ["bisect_right","insort_right","bisect_left","insort_left"] - def insort_right(a, x, lo=0, hi=None): """Insert item x in list a, and keep it sorted assuming a is sorted. diff --git a/Lib/chunk.py b/Lib/chunk.py index 96460c04711..0a93cd31377 100644 --- a/Lib/chunk.py +++ b/Lib/chunk.py @@ -48,8 +48,6 @@ specifies whether or not chunks are aligned on 2-byte boundaries. The default is 1, i.e. aligned. """ -__all__ = ["Chunk"] - class Chunk: def __init__(self, file, align = 1, bigendian = 1, inclheader = 0): import struct diff --git a/Lib/dumbdbm.py b/Lib/dumbdbm.py index 16a0d838f5b..45a2f36a5db 100644 --- a/Lib/dumbdbm.py +++ b/Lib/dumbdbm.py @@ -24,8 +24,6 @@ is read when the database is opened, and some updates rewrite the whole index) _os = __import__('os') import __builtin__ -__all__ = ["open"] - _open = __builtin__.open _BLOCKSIZE = 512 diff --git a/Lib/htmlentitydefs.py b/Lib/htmlentitydefs.py index dfbf55e0099..b20a07c7011 100644 --- a/Lib/htmlentitydefs.py +++ b/Lib/htmlentitydefs.py @@ -1,7 +1,5 @@ """HTML character entity references.""" -__all__ = ["entitydefs"] - entitydefs = { 'AElig': '\306', # latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1 'Aacute': '\301', # latin capital letter A with acute, U+00C1 ISOlat1 diff --git a/Lib/mutex.py b/Lib/mutex.py index 33baea14223..2348a2e0041 100644 --- a/Lib/mutex.py +++ b/Lib/mutex.py @@ -12,8 +12,6 @@ Of course, no multi-threading is implied -- hence the funny interface for lock, where a function is called once the lock is aquired. """ -__all__ = ["mutex"] - class mutex: def __init__(self): """Create a new mutex -- initially unlocked.""" diff --git a/Lib/nturl2path.py b/Lib/nturl2path.py index f7b0fbe9a8c..fc5357ecd77 100644 --- a/Lib/nturl2path.py +++ b/Lib/nturl2path.py @@ -1,7 +1,5 @@ """Convert a NT pathname to a file URL and vice versa.""" -__all__ = ["url2pathname"] - def url2pathname(url): r"""Convert a URL to a DOS path. diff --git a/Lib/posixfile.py b/Lib/posixfile.py index da374ad9a99..58c4b4f5f89 100644 --- a/Lib/posixfile.py +++ b/Lib/posixfile.py @@ -53,8 +53,6 @@ f.lock(mode [, len [, start [, whence]]]) query only """ -__all__ = ["open","fileopen","SEEK_SET","SEEK_CUR","SEEK_END"] - class _posixfile_: """File wrapper class that provides extra POSIX file routines.""" diff --git a/Lib/regex_syntax.py b/Lib/regex_syntax.py index 421ffd9b9f3..b0a0dbf20c4 100644 --- a/Lib/regex_syntax.py +++ b/Lib/regex_syntax.py @@ -51,9 +51,3 @@ RE_SYNTAX_GREP = (RE_BK_PLUS_QM | RE_NEWLINE_OR) RE_SYNTAX_EMACS = 0 # (Python's obsolete "regexp" module used a syntax similar to awk.) - -__all__ = locals().keys() -for _i in range(len(__all__)-1,-1,-1): - if __all__[_i][0] == "_": - del __all__[_i] -del _i diff --git a/Lib/stat.py b/Lib/stat.py index f0ffabed431..70750d8b1ae 100644 --- a/Lib/stat.py +++ b/Lib/stat.py @@ -84,9 +84,3 @@ S_IRWXO = 00007 S_IROTH = 00004 S_IWOTH = 00002 S_IXOTH = 00001 - -__all__ = locals().keys() -for _i in range(len(__all__)-1,-1,-1): - if __all__[_i][0] == "_": - del __all__[_i] -del _i diff --git a/Lib/statvfs.py b/Lib/statvfs.py index b3d8e971b65..06a323fa63c 100644 --- a/Lib/statvfs.py +++ b/Lib/statvfs.py @@ -13,9 +13,3 @@ F_FFREE = 6 # Total number of free file nodes F_FAVAIL = 7 # Free nodes available to non-superuser F_FLAG = 8 # Flags (see your local statvfs man page) F_NAMEMAX = 9 # Maximum file name length - -__all__ = locals().keys() -for _i in range(len(__all__)-1,-1,-1): - if __all__[_i][0] == "_": - del __all__[_i] -del _i diff --git a/Lib/string.py b/Lib/string.py index 45fe9774090..913d980bae6 100644 --- a/Lib/string.py +++ b/Lib/string.py @@ -379,9 +379,3 @@ try: letters = lowercase + uppercase except ImportError: pass # Use the original versions - -__all__ = locals().keys() -for _i in range(len(__all__)-1,-1,-1): - if __all__[_i][0] == "_": - del __all__[_i] -del _i diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py index b2ea498eb4c..bd417e73165 100644 --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -39,29 +39,22 @@ def check_all(modname): verify(keys==all, "%s != %s" % (keys, all)) check_all("BaseHTTPServer") -check_all("Bastion") check_all("CGIHTTPServer") check_all("ConfigParser") check_all("Cookie") check_all("MimeWriter") -check_all("Queue") check_all("SimpleHTTPServer") check_all("SocketServer") check_all("StringIO") -check_all("UserDict") -check_all("UserList") check_all("UserString") check_all("aifc") -check_all("anydbm") check_all("atexit") check_all("audiodev") check_all("base64") check_all("bdb") check_all("binhex") -check_all("bisect") check_all("calendar") check_all("cgi") -check_all("chunk") check_all("cmd") check_all("code") check_all("codecs") @@ -76,7 +69,6 @@ check_all("dircache") check_all("dis") check_all("doctest") check_all("dospath") -check_all("dumbdbm") check_all("filecmp") check_all("fileinput") check_all("fnmatch") @@ -88,7 +80,6 @@ check_all("gettext") check_all("glob") check_all("gopherlib") check_all("gzip") -check_all("htmlentitydefs") check_all("htmllib") check_all("httplib") check_all("ihooks") @@ -106,18 +97,15 @@ check_all("mimetools") check_all("mimetypes") check_all("mimify") check_all("multifile") -check_all("mutex") check_all("netrc") check_all("nntplib") check_all("ntpath") -check_all("nturl2path") check_all("os") check_all("pdb") check_all("pickle") check_all("pipes") check_all("popen2") check_all("poplib") -check_all("posixfile") check_all("posixpath") check_all("pprint") check_all("pre") @@ -130,7 +118,6 @@ check_all("quopri") check_all("random") check_all("re") check_all("reconvert") -check_all("regex_syntax") check_all("regsub") check_all("repr") check_all("rexec") @@ -148,9 +135,5 @@ check_all("sndhdr") check_all("socket") check_all("sre") check_all("sre_compile") -check_all("sre_constants") check_all("sre_parse") -check_all("stat") check_all("stat_cache") -check_all("statvfs") -check_all("string")