Mailman 3 July 2004 - Python-checkins

python/dist/src/Objects listobject.c,2.217,2.218
by tim_one＠users.sourceforge.net 31 Jul '04

31 Jul '04

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28970/Objects Modified Files: listobject.c Log Message: list_ass_slice(): Document the obscure new intent that deleting a slice of no more than 8 elements cannot fail. listpop(): Take advantage of that its calls to list_resize() and list_ass_slice() can't fail. This is assert'ed in a debug build now, but in an icky way. That is, you can't say: assert(some_call() >= 0); because then some_call() won't occur at all in a release build. So it has to be a big pile of #ifdefs on Py_DEBUG (yuck), or the pleasant: status = some_call(); assert(status >= 0); But in that case, compilers may whine in a release build, because status appears unused then. I'm not certain the ugly trick I used here will convince all compilers to shut up about status (status is always "used" now, as the first (ignored) clause in a comma expression). Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.217 retrieving revision 2.218 diff -C2 -d -r2.217 -r2.218 *** listobject.c 31 Jul 2004 02:54:42 -0000 2.217 --- listobject.c 31 Jul 2004 21:53:19 -0000 2.218 *************** *** 520,523 **** --- 520,529 ---- } + /* a[ilow:ihigh] = v if v != NULL. + * del a[ilow:ihigh] if v == NULL. + * + * Special speed gimmick: when v is NULL and ihigh - ilow <= 8, it's + * guaranteed the call cannot fail. + */ static int list_ass_slice(PyListObject *a, int ilow, int ihigh, PyObject *v) *************** *** 824,827 **** --- 830,834 ---- int i = -1; PyObject *v, *arg = NULL; + int status; if (!PyArg_UnpackTuple(args, "pop", 0, 1, &arg)) *************** *** 846,859 **** v = self->ob_item[i]; if (i == self->ob_size - 1) { ! if (list_resize(self, self->ob_size - 1) == -1) ! return NULL; ! return v; } Py_INCREF(v); ! if (list_ass_slice(self, i, i+1, (PyObject *)NULL) != 0) { ! Py_DECREF(v); ! return NULL; ! } ! return v; } --- 853,867 ---- v = self->ob_item[i]; if (i == self->ob_size - 1) { ! status = list_resize(self, self->ob_size - 1); ! assert(status >= 0); ! return v; /* and v now owns the reference the list had */ } Py_INCREF(v); ! status = list_ass_slice(self, i, i+1, (PyObject *)NULL); ! assert(status >= 0); ! /* Use status, so that in a release build compilers don't ! * complain about the unused name. ! */ ! return status, v; }

1 0

python/dist/src/Lib/test test_optparse.py, 1.5, 1.6
by tim_one＠users.sourceforge.net 31 Jul '04

31 Jul '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25454/Lib/test Modified Files: test_optparse.py Log Message: Whitespace normalization. Index: test_optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_optparse.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_optparse.py 31 Jul 2004 21:14:28 -0000 1.5 --- test_optparse.py 31 Jul 2004 21:17:37 -0000 1.6 *************** *** 60,64 **** expected_exception, expected_output, ! get_output=None, exact_match=False): """Assert the expected exception is raised when calling a function. --- 60,64 ---- expected_exception, expected_output, ! get_output=None, exact_match=False): """Assert the expected exception is raised when calling a function. *************** *** 347,351 **** self.assertEquals(self.parser.get_option("-s").type, "string") self.assertEquals(self.parser.get_option("-t").type, "string") ! # Custom type for testing processing of default values. --- 347,351 ---- self.assertEquals(self.parser.get_option("-s").type, "string") self.assertEquals(self.parser.get_option("-t").type, "string") ! # Custom type for testing processing of default values. *************** *** 504,508 **** help=self.file_help) self.assertHelp(self.parser, self.expected_help_none) ! def test_default_none_2(self): self.parser.add_option("-f", "--file", --- 504,508 ---- help=self.file_help) self.assertHelp(self.parser, self.expected_help_none) ! def test_default_none_2(self): self.parser.add_option("-f", "--file", *************** *** 1376,1380 **** ] os.environ['COLUMNS'] = str(columns) ! return OptionParser(option_list=options) def assertHelpEquals(self, expected_output): --- 1376,1380 ---- ] os.environ['COLUMNS'] = str(columns) ! return OptionParser(option_list=options) def assertHelpEquals(self, expected_output): *************** *** 1442,1446 **** ! class TestMatchAbbrev(BaseTest): --- 1442,1446 ---- ! class TestMatchAbbrev(BaseTest):

1 0

python/dist/src/Lib/encodings hp_roman8.py, 1.1, 1.2
by tim_one＠users.sourceforge.net 31 Jul '04

31 Jul '04

Update of /cvsroot/python/python/dist/src/Lib/encodings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25454/Lib/encodings Modified Files: hp_roman8.py Log Message: Whitespace normalization. Index: hp_roman8.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/encodings/hp_roman8.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hp_roman8.py 28 Jul 2004 15:37:16 -0000 1.1 --- hp_roman8.py 31 Jul 2004 21:17:36 -0000 1.2 *************** *** 38,136 **** decoding_map = codecs.make_identity_dict(range(256)) decoding_map.update({ ! 0x00a1: 0x00c0, # LATIN CAPITAL LETTER A WITH GRAVE ! 0x00a2: 0x00c2, # LATIN CAPITAL LETTER A WITH CIRCUMFLEX ! 0x00a3: 0x00c8, # LATIN CAPITAL LETTER E WITH GRAVE ! 0x00a4: 0x00ca, # LATIN CAPITAL LETTER E WITH CIRCUMFLEX ! 0x00a5: 0x00cb, # LATIN CAPITAL LETTER E WITH DIAERESIS ! 0x00a6: 0x00ce, # LATIN CAPITAL LETTER I WITH CIRCUMFLEX ! 0x00a7: 0x00cf, # LATIN CAPITAL LETTER I WITH DIAERESIS ! 0x00a8: 0x00b4, # ACUTE ACCENT ! 0x00a9: 0x02cb, # MODIFIER LETTER GRAVE ACCENT (Mandarin Chinese fourth tone) ! 0x00aa: 0x02c6, # MODIFIER LETTER CIRCUMFLEX ACCENT ! 0x00ab: 0x00a8, # DIAERESIS ! 0x00ac: 0x02dc, # SMALL TILDE ! 0x00ad: 0x00d9, # LATIN CAPITAL LETTER U WITH GRAVE ! 0x00ae: 0x00db, # LATIN CAPITAL LETTER U WITH CIRCUMFLEX ! 0x00af: 0x20a4, # LIRA SIGN ! 0x00b0: 0x00af, # MACRON ! 0x00b1: 0x00dd, # LATIN CAPITAL LETTER Y WITH ACUTE ! 0x00b2: 0x00fd, # LATIN SMALL LETTER Y WITH ACUTE ! 0x00b3: 0x00b0, # DEGREE SIGN ! 0x00b4: 0x00c7, # LATIN CAPITAL LETTER C WITH CEDILLA ! 0x00b5: 0x00e7, # LATIN SMALL LETTER C WITH CEDILLA ! 0x00b6: 0x00d1, # LATIN CAPITAL LETTER N WITH TILDE ! 0x00b7: 0x00f1, # LATIN SMALL LETTER N WITH TILDE ! 0x00b8: 0x00a1, # INVERTED EXCLAMATION MARK ! 0x00b9: 0x00bf, # INVERTED QUESTION MARK ! 0x00ba: 0x00a4, # CURRENCY SIGN ! 0x00bb: 0x00a3, # POUND SIGN ! 0x00bc: 0x00a5, # YEN SIGN ! 0x00bd: 0x00a7, # SECTION SIGN ! 0x00be: 0x0192, # LATIN SMALL LETTER F WITH HOOK ! 0x00bf: 0x00a2, # CENT SIGN ! 0x00c0: 0x00e2, # LATIN SMALL LETTER A WITH CIRCUMFLEX ! 0x00c1: 0x00ea, # LATIN SMALL LETTER E WITH CIRCUMFLEX ! 0x00c2: 0x00f4, # LATIN SMALL LETTER O WITH CIRCUMFLEX ! 0x00c3: 0x00fb, # LATIN SMALL LETTER U WITH CIRCUMFLEX ! 0x00c4: 0x00e1, # LATIN SMALL LETTER A WITH ACUTE ! 0x00c5: 0x00e9, # LATIN SMALL LETTER E WITH ACUTE ! 0x00c6: 0x00f3, # LATIN SMALL LETTER O WITH ACUTE ! 0x00c7: 0x00fa, # LATIN SMALL LETTER U WITH ACUTE ! 0x00c8: 0x00e0, # LATIN SMALL LETTER A WITH GRAVE ! 0x00c9: 0x00e8, # LATIN SMALL LETTER E WITH GRAVE ! 0x00ca: 0x00f2, # LATIN SMALL LETTER O WITH GRAVE ! 0x00cb: 0x00f9, # LATIN SMALL LETTER U WITH GRAVE ! 0x00cc: 0x00e4, # LATIN SMALL LETTER A WITH DIAERESIS ! 0x00cd: 0x00eb, # LATIN SMALL LETTER E WITH DIAERESIS ! 0x00ce: 0x00f6, # LATIN SMALL LETTER O WITH DIAERESIS ! 0x00cf: 0x00fc, # LATIN SMALL LETTER U WITH DIAERESIS ! 0x00d0: 0x00c5, # LATIN CAPITAL LETTER A WITH RING ABOVE ! 0x00d1: 0x00ee, # LATIN SMALL LETTER I WITH CIRCUMFLEX ! 0x00d2: 0x00d8, # LATIN CAPITAL LETTER O WITH STROKE ! 0x00d3: 0x00c6, # LATIN CAPITAL LETTER AE ! 0x00d4: 0x00e5, # LATIN SMALL LETTER A WITH RING ABOVE ! 0x00d5: 0x00ed, # LATIN SMALL LETTER I WITH ACUTE ! 0x00d6: 0x00f8, # LATIN SMALL LETTER O WITH STROKE ! 0x00d7: 0x00e6, # LATIN SMALL LETTER AE ! 0x00d8: 0x00c4, # LATIN CAPITAL LETTER A WITH DIAERESIS ! 0x00d9: 0x00ec, # LATIN SMALL LETTER I WITH GRAVE ! 0x00da: 0x00d6, # LATIN CAPITAL LETTER O WITH DIAERESIS ! 0x00db: 0x00dc, # LATIN CAPITAL LETTER U WITH DIAERESIS ! 0x00dc: 0x00c9, # LATIN CAPITAL LETTER E WITH ACUTE ! 0x00dd: 0x00ef, # LATIN SMALL LETTER I WITH DIAERESIS ! 0x00de: 0x00df, # LATIN SMALL LETTER SHARP S (German) ! 0x00df: 0x00d4, # LATIN CAPITAL LETTER O WITH CIRCUMFLEX ! 0x00e0: 0x00c1, # LATIN CAPITAL LETTER A WITH ACUTE ! 0x00e1: 0x00c3, # LATIN CAPITAL LETTER A WITH TILDE ! 0x00e2: 0x00e3, # LATIN SMALL LETTER A WITH TILDE ! 0x00e3: 0x00d0, # LATIN CAPITAL LETTER ETH (Icelandic) ! 0x00e4: 0x00f0, # LATIN SMALL LETTER ETH (Icelandic) ! 0x00e5: 0x00cd, # LATIN CAPITAL LETTER I WITH ACUTE ! 0x00e6: 0x00cc, # LATIN CAPITAL LETTER I WITH GRAVE ! 0x00e7: 0x00d3, # LATIN CAPITAL LETTER O WITH ACUTE ! 0x00e8: 0x00d2, # LATIN CAPITAL LETTER O WITH GRAVE ! 0x00e9: 0x00d5, # LATIN CAPITAL LETTER O WITH TILDE ! 0x00ea: 0x00f5, # LATIN SMALL LETTER O WITH TILDE ! 0x00eb: 0x0160, # LATIN CAPITAL LETTER S WITH CARON ! 0x00ec: 0x0161, # LATIN SMALL LETTER S WITH CARON ! 0x00ed: 0x00da, # LATIN CAPITAL LETTER U WITH ACUTE ! 0x00ee: 0x0178, # LATIN CAPITAL LETTER Y WITH DIAERESIS ! 0x00ef: 0x00ff, # LATIN SMALL LETTER Y WITH DIAERESIS ! 0x00f0: 0x00de, # LATIN CAPITAL LETTER THORN (Icelandic) ! 0x00f1: 0x00fe, # LATIN SMALL LETTER THORN (Icelandic) ! 0x00f2: 0x00b7, # MIDDLE DOT ! 0x00f3: 0x00b5, # MICRO SIGN ! 0x00f4: 0x00b6, # PILCROW SIGN ! 0x00f5: 0x00be, # VULGAR FRACTION THREE QUARTERS ! 0x00f6: 0x2014, # EM DASH ! 0x00f7: 0x00bc, # VULGAR FRACTION ONE QUARTER ! 0x00f8: 0x00bd, # VULGAR FRACTION ONE HALF ! 0x00f9: 0x00aa, # FEMININE ORDINAL INDICATOR ! 0x00fa: 0x00ba, # MASCULINE ORDINAL INDICATOR ! 0x00fb: 0x00ab, # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK ! 0x00fc: 0x25a0, # BLACK SQUARE ! 0x00fd: 0x00bb, # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK ! 0x00fe: 0x00b1, # PLUS-MINUS SIGN ! 0x00ff: None, }) --- 38,136 ---- decoding_map = codecs.make_identity_dict(range(256)) decoding_map.update({ ! 0x00a1: 0x00c0, # LATIN CAPITAL LETTER A WITH GRAVE ! 0x00a2: 0x00c2, # LATIN CAPITAL LETTER A WITH CIRCUMFLEX ! 0x00a3: 0x00c8, # LATIN CAPITAL LETTER E WITH GRAVE ! 0x00a4: 0x00ca, # LATIN CAPITAL LETTER E WITH CIRCUMFLEX ! 0x00a5: 0x00cb, # LATIN CAPITAL LETTER E WITH DIAERESIS ! 0x00a6: 0x00ce, # LATIN CAPITAL LETTER I WITH CIRCUMFLEX ! 0x00a7: 0x00cf, # LATIN CAPITAL LETTER I WITH DIAERESIS ! 0x00a8: 0x00b4, # ACUTE ACCENT ! 0x00a9: 0x02cb, # MODIFIER LETTER GRAVE ACCENT (Mandarin Chinese fourth tone) ! 0x00aa: 0x02c6, # MODIFIER LETTER CIRCUMFLEX ACCENT ! 0x00ab: 0x00a8, # DIAERESIS ! 0x00ac: 0x02dc, # SMALL TILDE ! 0x00ad: 0x00d9, # LATIN CAPITAL LETTER U WITH GRAVE ! 0x00ae: 0x00db, # LATIN CAPITAL LETTER U WITH CIRCUMFLEX ! 0x00af: 0x20a4, # LIRA SIGN ! 0x00b0: 0x00af, # MACRON ! 0x00b1: 0x00dd, # LATIN CAPITAL LETTER Y WITH ACUTE ! 0x00b2: 0x00fd, # LATIN SMALL LETTER Y WITH ACUTE ! 0x00b3: 0x00b0, # DEGREE SIGN ! 0x00b4: 0x00c7, # LATIN CAPITAL LETTER C WITH CEDILLA ! 0x00b5: 0x00e7, # LATIN SMALL LETTER C WITH CEDILLA ! 0x00b6: 0x00d1, # LATIN CAPITAL LETTER N WITH TILDE ! 0x00b7: 0x00f1, # LATIN SMALL LETTER N WITH TILDE ! 0x00b8: 0x00a1, # INVERTED EXCLAMATION MARK ! 0x00b9: 0x00bf, # INVERTED QUESTION MARK ! 0x00ba: 0x00a4, # CURRENCY SIGN ! 0x00bb: 0x00a3, # POUND SIGN ! 0x00bc: 0x00a5, # YEN SIGN ! 0x00bd: 0x00a7, # SECTION SIGN ! 0x00be: 0x0192, # LATIN SMALL LETTER F WITH HOOK ! 0x00bf: 0x00a2, # CENT SIGN ! 0x00c0: 0x00e2, # LATIN SMALL LETTER A WITH CIRCUMFLEX ! 0x00c1: 0x00ea, # LATIN SMALL LETTER E WITH CIRCUMFLEX ! 0x00c2: 0x00f4, # LATIN SMALL LETTER O WITH CIRCUMFLEX ! 0x00c3: 0x00fb, # LATIN SMALL LETTER U WITH CIRCUMFLEX ! 0x00c4: 0x00e1, # LATIN SMALL LETTER A WITH ACUTE ! 0x00c5: 0x00e9, # LATIN SMALL LETTER E WITH ACUTE ! 0x00c6: 0x00f3, # LATIN SMALL LETTER O WITH ACUTE ! 0x00c7: 0x00fa, # LATIN SMALL LETTER U WITH ACUTE ! 0x00c8: 0x00e0, # LATIN SMALL LETTER A WITH GRAVE ! 0x00c9: 0x00e8, # LATIN SMALL LETTER E WITH GRAVE ! 0x00ca: 0x00f2, # LATIN SMALL LETTER O WITH GRAVE ! 0x00cb: 0x00f9, # LATIN SMALL LETTER U WITH GRAVE ! 0x00cc: 0x00e4, # LATIN SMALL LETTER A WITH DIAERESIS ! 0x00cd: 0x00eb, # LATIN SMALL LETTER E WITH DIAERESIS ! 0x00ce: 0x00f6, # LATIN SMALL LETTER O WITH DIAERESIS ! 0x00cf: 0x00fc, # LATIN SMALL LETTER U WITH DIAERESIS ! 0x00d0: 0x00c5, # LATIN CAPITAL LETTER A WITH RING ABOVE ! 0x00d1: 0x00ee, # LATIN SMALL LETTER I WITH CIRCUMFLEX ! 0x00d2: 0x00d8, # LATIN CAPITAL LETTER O WITH STROKE ! 0x00d3: 0x00c6, # LATIN CAPITAL LETTER AE ! 0x00d4: 0x00e5, # LATIN SMALL LETTER A WITH RING ABOVE ! 0x00d5: 0x00ed, # LATIN SMALL LETTER I WITH ACUTE ! 0x00d6: 0x00f8, # LATIN SMALL LETTER O WITH STROKE ! 0x00d7: 0x00e6, # LATIN SMALL LETTER AE ! 0x00d8: 0x00c4, # LATIN CAPITAL LETTER A WITH DIAERESIS ! 0x00d9: 0x00ec, # LATIN SMALL LETTER I WITH GRAVE ! 0x00da: 0x00d6, # LATIN CAPITAL LETTER O WITH DIAERESIS ! 0x00db: 0x00dc, # LATIN CAPITAL LETTER U WITH DIAERESIS ! 0x00dc: 0x00c9, # LATIN CAPITAL LETTER E WITH ACUTE ! 0x00dd: 0x00ef, # LATIN SMALL LETTER I WITH DIAERESIS ! 0x00de: 0x00df, # LATIN SMALL LETTER SHARP S (German) ! 0x00df: 0x00d4, # LATIN CAPITAL LETTER O WITH CIRCUMFLEX ! 0x00e0: 0x00c1, # LATIN CAPITAL LETTER A WITH ACUTE ! 0x00e1: 0x00c3, # LATIN CAPITAL LETTER A WITH TILDE ! 0x00e2: 0x00e3, # LATIN SMALL LETTER A WITH TILDE ! 0x00e3: 0x00d0, # LATIN CAPITAL LETTER ETH (Icelandic) ! 0x00e4: 0x00f0, # LATIN SMALL LETTER ETH (Icelandic) ! 0x00e5: 0x00cd, # LATIN CAPITAL LETTER I WITH ACUTE ! 0x00e6: 0x00cc, # LATIN CAPITAL LETTER I WITH GRAVE ! 0x00e7: 0x00d3, # LATIN CAPITAL LETTER O WITH ACUTE ! 0x00e8: 0x00d2, # LATIN CAPITAL LETTER O WITH GRAVE ! 0x00e9: 0x00d5, # LATIN CAPITAL LETTER O WITH TILDE ! 0x00ea: 0x00f5, # LATIN SMALL LETTER O WITH TILDE ! 0x00eb: 0x0160, # LATIN CAPITAL LETTER S WITH CARON ! 0x00ec: 0x0161, # LATIN SMALL LETTER S WITH CARON ! 0x00ed: 0x00da, # LATIN CAPITAL LETTER U WITH ACUTE ! 0x00ee: 0x0178, # LATIN CAPITAL LETTER Y WITH DIAERESIS ! 0x00ef: 0x00ff, # LATIN SMALL LETTER Y WITH DIAERESIS ! 0x00f0: 0x00de, # LATIN CAPITAL LETTER THORN (Icelandic) ! 0x00f1: 0x00fe, # LATIN SMALL LETTER THORN (Icelandic) ! 0x00f2: 0x00b7, # MIDDLE DOT ! 0x00f3: 0x00b5, # MICRO SIGN ! 0x00f4: 0x00b6, # PILCROW SIGN ! 0x00f5: 0x00be, # VULGAR FRACTION THREE QUARTERS ! 0x00f6: 0x2014, # EM DASH ! 0x00f7: 0x00bc, # VULGAR FRACTION ONE QUARTER ! 0x00f8: 0x00bd, # VULGAR FRACTION ONE HALF ! 0x00f9: 0x00aa, # FEMININE ORDINAL INDICATOR ! 0x00fa: 0x00ba, # MASCULINE ORDINAL INDICATOR ! 0x00fb: 0x00ab, # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK ! 0x00fc: 0x25a0, # BLACK SQUARE ! 0x00fd: 0x00bb, # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK ! 0x00fe: 0x00b1, # PLUS-MINUS SIGN ! 0x00ff: None, })

1 0

python/dist/src/Lib/test test_optparse.py, 1.4, 1.5
by tim_one＠users.sourceforge.net 31 Jul '04

31 Jul '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24750/Lib/test Modified Files: test_optparse.py Log Message: Be more careful about reverting mutuations to system-wide (sys) variables. This fixes 15 spurious test failures on Windows (probably all due to the test leaving a wrong path in sys.argv[0], which then prevented regrtest.py from finding the expected-output files for tests running after test_optparse). Index: test_optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_optparse.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test_optparse.py 31 Jul 2004 16:15:44 -0000 1.4 --- test_optparse.py 31 Jul 2004 21:14:28 -0000 1.5 *************** *** 126,142 **** def assertParseFail(self, cmdline_args, expected_output): """Assert the parser fails with the expected message.""" ! sys.stderr = StringIO() ! self.assertRaises(self.parser.parse_args, (cmdline_args,), None, ! SystemExit, expected_output, ! self.redirected_stderr) ! sys.stderr = sys.__stderr__ def assertStdoutEquals(self, cmdline_args, expected_output): """Assert the parser prints the expected output on stdout.""" ! sys.stdout = StringIO() ! self.assertRaises(self.parser.parse_args, (cmdline_args,), None, ! SystemExit, expected_output, ! self.redirected_stdout) ! sys.stdout = sys.__stdout__ def assertTypeError(self, func, expected_output, *args): --- 126,148 ---- def assertParseFail(self, cmdline_args, expected_output): """Assert the parser fails with the expected message.""" ! save_stderr = sys.stderr ! try: ! sys.stderr = StringIO() ! self.assertRaises(self.parser.parse_args, (cmdline_args,), None, ! SystemExit, expected_output, ! self.redirected_stderr) ! finally: ! sys.stderr = save_stderr def assertStdoutEquals(self, cmdline_args, expected_output): """Assert the parser prints the expected output on stdout.""" ! save_stdout = sys.stdout ! try: ! sys.stdout = StringIO() ! self.assertRaises(self.parser.parse_args, (cmdline_args,), None, ! SystemExit, expected_output, ! self.redirected_stdout) ! finally: ! sys.stdout = save_stdout def assertTypeError(self, func, expected_output, *args): *************** *** 427,440 **** def test_default_progname(self): # Make sure that program name taken from sys.argv[0] by default. ! sys.argv[0] = "/foo/bar/baz.py" ! parser = OptionParser("usage: %prog ...", version="%prog 1.2") ! expected_usage = "usage: baz.py ...\n" ! self.assertUsage(parser, expected_usage) ! self.assertVersion(parser, "baz.py 1.2") ! self.assertHelp(parser, ! expected_usage + "\n" + ! "options:\n" ! " --version show program's version number and exit\n" ! " -h, --help show this help message and exit\n") def test_custom_progname(self): --- 433,451 ---- def test_default_progname(self): # Make sure that program name taken from sys.argv[0] by default. ! save_argv = sys.argv[:] ! try: ! # XXX Should the path be hard-coding forward-slashes? ! sys.argv[0] = "/foo/bar/baz.py" ! parser = OptionParser("usage: %prog ...", version="%prog 1.2") ! expected_usage = "usage: baz.py ...\n" ! self.assertUsage(parser, expected_usage) ! self.assertVersion(parser, "baz.py 1.2") ! self.assertHelp(parser, ! expected_usage + "\n" + ! "options:\n" ! " --version show program's version number and exit\n" ! " -h, --help show this help message and exit\n") ! finally: ! sys.argv[:] = save_argv def test_custom_progname(self):

1 0

python/dist/src/Misc NEWS,1.1057,1.1058
by gward＠users.sourceforge.net 31 Jul '04

31 Jul '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14612/Misc Modified Files: NEWS Log Message: Mention upgrade of optparse to Optik 1.5a1. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1057 retrieving revision 1.1058 diff -C2 -d -r1.1057 -r1.1058 *** NEWS 27 Jul 2004 21:02:02 -0000 1.1057 --- NEWS 31 Jul 2004 16:16:11 -0000 1.1058 *************** *** 135,138 **** --- 135,169 ---- as informed by locale module's getpreferredencoding(). + - optparse module (and tests) upgraded to Optik 1.5a1. Changes: + + - Add expansion of default values in help text: the string + "%default" in an option's help string is expanded to str() of + that option's default value, or "none" if no default value. + + - Bug #955889: option default values that happen to be strings are + now processed in the same way as values from the command line; this + allows generation of nicer help when using custom types. Can + be disabled with parser.set_process_default_values(False). + + - Bug #960515: don't crash when generating help for callback + options that specify 'type', but not 'dest' or 'metavar'. + + - Feature #815264: change the default help format for short options + that take an argument from e.g. "-oARG" to "-o ARG"; add + set_short_opt_delimiter() and set_long_opt_delimiter() methods to + HelpFormatter to allow (slight) customization of the formatting. + + - Patch #736940: internationalize Optik: all built-in user- + targeted literal strings are passed through gettext.gettext(). (If + you want translations (.po files), they're not included with Python + -- you'll find them in the Optik source distribution from + http://optik.sourceforge.net/ .) + + - Bug #878453: respect $COLUMNS environment variable for + wrapping help output. + + - Feature #988122: expand "%prog" in the 'description' passed + to OptionParser, just like in the 'usage' and 'version' strings. + (This is *not* done in the 'description' passed to OptionGroup.) Tools/Demos

1 0

python/dist/src/Lib optparse.py,1.8,1.9
by gward＠users.sourceforge.net 31 Jul '04

31 Jul '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14464/Lib Modified Files: optparse.py Log Message: Upgrade optparse module and tests to Optik 1.5a1: * add expansion of default values in help text: the string "%default" in an option's help string is expanded to str() of that option's default value, or "none" if no default value. * bug #955889: option default values that happen to be strings are now processed in the same way as values from the command line; this allows generation of nicer help when using custom types. Can be disabled with parser.set_process_default_values(False). * bug #960515: don't crash when generating help for callback options that specify 'type', but not 'dest' or 'metavar'. * feature #815264: change the default help format for short options that take an argument from e.g. "-oARG" to "-o ARG"; add set_short_opt_delimiter() and set_long_opt_delimiter() methods to HelpFormatter to allow (slight) customization of the formatting. * patch #736940: internationalize Optik: all built-in user- targeted literal strings are passed through gettext.gettext(). (If you want translations (.po files), they're not included with Python -- you'll find them in the Optik source distribution from http://optik.sourceforge.net/ .) * bug #878453: respect $COLUMNS environment variable for wrapping help output. * feature #988122: expand "%prog" in the 'description' passed to OptionParser, just like in the 'usage' and 'version' strings. (This is *not* done in the 'description' passed to OptionGroup.) Index: optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/optparse.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** optparse.py 1 Apr 2004 07:40:35 -0000 1.8 --- optparse.py 31 Jul 2004 16:15:44 -0000 1.9 *************** *** 17,27 **** # it is automatically generated from the Optik source code. ! __version__ = "1.4.1+" __all__ = ['Option', 'SUPPRESS_HELP', 'SUPPRESS_USAGE', - 'STD_HELP_OPTION', - 'STD_VERSION_OPTION', 'Values', [...1652 lines suppressed...] *************** *** 1391,1398 **** return possibilities[0] elif not possibilities: ! raise BadOptionError("no such option: %s" % s) else: # More than one possible completion: ambiguous prefix. ! raise BadOptionError("ambiguous option: %s (%s?)" % (s, ", ".join(possibilities))) --- 1549,1556 ---- return possibilities[0] elif not possibilities: ! raise BadOptionError(_("no such option: %s") % s) else: # More than one possible completion: ambiguous prefix. ! raise BadOptionError(_("ambiguous option: %s (%s?)") % (s, ", ".join(possibilities)))

1 0

python/dist/src/Lib/test test_optparse.py, 1.3, 1.4
by gward＠users.sourceforge.net 31 Jul '04

31 Jul '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14464/Lib/test Modified Files: test_optparse.py Log Message: Upgrade optparse module and tests to Optik 1.5a1: * add expansion of default values in help text: the string "%default" in an option's help string is expanded to str() of that option's default value, or "none" if no default value. * bug #955889: option default values that happen to be strings are now processed in the same way as values from the command line; this allows generation of nicer help when using custom types. Can be disabled with parser.set_process_default_values(False). * bug #960515: don't crash when generating help for callback options that specify 'type', but not 'dest' or 'metavar'. * feature #815264: change the default help format for short options that take an argument from e.g. "-oARG" to "-o ARG"; add set_short_opt_delimiter() and set_long_opt_delimiter() methods to HelpFormatter to allow (slight) customization of the formatting. * patch #736940: internationalize Optik: all built-in user- targeted literal strings are passed through gettext.gettext(). (If you want translations (.po files), they're not included with Python -- you'll find them in the Optik source distribution from http://optik.sourceforge.net/ .) * bug #878453: respect $COLUMNS environment variable for wrapping help output. * feature #988122: expand "%prog" in the 'description' passed to OptionParser, just like in the 'usage' and 'version' strings. (This is *not* done in the 'description' passed to OptionGroup.) Index: test_optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_optparse.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** test_optparse.py 1 Apr 2004 07:40:35 -0000 1.3 --- test_optparse.py 31 Jul 2004 16:15:44 -0000 1.4 *************** *** 21,32 **** TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup, \ SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError, \ ! BadOptionError, OptionValueError ! from optparse import _match_abbrev ! ! # Do the right thing with boolean values for all known Python versions. ! try: ! True, False ! except NameError: ! (True, False) = (1, 0) class BaseTest(unittest.TestCase): --- 21,25 ---- TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup, \ SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError, \ ! BadOptionError, OptionValueError, _match_abbrev class BaseTest(unittest.TestCase): *************** *** 61,108 **** return (options, positional_args) ! def assertRaises(self, func, expected_exception, expected_output, ! get_output=None, ! funcargs=[], funckwargs={}): """Assert the expected exception is raised when calling a function. Also check whether the right error message is given for a given error. ! Keyword arguments: ! func -- The function to be called. ! expected_exception -- The exception that should be raised. ! expected_output -- The output we expect to see. ! get_output -- The function to call to get the output. ! funcargs -- The arguments `func` should be called with. ! funckwargs -- The keyword arguments `func` should be called with. Returns the exception raised for further testing. """ if get_output is None: get_output = self.exception try: ! out = func(*funcargs, **funckwargs) except expected_exception, err: ! output = get_output(err) ! self.failUnless(output.find(expected_output) != -1, ! """ ! Message was: ! %(output)s ! Should contain: ! %(expected_output)s ! Function called: ! %(func)s ! With args/kwargs: ! %(funcargs)s/%(funckwargs)s""" % locals()) return err else: ! self.fail(""" ! No %(expected_exception)s raised. ! Function called: ! %(func)s ! With args/kwargs: ! %(funcargs)s/%(funckwargs)s""" % locals ()) # -- Functions to be used as the get_output argument to assertRaises ------ --- 54,113 ---- return (options, positional_args) ! def assertRaises(self, ! func, ! args, ! kwargs, ! expected_exception, ! expected_output, ! get_output=None, ! exact_match=False): """Assert the expected exception is raised when calling a function. Also check whether the right error message is given for a given error. ! Arguments: ! func -- the function to call ! args -- positional arguments to `func` ! kwargs -- keyword arguments to `func` ! expected_exception -- exception that should be raised ! expected_output -- output we expect to see ! get_output -- function to call to get the output ! exact_match -- whether output must exactly match expected output, ! or merely contain it Returns the exception raised for further testing. """ + if args is None: + args = () + if kwargs is None: + kwargs = {} if get_output is None: get_output = self.exception try: ! out = func(*args, **kwargs) except expected_exception, err: ! actual_output = get_output(err) ! if exact_match: ! match = actual_output == expected_exception ! else: ! match = actual_output.find(expected_output) != -1 ! ! self.assert_(match, ! """mismatched output ! expected output: ! '''%(expected_output)s''' ! actual output: ! '''%(actual_output)s''' ! """ % locals()) return err else: ! self.fail("""expected exception %(expected_exception)s not raised ! called %(func)r ! with args %(args)r ! and kwargs %(kwargs)r ! """ % locals ()) # -- Functions to be used as the get_output argument to assertRaises ------ *************** *** 114,134 **** return sys.stdout.getvalue() # -- Assertions used in more than one class -------------------- def assertParseFail(self, cmdline_args, expected_output): """Assert the parser fails with the expected message.""" ! self.assertRaises(self.parser.parse_args, SystemExit, expected_output, ! funcargs=[cmdline_args]) def assertStdoutEquals(self, cmdline_args, expected_output): """Assert the parser prints the expected output on stdout.""" sys.stdout = StringIO() ! self.assertRaises(self.parser.parse_args, SystemExit, expected_output, ! self.redirected_stdout, [cmdline_args]) sys.stdout = sys.__stdout__ def assertTypeError(self, func, expected_output, *args): """Assert a TypeError is raised when executing func.""" ! self.assertRaises(func, TypeError, expected_output, funcargs=args) # -- Test make_option() aka Option ------------------------------------- --- 119,154 ---- return sys.stdout.getvalue() + def redirected_stderr(self, err): + return sys.stderr.getvalue() + # -- Assertions used in more than one class -------------------- def assertParseFail(self, cmdline_args, expected_output): """Assert the parser fails with the expected message.""" ! sys.stderr = StringIO() ! self.assertRaises(self.parser.parse_args, (cmdline_args,), None, ! SystemExit, expected_output, ! self.redirected_stderr) ! sys.stderr = sys.__stderr__ def assertStdoutEquals(self, cmdline_args, expected_output): """Assert the parser prints the expected output on stdout.""" sys.stdout = StringIO() ! self.assertRaises(self.parser.parse_args, (cmdline_args,), None, ! SystemExit, expected_output, ! self.redirected_stdout) sys.stdout = sys.__stdout__ def assertTypeError(self, func, expected_output, *args): """Assert a TypeError is raised when executing func.""" ! self.assertRaises(func, args, None, TypeError, expected_output) ! ! def assertHelp(self, parser, expected_help): ! actual_help = parser.format_help() ! if actual_help != expected_help: ! raise self.failureException( ! 'help text failure; expected:\n"' + ! expected_help + '"; got:\n"' + ! actual_help + '"\n') # -- Test make_option() aka Option ------------------------------------- *************** *** 143,148 **** def assertOptionError(self, expected_output, args=[], kwargs={}): ! self.assertRaises(make_option, OptionError, expected_output, ! funcargs=args, funckwargs=kwargs) def test_opt_string_empty(self): --- 163,168 ---- def assertOptionError(self, expected_output, args=[], kwargs={}): ! self.assertRaises(make_option, args, kwargs, ! OptionError, expected_output) def test_opt_string_empty(self): *************** *** 176,179 **** --- 196,201 ---- self.assertOptionError("invalid option type: 'foo'", ["-b"], {'type': 'foo'}) + self.assertOptionError("invalid option type: 'tuple'", + ["-b"], {'type': tuple}) def test_no_type_for_action(self): *************** *** 305,310 **** def test_remove_nonexistent(self): ! self.assertRaises(self.parser.remove_option, ValueError, ! "no such option 'foo'", funcargs=['foo']) # -- Test parser.parse_args() ------------------------------------------ --- 327,528 ---- def test_remove_nonexistent(self): ! self.assertRaises(self.parser.remove_option, ('foo',), None, ! ValueError, "no such option 'foo'") ! ! class TestTypeAliases(BaseTest): ! def setUp(self): ! self.parser = OptionParser() ! ! def test_type_aliases(self): ! self.parser.add_option("-x", type=int) ! self.parser.add_option("-s", type=str) ! self.parser.add_option("-t", type="str") ! self.assertEquals(self.parser.get_option("-x").type, "int") ! self.assertEquals(self.parser.get_option("-s").type, "string") ! self.assertEquals(self.parser.get_option("-t").type, "string") ! ! ! # Custom type for testing processing of default values. ! _time_units = { 's' : 1, 'm' : 60, 'h' : 60*60, 'd' : 60*60*24 } ! ! def _check_duration(option, opt, value): ! try: ! if value[-1].isdigit(): ! return int(value) ! else: ! return int(value[:-1]) * _time_units[value[-1]] ! except ValueError, IndexError: ! raise OptionValueError( ! 'option %s: invalid duration: %r' % (opt, value)) ! ! class DurationOption(Option): ! TYPES = Option.TYPES + ('duration',) ! TYPE_CHECKER = copy.copy(Option.TYPE_CHECKER) ! TYPE_CHECKER['duration'] = _check_duration ! ! class TestDefaultValues(BaseTest): ! def setUp(self): ! self.parser = OptionParser() ! self.parser.add_option("-v", "--verbose", default=True) ! self.parser.add_option("-q", "--quiet", dest='verbose') ! self.parser.add_option("-n", type="int", default=37) ! self.parser.add_option("-m", type="int") ! self.parser.add_option("-s", default="foo") ! self.parser.add_option("-t") ! self.parser.add_option("-u", default=None) ! self.expected = { 'verbose': True, ! 'n': 37, ! 'm': None, ! 's': "foo", ! 't': None, ! 'u': None } ! ! def test_basic_defaults(self): ! self.assertEqual(self.parser.get_default_values(), self.expected) ! ! def test_mixed_defaults_post(self): ! self.parser.set_defaults(n=42, m=-100) ! self.expected.update({'n': 42, 'm': -100}) ! self.assertEqual(self.parser.get_default_values(), self.expected) ! ! def test_mixed_defaults_pre(self): ! self.parser.set_defaults(x="barf", y="blah") ! self.parser.add_option("-x", default="frob") ! self.parser.add_option("-y") ! ! self.expected.update({'x': "frob", 'y': "blah"}) ! self.assertEqual(self.parser.get_default_values(), self.expected) ! ! self.parser.remove_option("-y") ! self.parser.add_option("-y", default=None) ! self.expected.update({'y': None}) ! self.assertEqual(self.parser.get_default_values(), self.expected) ! ! def test_process_default(self): ! self.parser.option_class = DurationOption ! self.parser.add_option("-d", type="duration", default=300) ! self.parser.add_option("-e", type="duration", default="6m") ! self.parser.set_defaults(n="42") ! self.expected.update({'d': 300, 'e': 360, 'n': 42}) ! self.assertEqual(self.parser.get_default_values(), self.expected) ! ! self.parser.set_process_default_values(False) ! self.expected.update({'d': 300, 'e': "6m", 'n': "42"}) ! self.assertEqual(self.parser.get_default_values(), self.expected) ! ! ! class TestProgName(BaseTest): ! """ ! Test that %prog expands to the right thing in usage, version, ! and help strings. ! """ ! ! def assertUsage(self, parser, expected_usage): ! self.assertEqual(parser.get_usage(), expected_usage) ! ! def assertVersion(self, parser, expected_version): ! self.assertEqual(parser.get_version(), expected_version) ! ! ! def test_default_progname(self): ! # Make sure that program name taken from sys.argv[0] by default. ! sys.argv[0] = "/foo/bar/baz.py" ! parser = OptionParser("usage: %prog ...", version="%prog 1.2") ! expected_usage = "usage: baz.py ...\n" ! self.assertUsage(parser, expected_usage) ! self.assertVersion(parser, "baz.py 1.2") ! self.assertHelp(parser, ! expected_usage + "\n" + ! "options:\n" ! " --version show program's version number and exit\n" ! " -h, --help show this help message and exit\n") ! ! def test_custom_progname(self): ! parser = OptionParser(prog="thingy", ! version="%prog 0.1", ! usage="%prog arg arg") ! parser.remove_option("-h") ! parser.remove_option("--version") ! expected_usage = "usage: thingy arg arg\n" ! self.assertUsage(parser, expected_usage) ! self.assertVersion(parser, "thingy 0.1") ! self.assertHelp(parser, expected_usage + "\n") ! ! ! class TestExpandDefaults(BaseTest): ! def setUp(self): ! self.parser = OptionParser(prog="test") ! self.help_prefix = """\ ! usage: test [options] ! ! options: ! -h, --help show this help message and exit ! """ ! self.file_help = "read from FILE [default: %default]" ! self.expected_help_file = self.help_prefix + \ ! " -f FILE, --file=FILE read from FILE [default: foo.txt]\n" ! self.expected_help_none = self.help_prefix + \ ! " -f FILE, --file=FILE read from FILE [default: none]\n" ! ! def test_option_default(self): ! self.parser.add_option("-f", "--file", ! default="foo.txt", ! help=self.file_help) ! self.assertHelp(self.parser, self.expected_help_file) ! ! def test_parser_default_1(self): ! self.parser.add_option("-f", "--file", ! help=self.file_help) ! self.parser.set_default('file', "foo.txt") ! self.assertHelp(self.parser, self.expected_help_file) ! ! def test_parser_default_2(self): ! self.parser.add_option("-f", "--file", ! help=self.file_help) ! self.parser.set_defaults(file="foo.txt") ! self.assertHelp(self.parser, self.expected_help_file) ! ! def test_no_default(self): ! self.parser.add_option("-f", "--file", ! help=self.file_help) ! self.assertHelp(self.parser, self.expected_help_none) ! ! def test_default_none_1(self): ! self.parser.add_option("-f", "--file", ! default=None, ! help=self.file_help) ! self.assertHelp(self.parser, self.expected_help_none) ! ! def test_default_none_2(self): ! self.parser.add_option("-f", "--file", ! help=self.file_help) ! self.parser.set_defaults(file=None) ! self.assertHelp(self.parser, self.expected_help_none) ! ! def test_float_default(self): ! self.parser.add_option( ! "-p", "--prob", ! help="blow up with probability PROB [default: %default]") ! self.parser.set_defaults(prob=0.43) ! expected_help = self.help_prefix + \ ! " -p PROB, --prob=PROB blow up with probability PROB [default: 0.43]\n" ! self.assertHelp(self.parser, expected_help) ! ! def test_alt_expand(self): ! self.parser.add_option("-f", "--file", ! default="foo.txt", ! help="read from FILE [default: *DEFAULT*]") ! self.parser.formatter.default_tag = "*DEFAULT*" ! self.assertHelp(self.parser, self.expected_help_file) ! ! def test_no_expand(self): ! self.parser.add_option("-f", "--file", ! default="foo.txt", ! help="read from %default file") ! self.parser.formatter.default_tag = None ! expected_help = self.help_prefix + \ ! " -f FILE, --file=FILE read from %default file\n" ! self.assertHelp(self.parser, expected_help) ! # -- Test parser.parse_args() ------------------------------------------ *************** *** 319,323 **** def test_required_value(self): ! self.assertParseFail(["-a"], "-a option requires a value") def test_invalid_integer(self): --- 537,541 ---- def test_required_value(self): ! self.assertParseFail(["-a"], "-a option requires an argument") def test_invalid_integer(self): *************** *** 581,585 **** def test_nargs_required_values(self): self.assertParseFail(["--point", "1.0", "3.5"], ! "--point option requires 3 values") class TestNArgsAppend(BaseTest): --- 799,803 ---- def test_nargs_required_values(self): self.assertParseFail(["--point", "1.0", "3.5"], ! "--point option requires 3 arguments") class TestNArgsAppend(BaseTest): *************** *** 598,602 **** def test_nargs_append_required_values(self): self.assertParseFail(["-f4,3"], ! "-f option requires 2 values") def test_nargs_append_simple(self): --- 816,820 ---- def test_nargs_append_required_values(self): self.assertParseFail(["-f4,3"], ! "-f option requires 2 arguments") def test_nargs_append_simple(self): *************** *** 613,632 **** sys.argv[0] = oldargv - def test_version_with_prog_keyword(self): - oldargv = sys.argv[0] - sys.argv[0] = "./foo/bar" - self.parser = OptionParser(usage=SUPPRESS_USAGE, version="%prog 0.1", - prog="splat") - self.assertStdoutEquals(["--version"], "splat 0.1\n") - sys.argv[0] = oldargv - - def test_version_with_prog_attribute(self): - oldargv = sys.argv[0] - sys.argv[0] = "./foo/bar" - self.parser = OptionParser(usage=SUPPRESS_USAGE, version="%prog 0.1") - self.parser.prog = "splat" - self.assertStdoutEquals(["--version"], "splat 0.1\n") - sys.argv[0] = oldargv - def test_no_version(self): self.parser = OptionParser(usage=SUPPRESS_USAGE) --- 831,834 ---- *************** *** 674,679 **** group = OptionGroup(self.parser, "Spam") group.parser = OptionParser() ! self.assertRaises(self.parser.add_option_group, ValueError, ! "invalid OptionGroup (wrong parser)", funcargs=[group]) def test_group_manipulate(self): --- 876,881 ---- group = OptionGroup(self.parser, "Spam") group.parser = OptionParser() ! self.assertRaises(self.parser.add_option_group, (group,), None, ! ValueError, "invalid OptionGroup (wrong parser)") def test_group_manipulate(self): *************** *** 795,799 **** []) ! class TestCallBackExtraArgs(BaseTest): def setUp(self): options = [make_option("-p", "--point", action="callback", --- 997,1016 ---- []) ! def test_callback_help(self): ! # This test was prompted by SF bug #960515 -- the point is ! # not to inspect the help text, just to make sure that ! # format_help() doesn't crash. ! parser = OptionParser(usage=SUPPRESS_USAGE) ! parser.remove_option("-h") ! parser.add_option("-t", "--test", action="callback", ! callback=lambda: None, type="string", ! help="foo") ! ! expected_help = ("options:\n" ! " -t TEST, --test=TEST foo\n") ! self.assertHelp(parser, expected_help) ! ! ! class TestCallbackExtraArgs(BaseTest): def setUp(self): options = [make_option("-p", "--point", action="callback", *************** *** 820,824 **** []) ! class TestCallBackMeddleArgs(BaseTest): def setUp(self): options = [make_option(str(x), action="callback", --- 1037,1041 ---- []) ! class TestCallbackMeddleArgs(BaseTest): def setUp(self): options = [make_option(str(x), action="callback", *************** *** 849,853 **** [2]) ! class TestCallBackManyArgs(BaseTest): def setUp(self): options = [make_option("-a", "--apple", action="callback", nargs=2, --- 1066,1070 ---- [2]) ! class TestCallbackManyArgs(BaseTest): def setUp(self): options = [make_option("-a", "--apple", action="callback", nargs=2, *************** *** 871,878 **** "-b", "1", "2", "3", "--bob", "-666", "42", "0"], ! {}, []) ! class TestCallBackCheckAbbrev(BaseTest): def setUp(self): self.parser = OptionParser() --- 1088,1095 ---- "-b", "1", "2", "3", "--bob", "-666", "42", "0"], ! {"apple": None, "bob": None}, []) ! class TestCallbackCheckAbbrev(BaseTest): def setUp(self): self.parser = OptionParser() *************** *** 886,890 **** self.assertParseOK(["--foo"], {}, []) ! class TestCallBackVarArgs(BaseTest): def setUp(self): options = [make_option("-a", type="int", nargs=2, dest="a"), --- 1103,1107 ---- self.assertParseOK(["--foo"], {}, []) ! class TestCallbackVarArgs(BaseTest): def setUp(self): options = [make_option("-a", type="int", nargs=2, dest="a"), *************** *** 951,961 **** """Use the default conflict resolution for Optik 1.2: error.""" def assert_conflict_error(self, func): ! err = self.assertRaises(func, OptionConflictError, ! "option -v/--version: conflicting option " ! "string(s): -v", ! funcargs=["-v", "--version"], ! funckwargs={'action':"callback", ! 'callback':self.show_version, ! 'help':"show version"}) self.assertEqual(err.msg, "conflicting option string(s): -v") --- 1168,1177 ---- """Use the default conflict resolution for Optik 1.2: error.""" def assert_conflict_error(self, func): ! err = self.assertRaises( ! func, ("-v", "--version"), {'action' : "callback", ! 'callback' : self.show_version, ! 'help' : "show version"}, ! OptionConflictError, ! "option -v/--version: conflicting option string(s): -v") self.assertEqual(err.msg, "conflicting option string(s): -v") *************** *** 970,976 **** def test_no_such_conflict_handler(self): ! self.assertRaises(self.parser.set_conflict_handler, ValueError, ! "invalid conflict_resolution value 'foo'", ! funcargs=['foo']) --- 1186,1192 ---- def test_no_such_conflict_handler(self): ! self.assertRaises( ! self.parser.set_conflict_handler, ('foo',), None, ! ValueError, "invalid conflict_resolution value 'foo'") *************** *** 1083,1088 **** --- 1299,1356 ---- # -- Other testing. ---------------------------------------------------- + _expected_help_basic = """\ + usage: bar.py [options] + + options: + -a APPLE throw APPLEs at basket + -b NUM, --boo=NUM shout "boo!" NUM times (in order to frighten away all the + evil spirits that cause trouble and mayhem) + --foo=FOO store FOO in the foo list for later fooing + -h, --help show this help message and exit + """ + + _expected_help_long_opts_first = """\ + usage: bar.py [options] + + options: + -a APPLE throw APPLEs at basket + --boo=NUM, -b NUM shout "boo!" NUM times (in order to frighten away all the + evil spirits that cause trouble and mayhem) + --foo=FOO store FOO in the foo list for later fooing + --help, -h show this help message and exit + """ + + _expected_help_title_formatter = """\ + Usage + ===== + bar.py [options] + + options + ======= + -a APPLE throw APPLEs at basket + --boo=NUM, -b NUM shout "boo!" NUM times (in order to frighten away all the + evil spirits that cause trouble and mayhem) + --foo=FOO store FOO in the foo list for later fooing + --help, -h show this help message and exit + """ + + _expected_help_short_lines = """\ + usage: bar.py [options] + + options: + -a APPLE throw APPLEs at basket + -b NUM, --boo=NUM shout "boo!" NUM times (in order to + frighten away all the evil spirits + that cause trouble and mayhem) + --foo=FOO store FOO in the foo list for later + fooing + -h, --help show this help message and exit + """ + class TestHelp(BaseTest): def setUp(self): + self.parser = self.make_parser(80) + + def make_parser(self, columns): options = [ make_option("-a", type="string", dest='a', *************** *** 1096,1102 **** help="store FOO in the foo list for later fooing"), ] ! ! usage = "%prog [options]" ! self.parser = OptionParser(usage=usage, option_list=options) def assertHelpEquals(self, expected_output): --- 1364,1369 ---- help="store FOO in the foo list for later fooing"), ] ! os.environ['COLUMNS'] = str(columns) ! return OptionParser(option_list=options) def assertHelpEquals(self, expected_output): *************** *** 1110,1169 **** def test_help(self): ! self.assertHelpEquals("""\ ! usage: bar.py [options] ! ! options: ! -aAPPLE throw APPLEs at basket ! -bNUM, --boo=NUM shout "boo!" NUM times (in order to frighten away all ! the evil spirits that cause trouble and mayhem) ! --foo=FOO store FOO in the foo list for later fooing ! -h, --help show this help message and exit ! """) def test_help_old_usage(self): self.parser.set_usage("usage: %prog [options]") ! self.assertHelpEquals("""\ ! usage: bar.py [options] ! ! options: ! -aAPPLE throw APPLEs at basket ! -bNUM, --boo=NUM shout "boo!" NUM times (in order to frighten away all ! the evil spirits that cause trouble and mayhem) ! --foo=FOO store FOO in the foo list for later fooing ! -h, --help show this help message and exit ! """) def test_help_long_opts_first(self): self.parser.formatter.short_first = 0 ! self.assertHelpEquals("""\ ! usage: bar.py [options] ! ! options: ! -aAPPLE throw APPLEs at basket ! --boo=NUM, -bNUM shout "boo!" NUM times (in order to frighten away all ! the evil spirits that cause trouble and mayhem) ! --foo=FOO store FOO in the foo list for later fooing ! --help, -h show this help message and exit ! """) def test_help_title_formatter(self): self.parser.formatter = TitledHelpFormatter() ! self.assertHelpEquals("""\ ! Usage ! ===== ! bar.py [options] ! options ! ======= ! -aAPPLE throw APPLEs at basket ! --boo=NUM, -bNUM shout "boo!" NUM times (in order to frighten away all ! the evil spirits that cause trouble and mayhem) ! --foo=FOO store FOO in the foo list for later fooing ! --help, -h show this help message and exit ! """) def test_help_description_groups(self): self.parser.set_description( ! "This is the program description. This program has " "an option group as well as single options.") --- 1377,1404 ---- def test_help(self): ! self.assertHelpEquals(_expected_help_basic) def test_help_old_usage(self): self.parser.set_usage("usage: %prog [options]") ! self.assertHelpEquals(_expected_help_basic) def test_help_long_opts_first(self): self.parser.formatter.short_first = 0 ! self.assertHelpEquals(_expected_help_long_opts_first) def test_help_title_formatter(self): self.parser.formatter = TitledHelpFormatter() ! self.assertHelpEquals(_expected_help_title_formatter) ! def test_wrap_columns(self): ! # Ensure that wrapping respects $COLUMNS environment variable. ! # Need to reconstruct the parser, since that's the only time ! # we look at $COLUMNS. ! self.parser = self.make_parser(60) ! self.assertHelpEquals(_expected_help_short_lines) def test_help_description_groups(self): self.parser.set_description( ! "This is the program description for %prog. %prog has " "an option group as well as single options.") *************** *** 1178,1196 **** usage: bar.py [options] ! This is the program description. This program has an option group as well as ! single options. options: ! -aAPPLE throw APPLEs at basket ! -bNUM, --boo=NUM shout "boo!" NUM times (in order to frighten away all ! the evil spirits that cause trouble and mayhem) ! --foo=FOO store FOO in the foo list for later fooing ! -h, --help show this help message and exit Dangerous Options: ! Caution: use of these options is at your own risk. It is believed that ! some of them bite. ! -g Group option. """) class TestMatchAbbrev(BaseTest): def test_match_abbrev(self): --- 1413,1436 ---- usage: bar.py [options] ! This is the program description for bar.py. bar.py has an option group as ! well as single options. ! options: ! -a APPLE throw APPLEs at basket ! -b NUM, --boo=NUM shout "boo!" NUM times (in order to frighten away all the ! evil spirits that cause trouble and mayhem) ! --foo=FOO store FOO in the foo list for later fooing ! -h, --help show this help message and exit Dangerous Options: ! Caution: use of these options is at your own risk. It is believed ! that some of them bite. ! ! -g Group option. """) + + + class TestMatchAbbrev(BaseTest): def test_match_abbrev(self): *************** *** 1206,1218 **** wordmap = {"--foz": None, "--foo": None, "--fie": None} possibilities = ", ".join(wordmap.keys()) ! self.assertRaises(_match_abbrev, BadOptionError, ! "ambiguous option: --f (%s?)" % possibilities, ! funcargs=[s, wordmap]) ! def test_main(): mod = sys.modules[__name__] ! test_support.run_unittest( ! *[getattr(mod, name) for name in dir(mod) if name.startswith('Test')] ! ) if __name__ == '__main__': --- 1446,1466 ---- wordmap = {"--foz": None, "--foo": None, "--fie": None} possibilities = ", ".join(wordmap.keys()) ! self.assertRaises( ! _match_abbrev, (s, wordmap), None, ! BadOptionError, "ambiguous option: --f (%s?)" % possibilities) ! ! def _testclasses(): mod = sys.modules[__name__] ! return [getattr(mod, name) for name in dir(mod) if name.startswith('Test')] ! ! def suite(): ! suite = unittest.TestSuite() ! for testclass in _testclasses(): ! suite.addTest(unittest.makeSuite(testclass)) ! return suite ! ! def test_main(): ! test_support.run_suite(suite()) if __name__ == '__main__':

1 0

be yo`ung again
by renaldo bogle 30 Jul '04

30 Jul '04

bemisaal'bdeswilldagutsys terpree~ u`'s^a dr--u.,gs & n,e`_xtday sh^^ipp^~ing~ _ euc-jmakati http://kcr.hjk.sarcoma9511pi11.us/f74/ The letters 'G' and 'W' -----Original Message----- From: Delana Ellis [mailto:mw@aotd.com] To: jerald bergen; raymon youngblut; marshall maki Sent: Monday, February, 2004 9:56 PM Subject: be yo'ung again madhatter,sgijpeg~ We'll try it, anyway, said the Wizard Good-by! Good-by! repeated Rob, and in a gorgeous flash of color the Demon disappeared, leaving the boy alone in the room with his new and wonderful possessions how many times must a man look up aburrado10antelucana52aca\averear,ara`cnido desde\osa.

1 0

python/dist/src/Objects listobject.c,2.216,2.217
by tim_one＠users.sourceforge.net 30 Jul '04

30 Jul '04

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11098/Objects Modified Files: listobject.c Log Message: list_ass_slice(): The difference between "recycle" and "recycled" was impossible to remember, so renamed one to something obvious. Headed off potential signed-vs-unsigned compiler complaints I introduced by changing the type of a vrbl to unsigned. Removed the need for the tedious explanation about "backward pointer loops" by looping on an int instead. Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.216 retrieving revision 2.217 diff -C2 -d -r2.216 -r2.217 *** listobject.c 31 Jul 2004 02:24:20 -0000 2.216 --- listobject.c 31 Jul 2004 02:54:42 -0000 2.217 *************** *** 529,534 **** we temporarily copy the items that are deleted from the list. :-( */ ! PyObject *recycled[8]; ! PyObject **recycle = recycled; /* will allocate more if needed */ PyObject **item; PyObject **vitem = NULL; --- 529,534 ---- we temporarily copy the items that are deleted from the list. :-( */ ! PyObject *recycle_on_stack[8]; ! PyObject **recycle = recycle_on_stack; /* will allocate more if needed */ PyObject **item; PyObject **vitem = NULL; *************** *** 537,541 **** int norig; /* # of elements in list getting replaced */ int d; /* Change in size */ ! int k; /* Loop index */ size_t s; int result = -1; /* guilty until proved innocent */ --- 537,541 ---- int norig; /* # of elements in list getting replaced */ int d; /* Change in size */ ! int k; size_t s; int result = -1; /* guilty until proved innocent */ *************** *** 579,583 **** /* recycle the items that we are about to remove */ s = norig * sizeof(PyObject *); ! if (s > sizeof(recycled)) { recycle = (PyObject **)PyMem_MALLOC(s); if (recycle == NULL) { --- 579,583 ---- /* recycle the items that we are about to remove */ s = norig * sizeof(PyObject *); ! if (s > sizeof(recycle_on_stack)) { recycle = (PyObject **)PyMem_MALLOC(s); if (recycle == NULL) { *************** *** 595,604 **** } else if (d > 0) { /* Insert d items */ ! s = a->ob_size; ! if (list_resize(a, s+d) < 0) goto Error; item = a->ob_item; memmove(&item[ihigh+d], &item[ihigh], ! (s - ihigh)*sizeof(PyObject *)); } for (k = 0; k < n; k++, ilow++) { --- 595,604 ---- } else if (d > 0) { /* Insert d items */ ! k = a->ob_size; ! if (list_resize(a, k+d) < 0) goto Error; item = a->ob_item; memmove(&item[ihigh+d], &item[ihigh], ! (k - ihigh)*sizeof(PyObject *)); } for (k = 0; k < n; k++, ilow++) { *************** *** 607,622 **** item[ilow] = w; } ! /* Convoluted: there's some obscure reason for wanting to do ! * the decrefs "backwards", but C doesn't guarantee you can compute ! * a pointer to one slot *before* an allocated vector. So checking ! * for item >= recycle is incorrect. ! */ ! for (item = recycle + norig; item > recycle; ) { ! --item; ! Py_XDECREF(*item); ! } result = 0; Error: ! if (recycle != recycled) PyMem_FREE(recycle); Py_XDECREF(v_as_SF); --- 607,615 ---- item[ilow] = w; } ! for (k = norig - 1; k >= 0; --k) ! Py_XDECREF(recycle[k]); result = 0; Error: ! if (recycle != recycle_on_stack) PyMem_FREE(recycle); Py_XDECREF(v_as_SF);

1 0

python/dist/src/Objects listobject.c,2.215,2.216
by tim_one＠users.sourceforge.net 30 Jul '04

30 Jul '04

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7074/Objects Modified Files: listobject.c Log Message: Armin asked for a list_ass_slice review in his checkin, so here's the result. list_resize(): Document the intent. Code is increasingly relying on subtle aspects of its behavior, and they deserve to be spelled out. list_ass_slice(): A bit more simplification, by giving it a common error exit and initializing more values. Be clearer in comments about what "size" means (# of elements? # of bytes?). While the number of elements in a list slice must fit in an int, there's no guarantee that the number of bytes occupied by the slice will. That malloc() and memmove() take size_t arguments is a hint about that <wink>. So changed to use size_t where appropriate. ihigh - ilow should always be >= 0, but we never asserted that. We do now. The loop decref'ing the recycled slice had a subtle insecurity: C doesn't guarantee that a pointer one slot *before* an array will compare "less than" to a pointer within the array (it does guarantee that a pointer one beyond the end of the array compares as expected). This was actually an issue in KSR's C implementation, so isn't purely theoretical. Python probably has other "go backwards" loops with a similar glitch. list_clear() is OK (it marches an integer backwards, not a pointer). Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.215 retrieving revision 2.216 diff -C2 -d -r2.215 -r2.216 *** listobject.c 30 Jul 2004 11:38:22 -0000 2.215 --- listobject.c 31 Jul 2004 02:24:20 -0000 2.216 *************** *** 9,12 **** --- 9,25 ---- #endif + /* Ensure ob_item has room for at least newsize elements, and set + * ob_size to newsize. If newsize > ob_size on entry, the content + * of the new slots at exit is undefined heap trash; it's the caller's + * responsiblity to overwrite them with sane values. + * The number of allocated elements may grow, shrink, or stay the same. + * Failure is impossible if newsize <= self.allocated on entry, although + * that partly relies on an assumption that the system realloc() never + * fails when passed a number of bytes <= the number of bytes last + * allocated (the C standard doesn't guarantee this, but it's hard to + * imagine a realloc implementation where it wouldn't be true). + * Note that self->ob_item may change, and even if newsize is less + * than ob_size on entry. + */ static int list_resize(PyListObject *self, int newsize) *************** *** 19,23 **** current size, then proceed with the realloc() to shrink the list. */ - if (self->allocated >= newsize && self->ob_size < newsize + 16) { assert(self->ob_item != NULL || newsize == 0); --- 32,35 ---- *************** *** 517,529 **** we temporarily copy the items that are deleted from the list. :-( */ - PyObject **recycle, **p; PyObject *recycled[8]; PyObject **item; PyObject **vitem = NULL; PyObject *v_as_SF = NULL; /* PySequence_Fast(v) */ ! int n; /* Size of replacement list */ int d; /* Change in size */ int k; /* Loop index */ ! int s; #define b ((PyListObject *)v) if (v == NULL) --- 529,543 ---- we temporarily copy the items that are deleted from the list. :-( */ PyObject *recycled[8]; + PyObject **recycle = recycled; /* will allocate more if needed */ PyObject **item; PyObject **vitem = NULL; PyObject *v_as_SF = NULL; /* PySequence_Fast(v) */ ! int n; /* # of elements in replacement list */ ! int norig; /* # of elements in list getting replaced */ int d; /* Change in size */ int k; /* Loop index */ ! size_t s; ! int result = -1; /* guilty until proved innocent */ #define b ((PyListObject *)v) if (v == NULL) *************** *** 532,546 **** if (a == b) { /* Special case "a[i:j] = a" -- copy b first */ - int ret; v = list_slice(b, 0, b->ob_size); if (v == NULL) ! return -1; ! ret = list_ass_slice(a, ilow, ihigh, v); Py_DECREF(v); ! return ret; } v_as_SF = PySequence_Fast(v, "can only assign an iterable"); if(v_as_SF == NULL) ! return -1; n = PySequence_Fast_GET_SIZE(v_as_SF); vitem = PySequence_Fast_ITEMS(v_as_SF); --- 546,559 ---- if (a == b) { /* Special case "a[i:j] = a" -- copy b first */ v = list_slice(b, 0, b->ob_size); if (v == NULL) ! return result; ! result = list_ass_slice(a, ilow, ihigh, v); Py_DECREF(v); ! return result; } v_as_SF = PySequence_Fast(v, "can only assign an iterable"); if(v_as_SF == NULL) ! goto Error; n = PySequence_Fast_GET_SIZE(v_as_SF); vitem = PySequence_Fast_ITEMS(v_as_SF); *************** *** 550,553 **** --- 563,567 ---- else if (ilow > a->ob_size) ilow = a->ob_size; + if (ihigh < ilow) ihigh = ilow; *************** *** 555,559 **** ihigh = a->ob_size; ! d = n - (ihigh-ilow); if (a->ob_size + d == 0) { Py_XDECREF(v_as_SF); --- 569,575 ---- ihigh = a->ob_size; ! norig = ihigh - ilow; ! assert(norig >= 0); ! d = n - norig; if (a->ob_size + d == 0) { Py_XDECREF(v_as_SF); *************** *** 561,578 **** } item = a->ob_item; ! /* recycle the ihigh-ilow items that we are about to remove */ ! s = (ihigh - ilow)*sizeof(PyObject *); if (s > sizeof(recycled)) { recycle = (PyObject **)PyMem_MALLOC(s); if (recycle == NULL) { PyErr_NoMemory(); ! Py_XDECREF(v_as_SF); ! return -1; } } - else - recycle = recycled; - p = recycle + (ihigh - ilow); memcpy(recycle, &item[ilow], s); if (d < 0) { /* Delete -d items */ memmove(&item[ihigh+d], &item[ihigh], --- 577,591 ---- } item = a->ob_item; ! /* recycle the items that we are about to remove */ ! s = norig * sizeof(PyObject *); if (s > sizeof(recycled)) { recycle = (PyObject **)PyMem_MALLOC(s); if (recycle == NULL) { PyErr_NoMemory(); ! goto Error; } } memcpy(recycle, &item[ilow], s); + if (d < 0) { /* Delete -d items */ memmove(&item[ihigh+d], &item[ihigh], *************** *** 583,592 **** else if (d > 0) { /* Insert d items */ s = a->ob_size; ! if (list_resize(a, s+d) == -1) { ! if (recycle != recycled) ! PyMem_FREE(recycle); ! Py_XDECREF(v_as_SF); ! return -1; ! } item = a->ob_item; memmove(&item[ihigh+d], &item[ihigh], --- 596,601 ---- else if (d > 0) { /* Insert d items */ s = a->ob_size; ! if (list_resize(a, s+d) < 0) ! goto Error; item = a->ob_item; memmove(&item[ihigh+d], &item[ihigh], *************** *** 598,607 **** item[ilow] = w; } ! while (--p >= recycle) ! Py_XDECREF(*p); if (recycle != recycled) PyMem_FREE(recycle); Py_XDECREF(v_as_SF); ! return 0; #undef b } --- 607,625 ---- item[ilow] = w; } ! /* Convoluted: there's some obscure reason for wanting to do ! * the decrefs "backwards", but C doesn't guarantee you can compute ! * a pointer to one slot *before* an allocated vector. So checking ! * for item >= recycle is incorrect. ! */ ! for (item = recycle + norig; item > recycle; ) { ! --item; ! Py_XDECREF(*item); ! } ! result = 0; ! Error: if (recycle != recycled) PyMem_FREE(recycle); Py_XDECREF(v_as_SF); ! return result; #undef b }

1 0