Issue #23883: Add missing APIs to __all__; patch by Jacek Kołodziej

This commit is contained in:
Martin Panter 2015-11-14 12:46:42 +00:00
parent d226d308a3
commit 19e69c5a20
15 changed files with 111 additions and 16 deletions

View File

@ -13,11 +13,12 @@ from _csv import Dialect as _Dialect
from io import StringIO from io import StringIO
__all__ = [ "QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE", __all__ = ["QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE",
"Error", "Dialect", "__doc__", "excel", "excel_tab", "Error", "Dialect", "__doc__", "excel", "excel_tab",
"field_size_limit", "reader", "writer", "field_size_limit", "reader", "writer",
"register_dialect", "get_dialect", "list_dialects", "Sniffer", "register_dialect", "get_dialect", "list_dialects", "Sniffer",
"unregister_dialect", "__version__", "DictReader", "DictWriter" ] "unregister_dialect", "__version__", "DictReader", "DictWriter",
"unix_dialect"]
class Dialect: class Dialect:
"""Describe a CSV dialect. """Describe a CSV dialect.

View File

@ -8,7 +8,7 @@ except ImportError:
from collections import OrderedDict from collections import OrderedDict
__all__ = ['Enum', 'IntEnum', 'unique'] __all__ = ['EnumMeta', 'Enum', 'IntEnum', 'unique']
def _is_descriptor(obj): def _is_descriptor(obj):

View File

@ -42,7 +42,8 @@ import socket
import warnings import warnings
from socket import _GLOBAL_DEFAULT_TIMEOUT from socket import _GLOBAL_DEFAULT_TIMEOUT
__all__ = ["FTP"] __all__ = ["FTP", "error_reply", "error_temp", "error_perm", "error_proto",
"all_errors"]
# Magic number from <socket.h> # Magic number from <socket.h>
MSG_OOB = 0x1 # Process data out of band MSG_OOB = 0x1 # Process data out of band

View File

@ -33,8 +33,9 @@ __all__ = ['BASIC_FORMAT', 'BufferingFormatter', 'CRITICAL', 'DEBUG', 'ERROR',
'StreamHandler', 'WARN', 'WARNING', 'addLevelName', 'basicConfig', 'StreamHandler', 'WARN', 'WARNING', 'addLevelName', 'basicConfig',
'captureWarnings', 'critical', 'debug', 'disable', 'error', 'captureWarnings', 'critical', 'debug', 'disable', 'error',
'exception', 'fatal', 'getLevelName', 'getLogger', 'getLoggerClass', 'exception', 'fatal', 'getLevelName', 'getLogger', 'getLoggerClass',
'info', 'log', 'makeLogRecord', 'setLoggerClass', 'warn', 'warning', 'info', 'log', 'makeLogRecord', 'setLoggerClass', 'shutdown',
'getLogRecordFactory', 'setLogRecordFactory', 'lastResort'] 'warn', 'warning', 'getLogRecordFactory', 'setLogRecordFactory',
'lastResort', 'raiseExceptions']
try: try:
import threading import threading

View File

@ -38,7 +38,8 @@ __all__ = ['Option',
'OptionError', 'OptionError',
'OptionConflictError', 'OptionConflictError',
'OptionValueError', 'OptionValueError',
'BadOptionError'] 'BadOptionError',
'check_choice']
__copyright__ = """ __copyright__ = """
Copyright (c) 2001-2006 Gregory P. Ward. All rights reserved. Copyright (c) 2001-2006 Gregory P. Ward. All rights reserved.

View File

@ -1084,5 +1084,11 @@ class TestUnicode(unittest.TestCase):
self.assertEqual(fileobj.read(), expected) self.assertEqual(fileobj.read(), expected)
class MiscTestCase(unittest.TestCase):
def test__all__(self):
extra = {'__doc__', '__version__'}
support.check__all__(self, csv, ('csv', '_csv'), extra=extra)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

View File

@ -6,6 +6,7 @@ from collections import OrderedDict
from enum import Enum, IntEnum, EnumMeta, unique from enum import Enum, IntEnum, EnumMeta, unique
from io import StringIO from io import StringIO
from pickle import dumps, loads, PicklingError, HIGHEST_PROTOCOL from pickle import dumps, loads, PicklingError, HIGHEST_PROTOCOL
from test import support
# for pickle tests # for pickle tests
try: try:
@ -1708,5 +1709,11 @@ class TestStdLib(unittest.TestCase):
if failed: if failed:
self.fail("result does not equal expected, see print above") self.fail("result does not equal expected, see print above")
class MiscTestCase(unittest.TestCase):
def test__all__(self):
support.check__all__(self, enum)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

View File

@ -1049,10 +1049,19 @@ class TestTimeouts(TestCase):
ftp.close() ftp.close()
class MiscTestCase(TestCase):
def test__all__(self):
blacklist = {'MSG_OOB', 'FTP_PORT', 'MAXLINE', 'CRLF', 'B_CRLF',
'Error', 'parse150', 'parse227', 'parse229', 'parse257',
'print_line', 'ftpcp', 'test'}
support.check__all__(self, ftplib, blacklist=blacklist)
def test_main(): def test_main():
tests = [TestFTPClass, TestTimeouts, tests = [TestFTPClass, TestTimeouts,
TestIPv6Environment, TestIPv6Environment,
TestTLS_FTPClassMixin, TestTLS_FTPClass] TestTLS_FTPClassMixin, TestTLS_FTPClass,
MiscTestCase]
thread_info = support.threading_setup() thread_info = support.threading_setup()
try: try:

View File

@ -4159,6 +4159,17 @@ class NTEventLogHandlerTest(BaseTest):
msg = 'Record not found in event log, went back %d records' % GO_BACK msg = 'Record not found in event log, went back %d records' % GO_BACK
self.assertTrue(found, msg=msg) self.assertTrue(found, msg=msg)
class MiscTestCase(unittest.TestCase):
def test__all__(self):
blacklist = {'logThreads', 'logMultiprocessing',
'logProcesses', 'currentframe',
'PercentStyle', 'StrFormatStyle', 'StringTemplateStyle',
'Filterer', 'PlaceHolder', 'Manager', 'RootLogger',
'root'}
support.check__all__(self, logging, blacklist=blacklist)
# Set the locale to the platform-dependent default. I have no idea # Set the locale to the platform-dependent default. I have no idea
# why the test does this, but in any case we save the current locale # why the test does this, but in any case we save the current locale
# first and restore it at the end. # first and restore it at the end.
@ -4175,7 +4186,8 @@ def test_main():
RotatingFileHandlerTest, LastResortTest, LogRecordTest, RotatingFileHandlerTest, LastResortTest, LogRecordTest,
ExceptionTest, SysLogHandlerTest, HTTPHandlerTest, ExceptionTest, SysLogHandlerTest, HTTPHandlerTest,
NTEventLogHandlerTest, TimedRotatingFileHandlerTest, NTEventLogHandlerTest, TimedRotatingFileHandlerTest,
UnixSocketHandlerTest, UnixDatagramHandlerTest, UnixSysLogHandlerTest) UnixSocketHandlerTest, UnixDatagramHandlerTest, UnixSysLogHandlerTest,
MiscTestCase)
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()

View File

@ -16,6 +16,7 @@ from io import StringIO
from test import support from test import support
import optparse
from optparse import make_option, Option, \ from optparse import make_option, Option, \
TitledHelpFormatter, OptionParser, OptionGroup, \ TitledHelpFormatter, OptionParser, OptionGroup, \
SUPPRESS_USAGE, OptionError, OptionConflictError, \ SUPPRESS_USAGE, OptionError, OptionConflictError, \
@ -1650,6 +1651,12 @@ class TestParseNumber(BaseTest):
"option -l: invalid integer value: '0x12x'") "option -l: invalid integer value: '0x12x'")
class MiscTestCase(unittest.TestCase):
def test__all__(self):
blacklist = {'check_builtin', 'AmbiguousOptionError', 'NO_DEFAULT'}
support.check__all__(self, optparse, blacklist=blacklist)
def test_main(): def test_main():
support.run_unittest(__name__) support.run_unittest(__name__)

View File

@ -4,6 +4,7 @@ import pickletools
from test import support from test import support
from test.pickletester import AbstractPickleTests from test.pickletester import AbstractPickleTests
from test.pickletester import AbstractPickleModuleTests from test.pickletester import AbstractPickleModuleTests
import unittest
class OptimizedPickleTests(AbstractPickleTests, AbstractPickleModuleTests): class OptimizedPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
@ -59,8 +60,40 @@ class OptimizedPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
self.assertNotIn(pickle.BINPUT, pickled2) self.assertNotIn(pickle.BINPUT, pickled2)
class MiscTestCase(unittest.TestCase):
def test__all__(self):
blacklist = {'bytes_types',
'UP_TO_NEWLINE', 'TAKEN_FROM_ARGUMENT1',
'TAKEN_FROM_ARGUMENT4', 'TAKEN_FROM_ARGUMENT4U',
'TAKEN_FROM_ARGUMENT8U', 'ArgumentDescriptor',
'read_uint1', 'read_uint2', 'read_int4', 'read_uint4',
'read_uint8', 'read_stringnl', 'read_stringnl_noescape',
'read_stringnl_noescape_pair', 'read_string1',
'read_string4', 'read_bytes1', 'read_bytes4',
'read_bytes8', 'read_unicodestringnl',
'read_unicodestring1', 'read_unicodestring4',
'read_unicodestring8', 'read_decimalnl_short',
'read_decimalnl_long', 'read_floatnl', 'read_float8',
'read_long1', 'read_long4',
'uint1', 'uint2', 'int4', 'uint4', 'uint8', 'stringnl',
'stringnl_noescape', 'stringnl_noescape_pair', 'string1',
'string4', 'bytes1', 'bytes4', 'bytes8',
'unicodestringnl', 'unicodestring1', 'unicodestring4',
'unicodestring8', 'decimalnl_short', 'decimalnl_long',
'floatnl', 'float8', 'long1', 'long4',
'StackObject',
'pyint', 'pylong', 'pyinteger_or_bool', 'pybool', 'pyfloat',
'pybytes_or_str', 'pystring', 'pybytes', 'pyunicode',
'pynone', 'pytuple', 'pylist', 'pydict', 'pyset',
'pyfrozenset', 'anyobject', 'markobject', 'stackslice',
'OpcodeInfo', 'opcodes', 'code2op',
}
support.check__all__(self, pickletools, blacklist=blacklist)
def test_main(): def test_main():
support.run_unittest(OptimizedPickleTests) support.run_unittest(OptimizedPickleTests)
support.run_unittest(MiscTestCase)
support.run_doctest(pickletools) support.run_doctest(pickletools)

View File

@ -18,6 +18,7 @@ import os
import subprocess import subprocess
from test import lock_tests from test import lock_tests
from test import support
# Between fork() and exec(), only async-safe functions are allowed (issues # Between fork() and exec(), only async-safe functions are allowed (issues
@ -1098,5 +1099,12 @@ class BoundedSemaphoreTests(lock_tests.BoundedSemaphoreTests):
class BarrierTests(lock_tests.BarrierTests): class BarrierTests(lock_tests.BarrierTests):
barriertype = staticmethod(threading.Barrier) barriertype = staticmethod(threading.Barrier)
class MiscTestCase(unittest.TestCase):
def test__all__(self):
extra = {"ThreadError"}
blacklist = {'currentThread', 'activeCount'}
support.check__all__(self, threading, ('threading', '_thread'),
extra=extra, blacklist=blacklist)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()

View File

@ -1,6 +1,7 @@
from test.support import TESTFN from test.support import TESTFN
import unittest import unittest
from test import audiotests from test import audiotests
from test import support
from audioop import byteswap from audioop import byteswap
import sys import sys
import wave import wave
@ -103,5 +104,11 @@ class WavePCM32Test(WaveTest, unittest.TestCase):
frames = byteswap(frames, 4) frames = byteswap(frames, 4)
class MiscTestCase(unittest.TestCase):
def test__all__(self):
blacklist = {'WAVE_FORMAT_PCM'}
support.check__all__(self, wave, blacklist=blacklist)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

View File

@ -22,9 +22,11 @@ except ImportError:
# with the multiprocessing module, which doesn't provide the old # with the multiprocessing module, which doesn't provide the old
# Java inspired names. # Java inspired names.
__all__ = ['active_count', 'Condition', 'current_thread', 'enumerate', 'Event', __all__ = ['get_ident', 'active_count', 'Condition', 'current_thread',
'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Thread', 'Barrier', 'enumerate', 'main_thread', 'TIMEOUT_MAX',
'Timer', 'ThreadError', 'setprofile', 'settrace', 'local', 'stack_size'] 'Event', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Thread',
'Barrier', 'BrokenBarrierError', 'Timer', 'ThreadError',
'setprofile', 'settrace', 'local', 'stack_size']
# Rename some stuff so "from threading import *" is safe # Rename some stuff so "from threading import *" is safe
_start_new_thread = _thread.start_new_thread _start_new_thread = _thread.start_new_thread

View File

@ -73,7 +73,7 @@ is destroyed.
import builtins import builtins
__all__ = ["open", "openfp", "Error"] __all__ = ["open", "openfp", "Error", "Wave_read", "Wave_write"]
class Error(Exception): class Error(Exception):
pass pass