From nnorwitz at gmail.com Sat Aug 1 11:42:54 2009 From: nnorwitz at gmail.com (Neal Norwitz) Date: Sat, 1 Aug 2009 05:42:54 -0400 Subject: [Python-checkins] Python Regression Test Failures refleak (2) Message-ID: <20090801094254.GA14852@python.psfb.org> More important issues: ---------------------- test_ssl leaked [-26, 0, 0] references, sum=-26 test_urllib2_localnet leaked [-291, 0, 0] references, sum=-291 Less important issues: ---------------------- test_cmd_line leaked [0, 0, 50] references, sum=50 test_smtplib leaked [6, -88, 82] references, sum=0 test_sys leaked [0, 42, -21] references, sum=21 test_threading leaked [48, 48, 48] references, sum=144 From nnorwitz at gmail.com Sat Aug 1 23:43:27 2009 From: nnorwitz at gmail.com (Neal Norwitz) Date: Sat, 1 Aug 2009 17:43:27 -0400 Subject: [Python-checkins] Python Regression Test Failures refleak (2) Message-ID: <20090801214327.GA9694@python.psfb.org> More important issues: ---------------------- test_ssl leaked [0, 0, 26] references, sum=26 test_urllib2_localnet leaked [-291, 0, 0] references, sum=-291 Less important issues: ---------------------- test_asynchat leaked [0, 126, -126] references, sum=0 test_file2k leaked [10, -2, -78] references, sum=-70 test_smtplib leaked [0, -88, 161] references, sum=73 test_sys leaked [0, 21, -21] references, sum=0 test_threading leaked [48, 48, 53] references, sum=149 test_threadsignals leaked [0, 0, -8] references, sum=-8 From python-checkins at python.org Sun Aug 2 01:55:00 2009 From: python-checkins at python.org (sean.reifschneider) Date: Sat, 01 Aug 2009 23:55:00 -0000 Subject: [Python-checkins] r74277 - in python/trunk: Misc/NEWS Python/getargs.c Message-ID: Author: sean.reifschneider Date: Sun Aug 2 01:54:55 2009 New Revision: 74277 Log: - Issue #6624: yArg_ParseTuple with "s" format when parsing argument with NUL: Bogus TypeError detail string. Modified: python/trunk/Misc/NEWS python/trunk/Python/getargs.c Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Aug 2 01:54:55 2009 @@ -1180,6 +1180,9 @@ C-API ----- +- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with + NUL: Bogus TypeError detail string. + - Issue #5954: Add a PyFrame_GetLineNumber() function to replace most uses of PyCode_Addr2Line(). Modified: python/trunk/Python/getargs.c ============================================================================== --- python/trunk/Python/getargs.c (original) +++ python/trunk/Python/getargs.c Sun Aug 2 01:54:55 2009 @@ -328,7 +328,7 @@ flags, levels, msgbuf, sizeof(msgbuf), &freelist); if (msg) { - seterror(i+1, msg, levels, fname, message); + seterror(i+1, msg, levels, fname, msg); return cleanreturn(0, freelist); } } From python-checkins at python.org Sun Aug 2 01:55:06 2009 From: python-checkins at python.org (sean.reifschneider) Date: Sat, 01 Aug 2009 23:55:06 -0000 Subject: [Python-checkins] r74278 - in python/branches/py3k: Misc/NEWS Python/getargs.c Message-ID: Author: sean.reifschneider Date: Sun Aug 2 01:55:06 2009 New Revision: 74278 Log: - Issue #6624: yArg_ParseTuple with "s" format when parsing argument with NUL: Bogus TypeError detail string. Modified: python/branches/py3k/Misc/NEWS python/branches/py3k/Python/getargs.c Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Aug 2 01:55:06 2009 @@ -1483,6 +1483,9 @@ C-API ----- +- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with + NUL: Bogus TypeError detail string. + - Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError for negative arguments. Previously, it raised TypeError. Modified: python/branches/py3k/Python/getargs.c ============================================================================== --- python/branches/py3k/Python/getargs.c (original) +++ python/branches/py3k/Python/getargs.c Sun Aug 2 01:55:06 2009 @@ -387,7 +387,7 @@ flags, levels, msgbuf, sizeof(msgbuf), &freelist); if (msg) { - seterror(i+1, msg, levels, fname, message); + seterror(i+1, msg, levels, fname, msg); return cleanreturn(0, freelist); } } From nnorwitz at gmail.com Sun Aug 2 11:43:43 2009 From: nnorwitz at gmail.com (Neal Norwitz) Date: Sun, 2 Aug 2009 05:43:43 -0400 Subject: [Python-checkins] Python Regression Test Failures refleak (2) Message-ID: <20090802094343.GA1940@python.psfb.org> More important issues: ---------------------- test_ssl leaked [339, 0, 0] references, sum=339 test_urllib2_localnet leaked [-280, 0, 0] references, sum=-280 Less important issues: ---------------------- test_smtplib leaked [0, -6, 6] references, sum=0 test_socketserver leaked [0, 91, -91] references, sum=0 test_sys leaked [0, 42, -42] references, sum=0 test_threading leaked [48, 48, 53] references, sum=149 test_threadsignals leaked [0, 0, -8] references, sum=-8 From python-checkins at python.org Sun Aug 2 12:14:23 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 10:14:23 -0000 Subject: [Python-checkins] r74279 - in python/branches/py3k: Doc/library/decimal.rst Lib/decimal.py Lib/test/test_decimal.py Misc/NEWS Message-ID: Author: mark.dickinson Date: Sun Aug 2 12:14:23 2009 New Revision: 74279 Log: Issue #6595: Allow Decimal constructor to accept non-European decimal digits, as recommended by the specification. Modified: python/branches/py3k/Doc/library/decimal.rst python/branches/py3k/Lib/decimal.py python/branches/py3k/Lib/test/test_decimal.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Doc/library/decimal.rst ============================================================================== --- python/branches/py3k/Doc/library/decimal.rst (original) +++ python/branches/py3k/Doc/library/decimal.rst Sun Aug 2 12:14:23 2009 @@ -324,6 +324,11 @@ numeric-value ::= decimal-part [exponent-part] | infinity numeric-string ::= [sign] numeric-value | [sign] nan + Other Unicode decimal digits are also permitted where ``digit`` + appears above. These include decimal digits from various other + alphabets (for example, Arabic-Indic and Devan?gar? digits) along + with the fullwidth digits ``'\uff10'`` through ``'\uff19'``. + If *value* is a :class:`tuple`, it should have three components, a sign (:const:`0` for positive or :const:`1` for negative), a :class:`tuple` of digits, and an integer exponent. For example, ``Decimal((0, (1, 4, 1, 4), -3))`` Modified: python/branches/py3k/Lib/decimal.py ============================================================================== --- python/branches/py3k/Lib/decimal.py (original) +++ python/branches/py3k/Lib/decimal.py Sun Aug 2 12:14:23 2009 @@ -554,20 +554,16 @@ intpart = m.group('int') if intpart is not None: # finite number - fracpart = m.group('frac') + fracpart = m.group('frac') or '' exp = int(m.group('exp') or '0') - if fracpart is not None: - self._int = (intpart+fracpart).lstrip('0') or '0' - self._exp = exp - len(fracpart) - else: - self._int = intpart.lstrip('0') or '0' - self._exp = exp + self._int = str(int(intpart+fracpart)) + self._exp = exp - len(fracpart) self._is_special = False else: diag = m.group('diag') if diag is not None: # NaN - self._int = diag.lstrip('0') + self._int = str(int(diag or '0')).lstrip('0') if m.group('signal'): self._exp = 'N' else: @@ -5482,26 +5478,23 @@ # 2. For finite numbers (not infinities and NaNs) the body of the # number between the optional sign and the optional exponent must have # at least one decimal digit, possibly after the decimal point. The -# lookahead expression '(?=[0-9]|\.[0-9])' checks this. -# -# As the flag UNICODE is not enabled here, we're explicitly avoiding any -# other meaning for \d than the numbers [0-9]. +# lookahead expression '(?=\d|\.\d)' checks this. import re _parser = re.compile(r""" # A numeric string consists of: # \s* (?P[-+])? # an optional sign, followed by either... ( - (?=[0-9]|\.[0-9]) # ...a number (with at least one digit) - (?P[0-9]*) # having a (possibly empty) integer part - (\.(?P[0-9]*))? # followed by an optional fractional part - (E(?P[-+]?[0-9]+))? # followed by an optional exponent, or... + (?=\d|\.\d) # ...a number (with at least one digit) + (?P\d*) # having a (possibly empty) integer part + (\.(?P\d*))? # followed by an optional fractional part + (E(?P[-+]?\d+))? # followed by an optional exponent, or... | Inf(inity)? # ...an infinity, or... | (?Ps)? # ...an (optionally signaling) NaN # NaN - (?P[0-9]*) # with (possibly empty) diagnostic info. + (?P\d*) # with (possibly empty) diagnostic info. ) # \s* \Z Modified: python/branches/py3k/Lib/test/test_decimal.py ============================================================================== --- python/branches/py3k/Lib/test/test_decimal.py (original) +++ python/branches/py3k/Lib/test/test_decimal.py Sun Aug 2 12:14:23 2009 @@ -425,9 +425,6 @@ self.assertEqual(str(Decimal('1.3E4 \n')), '1.3E+4') self.assertEqual(str(Decimal(' -7.89')), '-7.89') - #but alternate unicode digits should not - self.assertEqual(str(Decimal('\uff11')), 'NaN') - def test_explicit_from_tuples(self): #zero @@ -534,6 +531,15 @@ d = nc.create_decimal(prevdec) self.assertEqual(str(d), '5.00E+8') + def test_unicode_digits(self): + test_values = { + '\uff11': '1', + '\u0660.\u0660\u0663\u0667\u0662e-\u0663' : '0.0000372', + '-nan\u0c68\u0c6a\u0c66\u0c66' : '-NaN2400', + } + for input, expected in test_values.items(): + self.assertEqual(str(Decimal(input)), expected) + class DecimalImplicitConstructionTest(unittest.TestCase): '''Unit tests for Implicit Construction cases of Decimal.''' Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Aug 2 12:14:23 2009 @@ -63,6 +63,10 @@ Library ------- +- Issue #6595: The Decimal constructor now allows arbitrary Unicode + decimal digits in input, as recommended by the standard. Previously + it was restricted to accepting [0-9]. + - Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT DO/DONT correctly. From python-checkins at python.org Sun Aug 2 12:16:33 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 10:16:33 -0000 Subject: [Python-checkins] r74280 - in python/branches/release31-maint: Doc/library/decimal.rst Lib/decimal.py Lib/test/test_decimal.py Misc/NEWS Message-ID: Author: mark.dickinson Date: Sun Aug 2 12:16:33 2009 New Revision: 74280 Log: Merged revisions 74279 via svnmerge from svn+ssh://pythondev at www.python.org/python/branches/py3k ........ r74279 | mark.dickinson | 2009-08-02 11:14:23 +0100 (Sun, 02 Aug 2009) | 1 line Issue #6595: Allow Decimal constructor to accept non-European decimal digits, as recommended by the specification. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/library/decimal.rst python/branches/release31-maint/Lib/decimal.py python/branches/release31-maint/Lib/test/test_decimal.py python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Doc/library/decimal.rst ============================================================================== --- python/branches/release31-maint/Doc/library/decimal.rst (original) +++ python/branches/release31-maint/Doc/library/decimal.rst Sun Aug 2 12:16:33 2009 @@ -324,6 +324,11 @@ numeric-value ::= decimal-part [exponent-part] | infinity numeric-string ::= [sign] numeric-value | [sign] nan + Other Unicode decimal digits are also permitted where ``digit`` + appears above. These include decimal digits from various other + alphabets (for example, Arabic-Indic and Devan?gar? digits) along + with the fullwidth digits ``'\uff10'`` through ``'\uff19'``. + If *value* is a :class:`tuple`, it should have three components, a sign (:const:`0` for positive or :const:`1` for negative), a :class:`tuple` of digits, and an integer exponent. For example, ``Decimal((0, (1, 4, 1, 4), -3))`` Modified: python/branches/release31-maint/Lib/decimal.py ============================================================================== --- python/branches/release31-maint/Lib/decimal.py (original) +++ python/branches/release31-maint/Lib/decimal.py Sun Aug 2 12:16:33 2009 @@ -554,20 +554,16 @@ intpart = m.group('int') if intpart is not None: # finite number - fracpart = m.group('frac') + fracpart = m.group('frac') or '' exp = int(m.group('exp') or '0') - if fracpart is not None: - self._int = (intpart+fracpart).lstrip('0') or '0' - self._exp = exp - len(fracpart) - else: - self._int = intpart.lstrip('0') or '0' - self._exp = exp + self._int = str(int(intpart+fracpart)) + self._exp = exp - len(fracpart) self._is_special = False else: diag = m.group('diag') if diag is not None: # NaN - self._int = diag.lstrip('0') + self._int = str(int(diag or '0')).lstrip('0') if m.group('signal'): self._exp = 'N' else: @@ -5482,26 +5478,23 @@ # 2. For finite numbers (not infinities and NaNs) the body of the # number between the optional sign and the optional exponent must have # at least one decimal digit, possibly after the decimal point. The -# lookahead expression '(?=[0-9]|\.[0-9])' checks this. -# -# As the flag UNICODE is not enabled here, we're explicitly avoiding any -# other meaning for \d than the numbers [0-9]. +# lookahead expression '(?=\d|\.\d)' checks this. import re _parser = re.compile(r""" # A numeric string consists of: # \s* (?P[-+])? # an optional sign, followed by either... ( - (?=[0-9]|\.[0-9]) # ...a number (with at least one digit) - (?P[0-9]*) # having a (possibly empty) integer part - (\.(?P[0-9]*))? # followed by an optional fractional part - (E(?P[-+]?[0-9]+))? # followed by an optional exponent, or... + (?=\d|\.\d) # ...a number (with at least one digit) + (?P\d*) # having a (possibly empty) integer part + (\.(?P\d*))? # followed by an optional fractional part + (E(?P[-+]?\d+))? # followed by an optional exponent, or... | Inf(inity)? # ...an infinity, or... | (?Ps)? # ...an (optionally signaling) NaN # NaN - (?P[0-9]*) # with (possibly empty) diagnostic info. + (?P\d*) # with (possibly empty) diagnostic info. ) # \s* \Z Modified: python/branches/release31-maint/Lib/test/test_decimal.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_decimal.py (original) +++ python/branches/release31-maint/Lib/test/test_decimal.py Sun Aug 2 12:16:33 2009 @@ -425,9 +425,6 @@ self.assertEqual(str(Decimal('1.3E4 \n')), '1.3E+4') self.assertEqual(str(Decimal(' -7.89')), '-7.89') - #but alternate unicode digits should not - self.assertEqual(str(Decimal('\uff11')), 'NaN') - def test_explicit_from_tuples(self): #zero @@ -534,6 +531,15 @@ d = nc.create_decimal(prevdec) self.assertEqual(str(d), '5.00E+8') + def test_unicode_digits(self): + test_values = { + '\uff11': '1', + '\u0660.\u0660\u0663\u0667\u0662e-\u0663' : '0.0000372', + '-nan\u0c68\u0c6a\u0c66\u0c66' : '-NaN2400', + } + for input, expected in test_values.items(): + self.assertEqual(str(Decimal(input)), expected) + class DecimalImplicitConstructionTest(unittest.TestCase): '''Unit tests for Implicit Construction cases of Decimal.''' Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Sun Aug 2 12:16:33 2009 @@ -42,6 +42,10 @@ Library ------- +- Issue #6595: The Decimal constructor now allows arbitrary Unicode + decimal digits in input, as recommended by the standard. Previously + it was restricted to accepting [0-9]. + - Issues #5155, #5313, #5331: multiprocessing.Process._bootstrap was unconditionally calling "os.close(sys.stdin.fileno())" resulting in file descriptor errors From python-checkins at python.org Sun Aug 2 12:59:36 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 10:59:36 -0000 Subject: [Python-checkins] r74281 - in python/trunk: Doc/library/decimal.rst Lib/decimal.py Lib/test/test_decimal.py Misc/NEWS Message-ID: Author: mark.dickinson Date: Sun Aug 2 12:59:36 2009 New Revision: 74281 Log: Issue #6595: Allow Decimal constructor to accept non-European decimal digits, as recommended by the specification. (Backport of r74279 from py3k.) Modified: python/trunk/Doc/library/decimal.rst python/trunk/Lib/decimal.py python/trunk/Lib/test/test_decimal.py python/trunk/Misc/NEWS Modified: python/trunk/Doc/library/decimal.rst ============================================================================== --- python/trunk/Doc/library/decimal.rst (original) +++ python/trunk/Doc/library/decimal.rst Sun Aug 2 12:59:36 2009 @@ -330,6 +330,12 @@ numeric-value ::= decimal-part [exponent-part] | infinity numeric-string ::= [sign] numeric-value | [sign] nan + If *value* is a unicode string then other Unicode decimal digits + are also permitted where ``digit`` appears above. These include + decimal digits from various other alphabets (for example, + Arabic-Indic and Devan?gar? digits) along with the fullwidth digits + ``u'\uff10'`` through ``u'\uff19'``. + If *value* is a :class:`tuple`, it should have three components, a sign (:const:`0` for positive or :const:`1` for negative), a :class:`tuple` of digits, and an integer exponent. For example, ``Decimal((0, (1, 4, 1, 4), -3))`` Modified: python/trunk/Lib/decimal.py ============================================================================== --- python/trunk/Lib/decimal.py (original) +++ python/trunk/Lib/decimal.py Sun Aug 2 12:59:36 2009 @@ -554,20 +554,16 @@ intpart = m.group('int') if intpart is not None: # finite number - fracpart = m.group('frac') + fracpart = m.group('frac') or '' exp = int(m.group('exp') or '0') - if fracpart is not None: - self._int = str((intpart+fracpart).lstrip('0') or '0') - self._exp = exp - len(fracpart) - else: - self._int = str(intpart.lstrip('0') or '0') - self._exp = exp + self._int = str(int(intpart+fracpart)) + self._exp = exp - len(fracpart) self._is_special = False else: diag = m.group('diag') if diag is not None: # NaN - self._int = str(diag.lstrip('0')) + self._int = str(int(diag or '0')).lstrip('0') if m.group('signal'): self._exp = 'N' else: @@ -5402,29 +5398,26 @@ # number between the optional sign and the optional exponent must have # at least one decimal digit, possibly after the decimal point. The # lookahead expression '(?=\d|\.\d)' checks this. -# -# As the flag UNICODE is not enabled here, we're explicitly avoiding any -# other meaning for \d than the numbers [0-9]. import re _parser = re.compile(r""" # A numeric string consists of: # \s* (?P[-+])? # an optional sign, followed by either... ( - (?=[0-9]|\.[0-9]) # ...a number (with at least one digit) - (?P[0-9]*) # having a (possibly empty) integer part - (\.(?P[0-9]*))? # followed by an optional fractional part - (E(?P[-+]?[0-9]+))? # followed by an optional exponent, or... + (?=\d|\.\d) # ...a number (with at least one digit) + (?P\d*) # having a (possibly empty) integer part + (\.(?P\d*))? # followed by an optional fractional part + (E(?P[-+]?\d+))? # followed by an optional exponent, or... | Inf(inity)? # ...an infinity, or... | (?Ps)? # ...an (optionally signaling) NaN # NaN - (?P[0-9]*) # with (possibly empty) diagnostic info. + (?P\d*) # with (possibly empty) diagnostic info. ) # \s* \Z -""", re.VERBOSE | re.IGNORECASE).match +""", re.VERBOSE | re.IGNORECASE | re.UNICODE).match _all_zeros = re.compile('0*$').match _exact_half = re.compile('50*$').match Modified: python/trunk/Lib/test/test_decimal.py ============================================================================== --- python/trunk/Lib/test/test_decimal.py (original) +++ python/trunk/Lib/test/test_decimal.py Sun Aug 2 12:59:36 2009 @@ -431,9 +431,6 @@ self.assertEqual(str(Decimal(u'-Inf')), '-Infinity') self.assertEqual(str(Decimal(u'NaN123')), 'NaN123') - #but alternate unicode digits should not - self.assertEqual(str(Decimal(u'\uff11')), 'NaN') - def test_explicit_from_tuples(self): #zero @@ -540,6 +537,15 @@ d = nc.create_decimal(prevdec) self.assertEqual(str(d), '5.00E+8') + def test_unicode_digits(self): + test_values = { + u'\uff11': '1', + u'\u0660.\u0660\u0663\u0667\u0662e-\u0663' : '0.0000372', + u'-nan\u0c68\u0c6a\u0c66\u0c66' : '-NaN2400', + } + for input, expected in test_values.items(): + self.assertEqual(str(Decimal(input)), expected) + class DecimalImplicitConstructionTest(unittest.TestCase): '''Unit tests for Implicit Construction cases of Decimal.''' Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Aug 2 12:59:36 2009 @@ -354,6 +354,10 @@ Library ------- +- Issue #6595: The Decimal constructor now allows arbitrary Unicode + decimal digits in input, as recommended by the standard. Previously + it was restricted to accepting [0-9]. + - Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when opening an empty or very small file. From python-checkins at python.org Sun Aug 2 13:01:02 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 11:01:02 -0000 Subject: [Python-checkins] r74282 - in python/branches/release26-maint: Doc/library/decimal.rst Lib/decimal.py Lib/test/test_decimal.py Misc/NEWS Message-ID: Author: mark.dickinson Date: Sun Aug 2 13:01:01 2009 New Revision: 74282 Log: Merged revisions 74281 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74281 | mark.dickinson | 2009-08-02 11:59:36 +0100 (Sun, 02 Aug 2009) | 4 lines Issue #6595: Allow Decimal constructor to accept non-European decimal digits, as recommended by the specification. (Backport of r74279 from py3k.) ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Doc/library/decimal.rst python/branches/release26-maint/Lib/decimal.py python/branches/release26-maint/Lib/test/test_decimal.py python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Doc/library/decimal.rst ============================================================================== --- python/branches/release26-maint/Doc/library/decimal.rst (original) +++ python/branches/release26-maint/Doc/library/decimal.rst Sun Aug 2 13:01:01 2009 @@ -330,6 +330,12 @@ numeric-value ::= decimal-part [exponent-part] | infinity numeric-string ::= [sign] numeric-value | [sign] nan + If *value* is a unicode string then other Unicode decimal digits + are also permitted where ``digit`` appears above. These include + decimal digits from various other alphabets (for example, + Arabic-Indic and Devan?gar? digits) along with the fullwidth digits + ``u'\uff10'`` through ``u'\uff19'``. + If *value* is a :class:`tuple`, it should have three components, a sign (:const:`0` for positive or :const:`1` for negative), a :class:`tuple` of digits, and an integer exponent. For example, ``Decimal((0, (1, 4, 1, 4), -3))`` Modified: python/branches/release26-maint/Lib/decimal.py ============================================================================== --- python/branches/release26-maint/Lib/decimal.py (original) +++ python/branches/release26-maint/Lib/decimal.py Sun Aug 2 13:01:01 2009 @@ -551,20 +551,16 @@ intpart = m.group('int') if intpart is not None: # finite number - fracpart = m.group('frac') + fracpart = m.group('frac') or '' exp = int(m.group('exp') or '0') - if fracpart is not None: - self._int = str((intpart+fracpart).lstrip('0') or '0') - self._exp = exp - len(fracpart) - else: - self._int = str(intpart.lstrip('0') or '0') - self._exp = exp + self._int = str(int(intpart+fracpart)) + self._exp = exp - len(fracpart) self._is_special = False else: diag = m.group('diag') if diag is not None: # NaN - self._int = str(diag.lstrip('0')) + self._int = str(int(diag or '0')).lstrip('0') if m.group('signal'): self._exp = 'N' else: @@ -5349,29 +5345,26 @@ # number between the optional sign and the optional exponent must have # at least one decimal digit, possibly after the decimal point. The # lookahead expression '(?=\d|\.\d)' checks this. -# -# As the flag UNICODE is not enabled here, we're explicitly avoiding any -# other meaning for \d than the numbers [0-9]. import re _parser = re.compile(r""" # A numeric string consists of: # \s* (?P[-+])? # an optional sign, followed by either... ( - (?=[0-9]|\.[0-9]) # ...a number (with at least one digit) - (?P[0-9]*) # having a (possibly empty) integer part - (\.(?P[0-9]*))? # followed by an optional fractional part - (E(?P[-+]?[0-9]+))? # followed by an optional exponent, or... + (?=\d|\.\d) # ...a number (with at least one digit) + (?P\d*) # having a (possibly empty) integer part + (\.(?P\d*))? # followed by an optional fractional part + (E(?P[-+]?\d+))? # followed by an optional exponent, or... | Inf(inity)? # ...an infinity, or... | (?Ps)? # ...an (optionally signaling) NaN # NaN - (?P[0-9]*) # with (possibly empty) diagnostic info. + (?P\d*) # with (possibly empty) diagnostic info. ) # \s* \Z -""", re.VERBOSE | re.IGNORECASE).match +""", re.VERBOSE | re.IGNORECASE | re.UNICODE).match _all_zeros = re.compile('0*$').match _exact_half = re.compile('50*$').match Modified: python/branches/release26-maint/Lib/test/test_decimal.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_decimal.py (original) +++ python/branches/release26-maint/Lib/test/test_decimal.py Sun Aug 2 13:01:01 2009 @@ -432,9 +432,6 @@ self.assertEqual(str(Decimal(u'-Inf')), '-Infinity') self.assertEqual(str(Decimal(u'NaN123')), 'NaN123') - #but alternate unicode digits should not - self.assertEqual(str(Decimal(u'\uff11')), 'NaN') - def test_explicit_from_tuples(self): #zero @@ -541,6 +538,15 @@ d = nc.create_decimal(prevdec) self.assertEqual(str(d), '5.00E+8') + def test_unicode_digits(self): + test_values = { + u'\uff11': '1', + u'\u0660.\u0660\u0663\u0667\u0662e-\u0663' : '0.0000372', + u'-nan\u0c68\u0c6a\u0c66\u0c66' : '-NaN2400', + } + for input, expected in test_values.items(): + self.assertEqual(str(Decimal(input)), expected) + class DecimalImplicitConstructionTest(unittest.TestCase): '''Unit tests for Implicit Construction cases of Decimal.''' Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Sun Aug 2 13:01:01 2009 @@ -279,6 +279,10 @@ Library ------- +- Issue #6595: The Decimal constructor now allows arbitrary Unicode + decimal digits in input, as recommended by the standard. Previously + it was restricted to accepting [0-9]. + - Issue #6553: Fixed a crash in cPickle.load(), when given a file-like object containing incomplete data. From python-checkins at python.org Sun Aug 2 13:02:05 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 11:02:05 -0000 Subject: [Python-checkins] r74283 - python/branches/py3k Message-ID: Author: mark.dickinson Date: Sun Aug 2 13:02:05 2009 New Revision: 74283 Log: Blocked revisions 74281 via svnmerge ........ r74281 | mark.dickinson | 2009-08-02 11:59:36 +0100 (Sun, 02 Aug 2009) | 4 lines Issue #6595: Allow Decimal constructor to accept non-European decimal digits, as recommended by the specification. (Backport of r74279 from py3k.) ........ Modified: python/branches/py3k/ (props changed) From python-checkins at python.org Sun Aug 2 13:09:35 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 11:09:35 -0000 Subject: [Python-checkins] r74284 - python/branches/release31-maint/Misc/NEWS Message-ID: Author: mark.dickinson Date: Sun Aug 2 13:09:35 2009 New Revision: 74284 Log: Fix Misc/NEWS markup Modified: python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Sun Aug 2 13:09:35 2009 @@ -7,7 +7,7 @@ What's New in Python 3.1.1? =========================== -*Release date: XX-XX-XXXX" +*Release date: XX-XX-XXXX* Core and Builtins ----------------- From python-checkins at python.org Sun Aug 2 17:40:11 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 15:40:11 -0000 Subject: [Python-checkins] r74285 - in python/trunk: Lib/inspect.py Misc/ACKS Message-ID: Author: mark.dickinson Date: Sun Aug 2 17:40:11 2009 New Revision: 74285 Log: Issue #6619: Remove duplicate 'isgenerator' function from inspect module. Thanks Vincent Legoll. Modified: python/trunk/Lib/inspect.py python/trunk/Misc/ACKS Modified: python/trunk/Lib/inspect.py ============================================================================== --- python/trunk/Lib/inspect.py (original) +++ python/trunk/Lib/inspect.py Sun Aug 2 17:40:11 2009 @@ -240,10 +240,6 @@ or ismethod(object) or ismethoddescriptor(object)) -def isgenerator(object): - """Return true if the object is a generator object.""" - return isinstance(object, types.GeneratorType) - def isabstract(object): """Return true if the object is an abstract base class (ABC).""" return isinstance(object, type) and object.__flags__ & TPFLAGS_IS_ABSTRACT Modified: python/trunk/Misc/ACKS ============================================================================== --- python/trunk/Misc/ACKS (original) +++ python/trunk/Misc/ACKS Sun Aug 2 17:40:11 2009 @@ -425,6 +425,7 @@ Thomas Lee Christopher Lee Luc Lefebvre +Vincent Legoll Kip Lehman Joerg Lehmann Luke Kenneth Casson Leighton From python-checkins at python.org Sun Aug 2 17:41:08 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 15:41:08 -0000 Subject: [Python-checkins] r74286 - in python/branches/release26-maint: Lib/inspect.py Misc/ACKS Message-ID: Author: mark.dickinson Date: Sun Aug 2 17:41:08 2009 New Revision: 74286 Log: Merged revisions 74285 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74285 | mark.dickinson | 2009-08-02 16:40:11 +0100 (Sun, 02 Aug 2009) | 3 lines Issue #6619: Remove duplicate 'isgenerator' function from inspect module. Thanks Vincent Legoll. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/inspect.py python/branches/release26-maint/Misc/ACKS Modified: python/branches/release26-maint/Lib/inspect.py ============================================================================== --- python/branches/release26-maint/Lib/inspect.py (original) +++ python/branches/release26-maint/Lib/inspect.py Sun Aug 2 17:41:08 2009 @@ -240,10 +240,6 @@ or ismethod(object) or ismethoddescriptor(object)) -def isgenerator(object): - """Return true if the object is a generator object.""" - return isinstance(object, types.GeneratorType) - def isabstract(object): """Return true if the object is an abstract base class (ABC).""" return isinstance(object, type) and object.__flags__ & TPFLAGS_IS_ABSTRACT Modified: python/branches/release26-maint/Misc/ACKS ============================================================================== --- python/branches/release26-maint/Misc/ACKS (original) +++ python/branches/release26-maint/Misc/ACKS Sun Aug 2 17:41:08 2009 @@ -410,6 +410,7 @@ Thomas Lee Christopher Lee Luc Lefebvre +Vincent Legoll Kip Lehman Joerg Lehmann Luke Kenneth Casson Leighton From python-checkins at python.org Sun Aug 2 17:51:20 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 15:51:20 -0000 Subject: [Python-checkins] r74287 - in python/branches/py3k: Lib/inspect.py Misc/ACKS Message-ID: Author: mark.dickinson Date: Sun Aug 2 17:51:19 2009 New Revision: 74287 Log: Merged revisions 74285 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74285 | mark.dickinson | 2009-08-02 16:40:11 +0100 (Sun, 02 Aug 2009) | 3 lines Issue #6619: Remove duplicate 'isgenerator' function from inspect module. Thanks Vincent Legoll. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/inspect.py python/branches/py3k/Misc/ACKS Modified: python/branches/py3k/Lib/inspect.py ============================================================================== --- python/branches/py3k/Lib/inspect.py (original) +++ python/branches/py3k/Lib/inspect.py Sun Aug 2 17:51:19 2009 @@ -236,10 +236,6 @@ or ismethod(object) or ismethoddescriptor(object)) -def isgenerator(object): - """Return true if the object is a generator object.""" - return isinstance(object, types.GeneratorType) - def isabstract(object): """Return true if the object is an abstract base class (ABC).""" return isinstance(object, type) and object.__flags__ & TPFLAGS_IS_ABSTRACT Modified: python/branches/py3k/Misc/ACKS ============================================================================== --- python/branches/py3k/Misc/ACKS (original) +++ python/branches/py3k/Misc/ACKS Sun Aug 2 17:51:19 2009 @@ -427,6 +427,7 @@ Christopher Lee Tennessee Leeuwenburg Luc Lefebvre +Vincent Legoll Kip Lehman Joerg Lehmann Luke Kenneth Casson Leighton From python-checkins at python.org Sun Aug 2 17:51:59 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 15:51:59 -0000 Subject: [Python-checkins] r74288 - in python/branches/release31-maint: Lib/inspect.py Misc/ACKS Message-ID: Author: mark.dickinson Date: Sun Aug 2 17:51:59 2009 New Revision: 74288 Log: Merged revisions 74287 via svnmerge from svn+ssh://pythondev at www.python.org/python/branches/py3k ................ r74287 | mark.dickinson | 2009-08-02 16:51:19 +0100 (Sun, 02 Aug 2009) | 10 lines Merged revisions 74285 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74285 | mark.dickinson | 2009-08-02 16:40:11 +0100 (Sun, 02 Aug 2009) | 3 lines Issue #6619: Remove duplicate 'isgenerator' function from inspect module. Thanks Vincent Legoll. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/inspect.py python/branches/release31-maint/Misc/ACKS Modified: python/branches/release31-maint/Lib/inspect.py ============================================================================== --- python/branches/release31-maint/Lib/inspect.py (original) +++ python/branches/release31-maint/Lib/inspect.py Sun Aug 2 17:51:59 2009 @@ -236,10 +236,6 @@ or ismethod(object) or ismethoddescriptor(object)) -def isgenerator(object): - """Return true if the object is a generator object.""" - return isinstance(object, types.GeneratorType) - def isabstract(object): """Return true if the object is an abstract base class (ABC).""" return isinstance(object, type) and object.__flags__ & TPFLAGS_IS_ABSTRACT Modified: python/branches/release31-maint/Misc/ACKS ============================================================================== --- python/branches/release31-maint/Misc/ACKS (original) +++ python/branches/release31-maint/Misc/ACKS Sun Aug 2 17:51:59 2009 @@ -425,6 +425,7 @@ Christopher Lee Tennessee Leeuwenburg Luc Lefebvre +Vincent Legoll Kip Lehman Joerg Lehmann Luke Kenneth Casson Leighton From python-checkins at python.org Sun Aug 2 22:08:54 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 20:08:54 -0000 Subject: [Python-checkins] r74289 - in python/branches/py3k: Lib/binhex.py Misc/NEWS Message-ID: Author: mark.dickinson Date: Sun Aug 2 22:08:54 2009 New Revision: 74289 Log: Issues #2715, #6621: Remove unused and undefined references to FSSpec from binhex module. Thanks Vincent Legoll. Modified: python/branches/py3k/Lib/binhex.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/binhex.py ============================================================================== --- python/branches/py3k/Lib/binhex.py (original) +++ python/branches/py3k/Lib/binhex.py Sun Aug 2 22:08:54 2009 @@ -143,9 +143,6 @@ if isinstance(ofp, str): ofname = ofp ofp = io.open(ofname, 'wb') - if os.name == 'mac': - fss = FSSpec(ofname) - fss.SetCreatorType('BnHq', 'TEXT') ofp.write(b'(This file must be converted with BinHex 4.0)\r\r:') hqxer = _Hqxcoderengine(ofp) self.ofp = _Rlecoderengine(hqxer) @@ -446,9 +443,6 @@ finfo = ifp.FInfo if not out: out = ifp.FName - if os.name == 'mac': - ofss = FSSpec(out) - out = ofss.as_pathname() ofp = io.open(out, 'wb') # XXXX Do translation on non-mac systems @@ -469,11 +463,4 @@ ofp.write(d) ofp.close() - if os.name == 'mac': - nfinfo = ofss.GetFInfo() - nfinfo.Creator = finfo.Creator - nfinfo.Type = finfo.Type - nfinfo.Flags = finfo.Flags - ofss.SetFInfo(nfinfo) - ifp.close() Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Aug 2 22:08:54 2009 @@ -63,6 +63,8 @@ Library ------- +- Issue #2715: Remove remnants of Carbon.File from binhex module. + - Issue #6595: The Decimal constructor now allows arbitrary Unicode decimal digits in input, as recommended by the standard. Previously it was restricted to accepting [0-9]. From python-checkins at python.org Sun Aug 2 22:10:00 2009 From: python-checkins at python.org (mark.dickinson) Date: Sun, 02 Aug 2009 20:10:00 -0000 Subject: [Python-checkins] r74290 - in python/branches/release31-maint: Lib/binhex.py Misc/NEWS Message-ID: Author: mark.dickinson Date: Sun Aug 2 22:09:59 2009 New Revision: 74290 Log: Merged revisions 74289 via svnmerge from svn+ssh://pythondev at www.python.org/python/branches/py3k ........ r74289 | mark.dickinson | 2009-08-02 21:08:54 +0100 (Sun, 02 Aug 2009) | 3 lines Issues #2715, #6621: Remove unused and undefined references to FSSpec from binhex module. Thanks Vincent Legoll. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/binhex.py python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Lib/binhex.py ============================================================================== --- python/branches/release31-maint/Lib/binhex.py (original) +++ python/branches/release31-maint/Lib/binhex.py Sun Aug 2 22:09:59 2009 @@ -143,9 +143,6 @@ if isinstance(ofp, str): ofname = ofp ofp = io.open(ofname, 'wb') - if os.name == 'mac': - fss = FSSpec(ofname) - fss.SetCreatorType('BnHq', 'TEXT') ofp.write(b'(This file must be converted with BinHex 4.0)\r\r:') hqxer = _Hqxcoderengine(ofp) self.ofp = _Rlecoderengine(hqxer) @@ -446,9 +443,6 @@ finfo = ifp.FInfo if not out: out = ifp.FName - if os.name == 'mac': - ofss = FSSpec(out) - out = ofss.as_pathname() ofp = io.open(out, 'wb') # XXXX Do translation on non-mac systems @@ -469,11 +463,4 @@ ofp.write(d) ofp.close() - if os.name == 'mac': - nfinfo = ofss.GetFInfo() - nfinfo.Creator = finfo.Creator - nfinfo.Type = finfo.Type - nfinfo.Flags = finfo.Flags - ofss.SetFInfo(nfinfo) - ifp.close() Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Sun Aug 2 22:09:59 2009 @@ -42,6 +42,8 @@ Library ------- +- Issue #2715: Remove remnants of Carbon.File from binhex module. + - Issue #6595: The Decimal constructor now allows arbitrary Unicode decimal digits in input, as recommended by the standard. Previously it was restricted to accepting [0-9]. From python-checkins at python.org Sun Aug 2 22:37:48 2009 From: python-checkins at python.org (frank.wierzbicki) Date: Sun, 02 Aug 2009 20:37:48 -0000 Subject: [Python-checkins] r74291 - python/trunk/Lib/test/test_codeop.py Message-ID: Author: frank.wierzbicki Date: Sun Aug 2 22:37:48 2009 New Revision: 74291 Log: Adding tests derived from the Jython project. These are primarily tests of 'single' statements with partial sentences (so they test things like "try:" in interactive mode). Others tests hit areas that previously failed in Jython. A couple still fail in Jython, mainly due to the difficulty of parsing partial sentences (but should be fixed by Jython 2.6). Modified: python/trunk/Lib/test/test_codeop.py Modified: python/trunk/Lib/test/test_codeop.py ============================================================================== --- python/trunk/Lib/test/test_codeop.py (original) +++ python/trunk/Lib/test/test_codeop.py Sun Aug 2 22:37:48 2009 @@ -108,6 +108,20 @@ av("\n \na**3","eval") av("#a\n#b\na**3","eval") + av("\n\na = 1\n\n") + av("\n\nif 1: a=1\n\n") + + av("if 1:\n pass\n if 1:\n pass\n else:\n pass\n") + av("#a\n\n \na=3\n\n") + + av("\n\na**3","eval") + av("\n \na**3","eval") + av("#a\n#b\na**3","eval") + + av("def f():\n try: pass\n finally: [x for x in (1,2)]\n") + av("def f():\n pass\n#foo\n") + av("@a.b.c\ndef f():\n pass\n") + def test_incomplete(self): ai = self.assertIncomplete @@ -149,6 +163,93 @@ ai("9+ \\","eval") ai("lambda z: \\","eval") + ai("if True:\n if True:\n if True: \n") + + ai("@a(") + ai("@a(b") + ai("@a(b,") + ai("@a(b,c") + ai("@a(b,c,") + + ai("from a import (") + ai("from a import (b") + ai("from a import (b,") + ai("from a import (b,c") + ai("from a import (b,c,") + + ai("["); + ai("[a"); + ai("[a,"); + ai("[a,b"); + ai("[a,b,"); + + ai("{"); + ai("{a"); + ai("{a:"); + ai("{a:b"); + ai("{a:b,"); + ai("{a:b,c"); + ai("{a:b,c:"); + ai("{a:b,c:d"); + ai("{a:b,c:d,"); + + ai("a(") + ai("a(b") + ai("a(b,") + ai("a(b,c") + ai("a(b,c,") + + ai("a[") + ai("a[b") + ai("a[b,") + ai("a[b:") + ai("a[b:c") + ai("a[b:c:") + ai("a[b:c:d") + + ai("def a(") + ai("def a(b") + ai("def a(b,") + ai("def a(b,c") + ai("def a(b,c,") + + ai("(") + ai("(a") + ai("(a,") + ai("(a,b") + ai("(a,b,") + + ai("if a:\n pass\nelif b:") + ai("if a:\n pass\nelif b:\n pass\nelse:") + + ai("while a:") + ai("while a:\n pass\nelse:") + + ai("for a in b:") + ai("for a in b:\n pass\nelse:") + + ai("try:") + ai("try:\n pass\nexcept:") + ai("try:\n pass\nfinally:") + ai("try:\n pass\nexcept:\n pass\nfinally:") + + ai("with a:") + ai("with a as b:") + + ai("class a:") + ai("class a(") + ai("class a(b") + ai("class a(b,") + ai("class a():") + + ai("[x for") + ai("[x for x in") + ai("[x for x in (") + + ai("(x for") + ai("(x for x in") + ai("(x for x in (") + def test_invalid(self): ai = self.assertInvalid ai("a b") @@ -177,12 +278,27 @@ ai("lambda z:","eval") ai("a b","eval") + ai("return 2.3") + ai("if (a == 1 and b = 2): pass") + + ai("del 1") + ai("del ()") + ai("del (1,)") + ai("del [1]") + ai("del '1'") + + ai("[i for i in range(10)] = (1, 2, 3)") + def test_filename(self): self.assertEquals(compile_command("a = 1\n", "abc").co_filename, compile("a = 1\n", "abc", 'single').co_filename) self.assertNotEquals(compile_command("a = 1\n", "abc").co_filename, compile("a = 1\n", "def", 'single').co_filename) + def test_no_universal_newlines(self): + code = compile_command("'\rfoo\r'", symbol='eval') + self.assertEqual(eval(code), '\rfoo\r') + def test_main(): run_unittest(CodeopTests) From python-checkins at python.org Mon Aug 3 00:05:54 2009 From: python-checkins at python.org (frank.wierzbicki) Date: Sun, 02 Aug 2009 22:05:54 -0000 Subject: [Python-checkins] r74292 - in python/branches/release26-maint: Lib/test/test_codeop.py Message-ID: Author: frank.wierzbicki Date: Mon Aug 3 00:05:54 2009 New Revision: 74292 Log: Merged revisions 74291 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74291 | frank.wierzbicki | 2009-08-02 16:37:48 -0400 (Sun, 02 Aug 2009) | 6 lines Adding tests derived from the Jython project. These are primarily tests of 'single' statements with partial sentences (so they test things like "try:" in interactive mode). Others tests hit areas that previously failed in Jython. A couple still fail in Jython, mainly due to the difficulty of parsing partial sentences (but should be fixed by Jython 2.6). ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/test/test_codeop.py Modified: python/branches/release26-maint/Lib/test/test_codeop.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_codeop.py (original) +++ python/branches/release26-maint/Lib/test/test_codeop.py Mon Aug 3 00:05:54 2009 @@ -108,6 +108,20 @@ av("\n \na**3","eval") av("#a\n#b\na**3","eval") + av("\n\na = 1\n\n") + av("\n\nif 1: a=1\n\n") + + av("if 1:\n pass\n if 1:\n pass\n else:\n pass\n") + av("#a\n\n \na=3\n\n") + + av("\n\na**3","eval") + av("\n \na**3","eval") + av("#a\n#b\na**3","eval") + + av("def f():\n try: pass\n finally: [x for x in (1,2)]\n") + av("def f():\n pass\n#foo\n") + av("@a.b.c\ndef f():\n pass\n") + def test_incomplete(self): ai = self.assertIncomplete @@ -149,6 +163,93 @@ ai("9+ \\","eval") ai("lambda z: \\","eval") + ai("if True:\n if True:\n if True: \n") + + ai("@a(") + ai("@a(b") + ai("@a(b,") + ai("@a(b,c") + ai("@a(b,c,") + + ai("from a import (") + ai("from a import (b") + ai("from a import (b,") + ai("from a import (b,c") + ai("from a import (b,c,") + + ai("["); + ai("[a"); + ai("[a,"); + ai("[a,b"); + ai("[a,b,"); + + ai("{"); + ai("{a"); + ai("{a:"); + ai("{a:b"); + ai("{a:b,"); + ai("{a:b,c"); + ai("{a:b,c:"); + ai("{a:b,c:d"); + ai("{a:b,c:d,"); + + ai("a(") + ai("a(b") + ai("a(b,") + ai("a(b,c") + ai("a(b,c,") + + ai("a[") + ai("a[b") + ai("a[b,") + ai("a[b:") + ai("a[b:c") + ai("a[b:c:") + ai("a[b:c:d") + + ai("def a(") + ai("def a(b") + ai("def a(b,") + ai("def a(b,c") + ai("def a(b,c,") + + ai("(") + ai("(a") + ai("(a,") + ai("(a,b") + ai("(a,b,") + + ai("if a:\n pass\nelif b:") + ai("if a:\n pass\nelif b:\n pass\nelse:") + + ai("while a:") + ai("while a:\n pass\nelse:") + + ai("for a in b:") + ai("for a in b:\n pass\nelse:") + + ai("try:") + ai("try:\n pass\nexcept:") + ai("try:\n pass\nfinally:") + ai("try:\n pass\nexcept:\n pass\nfinally:") + + ai("with a:") + ai("with a as b:") + + ai("class a:") + ai("class a(") + ai("class a(b") + ai("class a(b,") + ai("class a():") + + ai("[x for") + ai("[x for x in") + ai("[x for x in (") + + ai("(x for") + ai("(x for x in") + ai("(x for x in (") + def test_invalid(self): ai = self.assertInvalid ai("a b") @@ -177,12 +278,27 @@ ai("lambda z:","eval") ai("a b","eval") + ai("return 2.3") + ai("if (a == 1 and b = 2): pass") + + ai("del 1") + ai("del ()") + ai("del (1,)") + ai("del [1]") + ai("del '1'") + + ai("[i for i in range(10)] = (1, 2, 3)") + def test_filename(self): self.assertEquals(compile_command("a = 1\n", "abc").co_filename, compile("a = 1\n", "abc", 'single').co_filename) self.assertNotEquals(compile_command("a = 1\n", "abc").co_filename, compile("a = 1\n", "def", 'single').co_filename) + def test_no_universal_newlines(self): + code = compile_command("'\rfoo\r'", symbol='eval') + self.assertEqual(eval(code), '\rfoo\r') + def test_main(): run_unittest(CodeopTests) From python-checkins at python.org Mon Aug 3 00:19:05 2009 From: python-checkins at python.org (frank.wierzbicki) Date: Sun, 02 Aug 2009 22:19:05 -0000 Subject: [Python-checkins] r74293 - in python/branches/py3k: Lib/test/test_codeop.py Message-ID: Author: frank.wierzbicki Date: Mon Aug 3 00:19:05 2009 New Revision: 74293 Log: Merged revisions 74291 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74291 | frank.wierzbicki | 2009-08-02 16:37:48 -0400 (Sun, 02 Aug 2009) | 6 lines Adding tests derived from the Jython project. These are primarily tests of 'single' statements with partial sentences (so they test things like "try:" in interactive mode). Others tests hit areas that previously failed in Jython. A couple still fail in Jython, mainly due to the difficulty of parsing partial sentences (but should be fixed by Jython 2.6). ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_codeop.py Modified: python/branches/py3k/Lib/test/test_codeop.py ============================================================================== --- python/branches/py3k/Lib/test/test_codeop.py (original) +++ python/branches/py3k/Lib/test/test_codeop.py Mon Aug 3 00:19:05 2009 @@ -108,6 +108,20 @@ av("\n \na**3","eval") av("#a\n#b\na**3","eval") + av("\n\na = 1\n\n") + av("\n\nif 1: a=1\n\n") + + av("if 1:\n pass\n if 1:\n pass\n else:\n pass\n") + av("#a\n\n \na=3\n\n") + + av("\n\na**3","eval") + av("\n \na**3","eval") + av("#a\n#b\na**3","eval") + + av("def f():\n try: pass\n finally: [x for x in (1,2)]\n") + av("def f():\n pass\n#foo\n") + av("@a.b.c\ndef f():\n pass\n") + def test_incomplete(self): ai = self.assertIncomplete @@ -149,6 +163,93 @@ ai("9+ \\","eval") ai("lambda z: \\","eval") + ai("if True:\n if True:\n if True: \n") + + ai("@a(") + ai("@a(b") + ai("@a(b,") + ai("@a(b,c") + ai("@a(b,c,") + + ai("from a import (") + ai("from a import (b") + ai("from a import (b,") + ai("from a import (b,c") + ai("from a import (b,c,") + + ai("["); + ai("[a"); + ai("[a,"); + ai("[a,b"); + ai("[a,b,"); + + ai("{"); + ai("{a"); + ai("{a:"); + ai("{a:b"); + ai("{a:b,"); + ai("{a:b,c"); + ai("{a:b,c:"); + ai("{a:b,c:d"); + ai("{a:b,c:d,"); + + ai("a(") + ai("a(b") + ai("a(b,") + ai("a(b,c") + ai("a(b,c,") + + ai("a[") + ai("a[b") + ai("a[b,") + ai("a[b:") + ai("a[b:c") + ai("a[b:c:") + ai("a[b:c:d") + + ai("def a(") + ai("def a(b") + ai("def a(b,") + ai("def a(b,c") + ai("def a(b,c,") + + ai("(") + ai("(a") + ai("(a,") + ai("(a,b") + ai("(a,b,") + + ai("if a:\n pass\nelif b:") + ai("if a:\n pass\nelif b:\n pass\nelse:") + + ai("while a:") + ai("while a:\n pass\nelse:") + + ai("for a in b:") + ai("for a in b:\n pass\nelse:") + + ai("try:") + ai("try:\n pass\nexcept:") + ai("try:\n pass\nfinally:") + ai("try:\n pass\nexcept:\n pass\nfinally:") + + ai("with a:") + ai("with a as b:") + + ai("class a:") + ai("class a(") + ai("class a(b") + ai("class a(b,") + ai("class a():") + + ai("[x for") + ai("[x for x in") + ai("[x for x in (") + + ai("(x for") + ai("(x for x in") + ai("(x for x in (") + def test_invalid(self): ai = self.assertInvalid ai("a b") @@ -177,12 +278,27 @@ ai("lambda z:","eval") ai("a b","eval") + ai("return 2.3") + ai("if (a == 1 and b = 2): pass") + + ai("del 1") + ai("del ()") + ai("del (1,)") + ai("del [1]") + ai("del '1'") + + ai("[i for i in range(10)] = (1, 2, 3)") + def test_filename(self): self.assertEquals(compile_command("a = 1\n", "abc").co_filename, compile("a = 1\n", "abc", 'single').co_filename) self.assertNotEquals(compile_command("a = 1\n", "abc").co_filename, compile("a = 1\n", "def", 'single').co_filename) + def test_no_universal_newlines(self): + code = compile_command("'\rfoo\r'", symbol='eval') + self.assertEqual(eval(code), '\rfoo\r') + def test_main(): run_unittest(CodeopTests) From nnorwitz at gmail.com Mon Aug 3 00:30:52 2009 From: nnorwitz at gmail.com (Neal Norwitz) Date: Sun, 2 Aug 2009 18:30:52 -0400 Subject: [Python-checkins] Python Regression Test Failures refleak (1) Message-ID: <20090802223052.GA5573@python.psfb.org> More important issues: ---------------------- test_warnings leaked [0, 0, 60] references, sum=60 Less important issues: ---------------------- test_cmd_line leaked [0, -25, -25] references, sum=-50 test_dumbdbm leaked [0, -92, 0] references, sum=-92 test_smtplib leaked [-5, 161, -167] references, sum=-11 test_socketserver leaked [0, 0, 80] references, sum=80 test_sys leaked [-21, 0, 0] references, sum=-21 test_threading leaked [48, 48, 48] references, sum=144 test_urllib2_localnet leaked [0, 283, -283] references, sum=0 test_xmlrpc leaked [6, -6, 0] references, sum=0 From python-checkins at python.org Mon Aug 3 01:03:31 2009 From: python-checkins at python.org (frank.wierzbicki) Date: Sun, 02 Aug 2009 23:03:31 -0000 Subject: [Python-checkins] r74294 - in python/branches/release31-maint: Lib/test/test_codeop.py Message-ID: Author: frank.wierzbicki Date: Mon Aug 3 01:03:31 2009 New Revision: 74294 Log: Merged revisions 74293 via svnmerge from svn+ssh://pythondev at svn.python.org/python/branches/py3k ................ r74293 | frank.wierzbicki | 2009-08-02 18:19:05 -0400 (Sun, 02 Aug 2009) | 13 lines Merged revisions 74291 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74291 | frank.wierzbicki | 2009-08-02 16:37:48 -0400 (Sun, 02 Aug 2009) | 6 lines Adding tests derived from the Jython project. These are primarily tests of 'single' statements with partial sentences (so they test things like "try:" in interactive mode). Others tests hit areas that previously failed in Jython. A couple still fail in Jython, mainly due to the difficulty of parsing partial sentences (but should be fixed by Jython 2.6). ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/test/test_codeop.py Modified: python/branches/release31-maint/Lib/test/test_codeop.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_codeop.py (original) +++ python/branches/release31-maint/Lib/test/test_codeop.py Mon Aug 3 01:03:31 2009 @@ -108,6 +108,20 @@ av("\n \na**3","eval") av("#a\n#b\na**3","eval") + av("\n\na = 1\n\n") + av("\n\nif 1: a=1\n\n") + + av("if 1:\n pass\n if 1:\n pass\n else:\n pass\n") + av("#a\n\n \na=3\n\n") + + av("\n\na**3","eval") + av("\n \na**3","eval") + av("#a\n#b\na**3","eval") + + av("def f():\n try: pass\n finally: [x for x in (1,2)]\n") + av("def f():\n pass\n#foo\n") + av("@a.b.c\ndef f():\n pass\n") + def test_incomplete(self): ai = self.assertIncomplete @@ -149,6 +163,93 @@ ai("9+ \\","eval") ai("lambda z: \\","eval") + ai("if True:\n if True:\n if True: \n") + + ai("@a(") + ai("@a(b") + ai("@a(b,") + ai("@a(b,c") + ai("@a(b,c,") + + ai("from a import (") + ai("from a import (b") + ai("from a import (b,") + ai("from a import (b,c") + ai("from a import (b,c,") + + ai("["); + ai("[a"); + ai("[a,"); + ai("[a,b"); + ai("[a,b,"); + + ai("{"); + ai("{a"); + ai("{a:"); + ai("{a:b"); + ai("{a:b,"); + ai("{a:b,c"); + ai("{a:b,c:"); + ai("{a:b,c:d"); + ai("{a:b,c:d,"); + + ai("a(") + ai("a(b") + ai("a(b,") + ai("a(b,c") + ai("a(b,c,") + + ai("a[") + ai("a[b") + ai("a[b,") + ai("a[b:") + ai("a[b:c") + ai("a[b:c:") + ai("a[b:c:d") + + ai("def a(") + ai("def a(b") + ai("def a(b,") + ai("def a(b,c") + ai("def a(b,c,") + + ai("(") + ai("(a") + ai("(a,") + ai("(a,b") + ai("(a,b,") + + ai("if a:\n pass\nelif b:") + ai("if a:\n pass\nelif b:\n pass\nelse:") + + ai("while a:") + ai("while a:\n pass\nelse:") + + ai("for a in b:") + ai("for a in b:\n pass\nelse:") + + ai("try:") + ai("try:\n pass\nexcept:") + ai("try:\n pass\nfinally:") + ai("try:\n pass\nexcept:\n pass\nfinally:") + + ai("with a:") + ai("with a as b:") + + ai("class a:") + ai("class a(") + ai("class a(b") + ai("class a(b,") + ai("class a():") + + ai("[x for") + ai("[x for x in") + ai("[x for x in (") + + ai("(x for") + ai("(x for x in") + ai("(x for x in (") + def test_invalid(self): ai = self.assertInvalid ai("a b") @@ -177,12 +278,27 @@ ai("lambda z:","eval") ai("a b","eval") + ai("return 2.3") + ai("if (a == 1 and b = 2): pass") + + ai("del 1") + ai("del ()") + ai("del (1,)") + ai("del [1]") + ai("del '1'") + + ai("[i for i in range(10)] = (1, 2, 3)") + def test_filename(self): self.assertEquals(compile_command("a = 1\n", "abc").co_filename, compile("a = 1\n", "abc", 'single').co_filename) self.assertNotEquals(compile_command("a = 1\n", "abc").co_filename, compile("a = 1\n", "def", 'single').co_filename) + def test_no_universal_newlines(self): + code = compile_command("'\rfoo\r'", symbol='eval') + self.assertEqual(eval(code), '\rfoo\r') + def test_main(): run_unittest(CodeopTests) From nnorwitz at gmail.com Mon Aug 3 08:00:01 2009 From: nnorwitz at gmail.com (Neal Norwitz) Date: Mon, 3 Aug 2009 02:00:01 -0400 Subject: [Python-checkins] Python Regression Test Failures refleak (1) Message-ID: <20090803060001.GA18787@python.psfb.org> More important issues: ---------------------- test_warnings leaked [0, 0, 60] references, sum=60 Less important issues: ---------------------- test_cmd_line leaked [0, -25, -25] references, sum=-50 test_dumbdbm leaked [0, -92, 0] references, sum=-92 test_smtplib leaked [-5, 161, -167] references, sum=-11 test_socketserver leaked [0, 0, 80] references, sum=80 test_sys leaked [-21, 0, 0] references, sum=-21 test_threading leaked [48, 48, 48] references, sum=144 test_urllib2_localnet leaked [0, 283, -283] references, sum=0 test_xmlrpc leaked [6, -6, 0] references, sum=0 test_asynchat leaked [-139, 0, 0] references, sum=-139 test_cmd_line leaked [0, 25, 0] references, sum=25 test_popen2 leaked [0, 0, 54] references, sum=54 test_smtplib leaked [-278, 88, 161] references, sum=-29 test_socketserver leaked [0, 0, 80] references, sum=80 From nnorwitz at gmail.com Mon Aug 3 11:42:31 2009 From: nnorwitz at gmail.com (Neal Norwitz) Date: Mon, 3 Aug 2009 05:42:31 -0400 Subject: [Python-checkins] Python Regression Test Failures refleak (1) Message-ID: <20090803094231.GA11130@python.psfb.org> More important issues: ---------------------- test_softspace leaked [-83, 0, 0] references, sum=-83 Less important issues: ---------------------- test_asynchat leaked [130, -130, 0] references, sum=0 test_file2k leaked [80, -80, 0] references, sum=0 test_smtplib leaked [190, -276, 86] references, sum=0 test_socketserver leaked [0, 0, 83] references, sum=83 test_sys leaked [-21, -21, 0] references, sum=-42 test_threading leaked [48, 48, 48] references, sum=144 test_urllib2_localnet leaked [0, 283, -283] references, sum=0 From python-checkins at python.org Mon Aug 3 19:50:21 2009 From: python-checkins at python.org (georg.brandl) Date: Mon, 03 Aug 2009 17:50:21 -0000 Subject: [Python-checkins] r74297 - python/branches/py3k/Doc/reference/expressions.rst Message-ID: Author: georg.brandl Date: Mon Aug 3 19:50:20 2009 New Revision: 74297 Log: #6618: fix invalid 3k syntax. Modified: python/branches/py3k/Doc/reference/expressions.rst Modified: python/branches/py3k/Doc/reference/expressions.rst ============================================================================== --- python/branches/py3k/Doc/reference/expressions.rst (original) +++ python/branches/py3k/Doc/reference/expressions.rst Mon Aug 3 19:50:20 2009 @@ -416,7 +416,7 @@ ... while True: ... try: ... value = (yield value) - ... except Exception, e: + ... except Exception as e: ... value = e ... finally: ... print("Don't forget to clean up when 'close()' is called.") From python-checkins at python.org Mon Aug 3 19:51:13 2009 From: python-checkins at python.org (georg.brandl) Date: Mon, 03 Aug 2009 17:51:13 -0000 Subject: [Python-checkins] r74298 - in python/branches/release31-maint: Doc/reference/expressions.rst Message-ID: Author: georg.brandl Date: Mon Aug 3 19:51:12 2009 New Revision: 74298 Log: Merged revisions 74297 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r74297 | georg.brandl | 2009-08-03 19:50:20 +0200 (Mo, 03 Aug 2009) | 1 line #6618: fix invalid 3k syntax. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/reference/expressions.rst Modified: python/branches/release31-maint/Doc/reference/expressions.rst ============================================================================== --- python/branches/release31-maint/Doc/reference/expressions.rst (original) +++ python/branches/release31-maint/Doc/reference/expressions.rst Mon Aug 3 19:51:12 2009 @@ -416,7 +416,7 @@ ... while True: ... try: ... value = (yield value) - ... except Exception, e: + ... except Exception as e: ... value = e ... finally: ... print("Don't forget to clean up when 'close()' is called.") From nnorwitz at gmail.com Mon Aug 3 23:57:29 2009 From: nnorwitz at gmail.com (Neal Norwitz) Date: Mon, 3 Aug 2009 17:57:29 -0400 Subject: [Python-checkins] Python Regression Test Failures refleak (1) Message-ID: <20090803215729.GA20091@python.psfb.org> More important issues: ---------------------- test_ssl leaked [0, 339, -81] references, sum=258 Less important issues: ---------------------- test_cmd_line leaked [0, -25, 0] references, sum=-25 test_smtplib leaked [-3, 161, -167] references, sum=-9 test_thread leaked [0, 115, -115] references, sum=0 test_threadedtempfile leaked [101, -101, 0] references, sum=0 test_threading leaked [48, 48, 48] references, sum=144 test_xmlrpc leaked [0, -6, 6] references, sum=0 From ggpolo at gmail.com Tue Aug 4 15:40:12 2009 From: ggpolo at gmail.com (Guilherme Polo) Date: Tue, 4 Aug 2009 10:40:12 -0300 Subject: [Python-checkins] r65971 - python/trunk/Lib/lib-tk/Tkinter.py In-Reply-To: References: Message-ID: 2009/7/30 McKown, John : > I have never done anything like this before, so please excuse my ignorance > if I am doing something that I shouldn't. But there appears to be a bug in > Tkinter.py in the delete function in revision r65971, defined starting in > line 2660. The line in question is line 2670 and looks like: > > > if (num_index1 is not None) and (num_index2 is not None): > > This line gets a message in PySolFC like: > > TypeError: argument of type 'NoneType' is not iterable > > If have fixed this in my case by adding the phrase "and (self._tclCommands > is not None)" to the line. > > ?????? if (num_index1 is not None) and (num_index2 is not None) and > (self._tclCommands is not None): > > Hi John, I rarely read replies here but luckily I read this one. The commit in r65971 was indeed problematic, but I believe it got properly fixed on r67082. Did you have any other problems with this newer revision ? > > John McKown > > Systems Engineer IV > > IT > Regards, -- -- Guilherme H. Polo Goncalves From python-checkins at python.org Tue Aug 4 20:49:31 2009 From: python-checkins at python.org (raymond.hettinger) Date: Tue, 04 Aug 2009 18:49:31 -0000 Subject: [Python-checkins] r74299 - in python/branches/release26-maint: Lib/test/test_defaultdict.py Misc/NEWS Modules/_collectionsmodule.c Message-ID: Author: raymond.hettinger Date: Tue Aug 4 20:49:26 2009 New Revision: 74299 Log: Issue 6637: defaultdict.copy() failed with an empty factory. Modified: python/branches/release26-maint/Lib/test/test_defaultdict.py python/branches/release26-maint/Misc/NEWS python/branches/release26-maint/Modules/_collectionsmodule.c Modified: python/branches/release26-maint/Lib/test/test_defaultdict.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_defaultdict.py (original) +++ python/branches/release26-maint/Lib/test/test_defaultdict.py Tue Aug 4 20:49:26 2009 @@ -59,6 +59,7 @@ d1 = defaultdict() self.assertEqual(d1.default_factory, None) self.assertEqual(repr(d1), "defaultdict(None, {})") + self.assertEqual(eval(repr(d1)), d1) d1[11] = 41 self.assertEqual(repr(d1), "defaultdict(None, {11: 41})") d2 = defaultdict(int) @@ -111,6 +112,12 @@ d4[12] self.assertEqual(d4, {42: [], 12: []}) + # Issue 6637: Copy fails for empty default dict + d = defaultdict() + d['a'] = 42 + e = d.copy() + self.assertEqual(e['a'], 42) + def test_shallow_copy(self): d1 = defaultdict(foobar, {1: 1}) d2 = copy.copy(d1) Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Tue Aug 4 20:49:26 2009 @@ -70,6 +70,10 @@ Library ------- +- Issue #6637: defaultdict.copy() did not work when the default factory + was left unspecified. Also, the eval/repr round-trip would fail when + the default_factory was None. + - Issue #1424152: Fix for httplib, urllib2 to support SSL while working through proxy. Original patch by Christopher Li, changes made by Senthil Kumaran. Modified: python/branches/release26-maint/Modules/_collectionsmodule.c ============================================================================== --- python/branches/release26-maint/Modules/_collectionsmodule.c (original) +++ python/branches/release26-maint/Modules/_collectionsmodule.c Tue Aug 4 20:49:26 2009 @@ -1191,6 +1191,9 @@ whose class constructor has the same signature. Subclasses that define a different constructor signature must override copy(). */ + + if (dd->default_factory == NULL) + return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), Py_None, dd, NULL); return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), dd->default_factory, dd, NULL); } @@ -1354,7 +1357,7 @@ Py_ssize_t n = PyTuple_GET_SIZE(args); if (n > 0) { newdefault = PyTuple_GET_ITEM(args, 0); - if (!PyCallable_Check(newdefault)) { + if (!PyCallable_Check(newdefault) && newdefault != Py_None) { PyErr_SetString(PyExc_TypeError, "first argument must be callable"); return -1; From python-checkins at python.org Tue Aug 4 21:08:06 2009 From: python-checkins at python.org (raymond.hettinger) Date: Tue, 04 Aug 2009 19:08:06 -0000 Subject: [Python-checkins] r74300 - in python/trunk: Lib/test/test_defaultdict.py Modules/_collectionsmodule.c Message-ID: Author: raymond.hettinger Date: Tue Aug 4 21:08:05 2009 New Revision: 74300 Log: Issue 6637: defaultdict.copy() failed with an empty factory. Modified: python/trunk/Lib/test/test_defaultdict.py python/trunk/Modules/_collectionsmodule.c Modified: python/trunk/Lib/test/test_defaultdict.py ============================================================================== --- python/trunk/Lib/test/test_defaultdict.py (original) +++ python/trunk/Lib/test/test_defaultdict.py Tue Aug 4 21:08:05 2009 @@ -59,6 +59,7 @@ d1 = defaultdict() self.assertEqual(d1.default_factory, None) self.assertEqual(repr(d1), "defaultdict(None, {})") + self.assertEqual(eval(repr(d1)), d1) d1[11] = 41 self.assertEqual(repr(d1), "defaultdict(None, {11: 41})") d2 = defaultdict(int) @@ -111,6 +112,12 @@ d4[12] self.assertEqual(d4, {42: [], 12: []}) + # Issue 6637: Copy fails for empty default dict + d = defaultdict() + d['a'] = 42 + e = d.copy() + self.assertEqual(e['a'], 42) + def test_shallow_copy(self): d1 = defaultdict(foobar, {1: 1}) d2 = copy.copy(d1) Modified: python/trunk/Modules/_collectionsmodule.c ============================================================================== --- python/trunk/Modules/_collectionsmodule.c (original) +++ python/trunk/Modules/_collectionsmodule.c Tue Aug 4 21:08:05 2009 @@ -1228,6 +1228,9 @@ whose class constructor has the same signature. Subclasses that define a different constructor signature must override copy(). */ + + if (dd->default_factory == NULL) + return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), Py_None, dd, NULL); return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), dd->default_factory, dd, NULL); } @@ -1391,7 +1394,7 @@ Py_ssize_t n = PyTuple_GET_SIZE(args); if (n > 0) { newdefault = PyTuple_GET_ITEM(args, 0); - if (!PyCallable_Check(newdefault)) { + if (!PyCallable_Check(newdefault) && newdefault != Py_None) { PyErr_SetString(PyExc_TypeError, "first argument must be callable"); return -1; From python-checkins at python.org Tue Aug 4 21:13:37 2009 From: python-checkins at python.org (raymond.hettinger) Date: Tue, 04 Aug 2009 19:13:37 -0000 Subject: [Python-checkins] r74301 - in python/branches/release31-maint: Lib/test/test_defaultdict.py Misc/NEWS Modules/_collectionsmodule.c Message-ID: Author: raymond.hettinger Date: Tue Aug 4 21:13:37 2009 New Revision: 74301 Log: Issue 6637: defaultdict.copy() failed with an empty factory. Modified: python/branches/release31-maint/Lib/test/test_defaultdict.py python/branches/release31-maint/Misc/NEWS python/branches/release31-maint/Modules/_collectionsmodule.c Modified: python/branches/release31-maint/Lib/test/test_defaultdict.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_defaultdict.py (original) +++ python/branches/release31-maint/Lib/test/test_defaultdict.py Tue Aug 4 21:13:37 2009 @@ -60,6 +60,7 @@ d1 = defaultdict() self.assertEqual(d1.default_factory, None) self.assertEqual(repr(d1), "defaultdict(None, {})") + self.assertEqual(eval(repr(d1)), d1) d1[11] = 41 self.assertEqual(repr(d1), "defaultdict(None, {11: 41})") d2 = defaultdict(int) @@ -112,6 +113,12 @@ d4[12] self.assertEqual(d4, {42: [], 12: []}) + # Issue 6637: Copy fails for empty default dict + d = defaultdict() + d['a'] = 42 + e = d.copy() + self.assertEqual(e['a'], 42) + def test_shallow_copy(self): d1 = defaultdict(foobar, {1: 1}) d2 = copy.copy(d1) Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Tue Aug 4 21:13:37 2009 @@ -42,6 +42,10 @@ Library ------- +- Issue #6637: defaultdict.copy() did not work when the default factory + was left unspecified. Also, the eval/repr round-trip would fail when + the default_factory was None. + - Issue #2715: Remove remnants of Carbon.File from binhex module. - Issue #6595: The Decimal constructor now allows arbitrary Unicode Modified: python/branches/release31-maint/Modules/_collectionsmodule.c ============================================================================== --- python/branches/release31-maint/Modules/_collectionsmodule.c (original) +++ python/branches/release31-maint/Modules/_collectionsmodule.c Tue Aug 4 21:13:37 2009 @@ -1170,6 +1170,9 @@ whose class constructor has the same signature. Subclasses that define a different constructor signature must override copy(). */ + + if (dd->default_factory == NULL) + return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), Py_None, dd, NULL); return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), dd->default_factory, dd, NULL); } @@ -1316,7 +1319,7 @@ Py_ssize_t n = PyTuple_GET_SIZE(args); if (n > 0) { newdefault = PyTuple_GET_ITEM(args, 0); - if (!PyCallable_Check(newdefault)) { + if (!PyCallable_Check(newdefault) && newdefault != Py_None) { PyErr_SetString(PyExc_TypeError, "first argument must be callable"); return -1; From python-checkins at python.org Tue Aug 4 21:16:40 2009 From: python-checkins at python.org (raymond.hettinger) Date: Tue, 04 Aug 2009 19:16:40 -0000 Subject: [Python-checkins] r74302 - in python/branches/py3k: Lib/test/test_defaultdict.py Modules/_collectionsmodule.c Message-ID: Author: raymond.hettinger Date: Tue Aug 4 21:16:39 2009 New Revision: 74302 Log: Issue 6637: defaultdict.copy() failed with an empty factory. Modified: python/branches/py3k/Lib/test/test_defaultdict.py python/branches/py3k/Modules/_collectionsmodule.c Modified: python/branches/py3k/Lib/test/test_defaultdict.py ============================================================================== --- python/branches/py3k/Lib/test/test_defaultdict.py (original) +++ python/branches/py3k/Lib/test/test_defaultdict.py Tue Aug 4 21:16:39 2009 @@ -60,6 +60,7 @@ d1 = defaultdict() self.assertEqual(d1.default_factory, None) self.assertEqual(repr(d1), "defaultdict(None, {})") + self.assertEqual(eval(repr(d1)), d1) d1[11] = 41 self.assertEqual(repr(d1), "defaultdict(None, {11: 41})") d2 = defaultdict(int) @@ -112,6 +113,12 @@ d4[12] self.assertEqual(d4, {42: [], 12: []}) + # Issue 6637: Copy fails for empty default dict + d = defaultdict() + d['a'] = 42 + e = d.copy() + self.assertEqual(e['a'], 42) + def test_shallow_copy(self): d1 = defaultdict(foobar, {1: 1}) d2 = copy.copy(d1) Modified: python/branches/py3k/Modules/_collectionsmodule.c ============================================================================== --- python/branches/py3k/Modules/_collectionsmodule.c (original) +++ python/branches/py3k/Modules/_collectionsmodule.c Tue Aug 4 21:16:39 2009 @@ -1170,6 +1170,9 @@ whose class constructor has the same signature. Subclasses that define a different constructor signature must override copy(). */ + + if (dd->default_factory == NULL) + return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), Py_None, dd, NULL); return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), dd->default_factory, dd, NULL); } @@ -1316,7 +1319,7 @@ Py_ssize_t n = PyTuple_GET_SIZE(args); if (n > 0) { newdefault = PyTuple_GET_ITEM(args, 0); - if (!PyCallable_Check(newdefault)) { + if (!PyCallable_Check(newdefault) && newdefault != Py_None) { PyErr_SetString(PyExc_TypeError, "first argument must be callable"); return -1; From python-checkins at python.org Tue Aug 4 21:22:35 2009 From: python-checkins at python.org (mark.dickinson) Date: Tue, 04 Aug 2009 19:22:35 -0000 Subject: [Python-checkins] r74303 - python/trunk/Modules/cmathmodule.c Message-ID: Author: mark.dickinson Date: Tue Aug 4 21:22:35 2009 New Revision: 74303 Log: Issue #6644: Fix compile error on AIX. Modified: python/trunk/Modules/cmathmodule.c Modified: python/trunk/Modules/cmathmodule.c ============================================================================== --- python/trunk/Modules/cmathmodule.c (original) +++ python/trunk/Modules/cmathmodule.c Tue Aug 4 21:22:35 2009 @@ -68,7 +68,7 @@ ST_PZERO, /* 3, +0. */ ST_POS, /* 4, positive finite number (nonzero) */ ST_PINF, /* 5, positive infinity */ - ST_NAN, /* 6, Not a Number */ + ST_NAN /* 6, Not a Number */ }; static enum special_types From python-checkins at python.org Tue Aug 4 21:24:17 2009 From: python-checkins at python.org (mark.dickinson) Date: Tue, 04 Aug 2009 19:24:17 -0000 Subject: [Python-checkins] r74304 - in python/branches/release26-maint: Modules/cmathmodule.c Message-ID: Author: mark.dickinson Date: Tue Aug 4 21:24:16 2009 New Revision: 74304 Log: Merged revisions 74303 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74303 | mark.dickinson | 2009-08-04 20:22:35 +0100 (Tue, 04 Aug 2009) | 2 lines Issue #6644: Fix compile error on AIX. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Modules/cmathmodule.c Modified: python/branches/release26-maint/Modules/cmathmodule.c ============================================================================== --- python/branches/release26-maint/Modules/cmathmodule.c (original) +++ python/branches/release26-maint/Modules/cmathmodule.c Tue Aug 4 21:24:16 2009 @@ -68,7 +68,7 @@ ST_PZERO, /* 3, +0. */ ST_POS, /* 4, positive finite number (nonzero) */ ST_PINF, /* 5, positive infinity */ - ST_NAN, /* 6, Not a Number */ + ST_NAN /* 6, Not a Number */ }; static enum special_types From python-checkins at python.org Tue Aug 4 21:25:13 2009 From: python-checkins at python.org (mark.dickinson) Date: Tue, 04 Aug 2009 19:25:13 -0000 Subject: [Python-checkins] r74305 - in python/branches/py3k: Modules/cmathmodule.c Message-ID: Author: mark.dickinson Date: Tue Aug 4 21:25:12 2009 New Revision: 74305 Log: Merged revisions 74303 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74303 | mark.dickinson | 2009-08-04 20:22:35 +0100 (Tue, 04 Aug 2009) | 2 lines Issue #6644: Fix compile error on AIX. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Modules/cmathmodule.c Modified: python/branches/py3k/Modules/cmathmodule.c ============================================================================== --- python/branches/py3k/Modules/cmathmodule.c (original) +++ python/branches/py3k/Modules/cmathmodule.c Tue Aug 4 21:25:12 2009 @@ -68,7 +68,7 @@ ST_PZERO, /* 3, +0. */ ST_POS, /* 4, positive finite number (nonzero) */ ST_PINF, /* 5, positive infinity */ - ST_NAN, /* 6, Not a Number */ + ST_NAN /* 6, Not a Number */ }; static enum special_types From python-checkins at python.org Tue Aug 4 21:26:17 2009 From: python-checkins at python.org (mark.dickinson) Date: Tue, 04 Aug 2009 19:26:17 -0000 Subject: [Python-checkins] r74306 - in python/branches/release31-maint: Modules/cmathmodule.c Message-ID: Author: mark.dickinson Date: Tue Aug 4 21:26:17 2009 New Revision: 74306 Log: Merged revisions 74305 via svnmerge from svn+ssh://pythondev at www.python.org/python/branches/py3k ................ r74305 | mark.dickinson | 2009-08-04 20:25:12 +0100 (Tue, 04 Aug 2009) | 9 lines Merged revisions 74303 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74303 | mark.dickinson | 2009-08-04 20:22:35 +0100 (Tue, 04 Aug 2009) | 2 lines Issue #6644: Fix compile error on AIX. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Modules/cmathmodule.c Modified: python/branches/release31-maint/Modules/cmathmodule.c ============================================================================== --- python/branches/release31-maint/Modules/cmathmodule.c (original) +++ python/branches/release31-maint/Modules/cmathmodule.c Tue Aug 4 21:26:17 2009 @@ -68,7 +68,7 @@ ST_PZERO, /* 3, +0. */ ST_POS, /* 4, positive finite number (nonzero) */ ST_PINF, /* 5, positive infinity */ - ST_NAN, /* 6, Not a Number */ + ST_NAN /* 6, Not a Number */ }; static enum special_types From python-checkins at python.org Tue Aug 4 22:22:44 2009 From: python-checkins at python.org (georg.brandl) Date: Tue, 04 Aug 2009 20:22:44 -0000 Subject: [Python-checkins] r74307 - python/trunk/Doc/tools/sphinxext/layout.html Message-ID: Author: georg.brandl Date: Tue Aug 4 22:22:43 2009 New Revision: 74307 Log: Add donation link to docs footer. Modified: python/trunk/Doc/tools/sphinxext/layout.html Modified: python/trunk/Doc/tools/sphinxext/layout.html ============================================================================== --- python/trunk/Doc/tools/sphinxext/layout.html (original) +++ python/trunk/Doc/tools/sphinxext/layout.html Tue Aug 4 22:22:43 2009 @@ -8,3 +8,14 @@ {{ super() }} {% endblock %} +{% block footer %} +
+ © Copyright {{ copyright|e }}. +
+ The Python Software Foundation is a non-profit corporation. + Please donate. +
+ Last updated on {{ last_updated|e }}. + Created using Sphinx {{ sphinx_version|e }}. +
+{% endblock %} From python-checkins at python.org Tue Aug 4 22:24:30 2009 From: python-checkins at python.org (georg.brandl) Date: Tue, 04 Aug 2009 20:24:30 -0000 Subject: [Python-checkins] r74308 - in python/branches/release26-maint: Doc/tools/sphinxext/layout.html Message-ID: Author: georg.brandl Date: Tue Aug 4 22:24:30 2009 New Revision: 74308 Log: Merged revisions 74307 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74307 | georg.brandl | 2009-08-04 22:22:43 +0200 (Di, 04 Aug 2009) | 1 line Add donation link to docs footer. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Doc/tools/sphinxext/layout.html Modified: python/branches/release26-maint/Doc/tools/sphinxext/layout.html ============================================================================== --- python/branches/release26-maint/Doc/tools/sphinxext/layout.html (original) +++ python/branches/release26-maint/Doc/tools/sphinxext/layout.html Tue Aug 4 22:24:30 2009 @@ -8,3 +8,14 @@ {{ super() }} {% endblock %} +{% block footer %} +
+ © Copyright {{ copyright|e }}. +
+ The Python Software Foundation is a non-profit corporation. + Please donate. +
+ Last updated on {{ last_updated|e }}. + Created using Sphinx {{ sphinx_version|e }}. +
+{% endblock %} From python-checkins at python.org Tue Aug 4 22:25:55 2009 From: python-checkins at python.org (georg.brandl) Date: Tue, 04 Aug 2009 20:25:55 -0000 Subject: [Python-checkins] r74309 - in python/branches/py3k: Doc/tools/sphinxext/layout.html Message-ID: Author: georg.brandl Date: Tue Aug 4 22:25:54 2009 New Revision: 74309 Log: Merged revisions 74307 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74307 | georg.brandl | 2009-08-04 22:22:43 +0200 (Di, 04 Aug 2009) | 1 line Add donation link to docs footer. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Doc/tools/sphinxext/layout.html Modified: python/branches/py3k/Doc/tools/sphinxext/layout.html ============================================================================== --- python/branches/py3k/Doc/tools/sphinxext/layout.html (original) +++ python/branches/py3k/Doc/tools/sphinxext/layout.html Tue Aug 4 22:25:54 2009 @@ -8,3 +8,14 @@ {{ super() }} {% endblock %} +{% block footer %} +
+ © Copyright {{ copyright|e }}. +
+ The Python Software Foundation is a non-profit corporation. + Please donate. +
+ Last updated on {{ last_updated|e }}. + Created using Sphinx {{ sphinx_version|e }}. +
+{% endblock %} From python-checkins at python.org Tue Aug 4 22:26:39 2009 From: python-checkins at python.org (georg.brandl) Date: Tue, 04 Aug 2009 20:26:39 -0000 Subject: [Python-checkins] r74310 - in python/branches/release31-maint: Doc/tools/sphinxext/layout.html Message-ID: Author: georg.brandl Date: Tue Aug 4 22:26:39 2009 New Revision: 74310 Log: Merged revisions 74309 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ................ r74309 | georg.brandl | 2009-08-04 22:25:54 +0200 (Di, 04 Aug 2009) | 9 lines Merged revisions 74307 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74307 | georg.brandl | 2009-08-04 22:22:43 +0200 (Di, 04 Aug 2009) | 1 line Add donation link to docs footer. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/tools/sphinxext/layout.html Modified: python/branches/release31-maint/Doc/tools/sphinxext/layout.html ============================================================================== --- python/branches/release31-maint/Doc/tools/sphinxext/layout.html (original) +++ python/branches/release31-maint/Doc/tools/sphinxext/layout.html Tue Aug 4 22:26:39 2009 @@ -8,3 +8,14 @@ {{ super() }} {% endblock %} +{% block footer %} +
+ © Copyright {{ copyright|e }}. +
+ The Python Software Foundation is a non-profit corporation. + Please donate. +
+ Last updated on {{ last_updated|e }}. + Created using Sphinx {{ sphinx_version|e }}. +
+{% endblock %} From python-checkins at python.org Tue Aug 4 22:29:27 2009 From: python-checkins at python.org (georg.brandl) Date: Tue, 04 Aug 2009 20:29:27 -0000 Subject: [Python-checkins] r74311 - in python/branches/py3k/Objects: abstract.c memoryobject.c Message-ID: Author: georg.brandl Date: Tue Aug 4 22:29:27 2009 New Revision: 74311 Log: Slightly improve buffer-related error message. Modified: python/branches/py3k/Objects/abstract.c python/branches/py3k/Objects/memoryobject.c Modified: python/branches/py3k/Objects/abstract.c ============================================================================== --- python/branches/py3k/Objects/abstract.c (original) +++ python/branches/py3k/Objects/abstract.c Tue Aug 4 22:29:27 2009 @@ -331,7 +331,7 @@ { if (!PyObject_CheckBuffer(obj)) { PyErr_Format(PyExc_TypeError, - "'%100s' does not have the buffer interface", + "'%100s' does not support the buffer interface", Py_TYPE(obj)->tp_name); return -1; } Modified: python/branches/py3k/Objects/memoryobject.c ============================================================================== --- python/branches/py3k/Objects/memoryobject.c (original) +++ python/branches/py3k/Objects/memoryobject.c Tue Aug 4 22:29:27 2009 @@ -255,7 +255,7 @@ if (!PyObject_CheckBuffer(obj)) { PyErr_SetString(PyExc_TypeError, - "object does not have the buffer interface"); + "object does not support the buffer interface"); return NULL; } From python-checkins at python.org Tue Aug 4 23:56:04 2009 From: python-checkins at python.org (mark.dickinson) Date: Tue, 04 Aug 2009 21:56:04 -0000 Subject: [Python-checkins] r74312 - python/trunk/Lib/locale.py Message-ID: Author: mark.dickinson Date: Tue Aug 4 23:56:04 2009 New Revision: 74312 Log: Issue #6620: Slightly safer code for _grouping_intervals in the locale module. Fixes a 'possible use before assignment' warning from pylint. Thanks Vincent Legoll. Modified: python/trunk/Lib/locale.py Modified: python/trunk/Lib/locale.py ============================================================================== --- python/trunk/Lib/locale.py (original) +++ python/trunk/Lib/locale.py Tue Aug 4 23:56:04 2009 @@ -114,12 +114,15 @@ # Iterate over grouping intervals def _grouping_intervals(grouping): + last_interval = None for interval in grouping: # if grouping is -1, we are done if interval == CHAR_MAX: return # 0: re-use last group ad infinitum if interval == 0: + if last_interval is None: + raise ValueError("invalid grouping") while True: yield last_interval yield interval From python-checkins at python.org Tue Aug 4 23:57:18 2009 From: python-checkins at python.org (mark.dickinson) Date: Tue, 04 Aug 2009 21:57:18 -0000 Subject: [Python-checkins] r74313 - in python/branches/py3k: Lib/locale.py Message-ID: Author: mark.dickinson Date: Tue Aug 4 23:57:18 2009 New Revision: 74313 Log: Merged revisions 74312 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74312 | mark.dickinson | 2009-08-04 22:56:04 +0100 (Tue, 04 Aug 2009) | 4 lines Issue #6620: Slightly safer code for _grouping_intervals in the locale module. Fixes a 'possible use before assignment' warning from pylint. Thanks Vincent Legoll. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/locale.py Modified: python/branches/py3k/Lib/locale.py ============================================================================== --- python/branches/py3k/Lib/locale.py (original) +++ python/branches/py3k/Lib/locale.py Tue Aug 4 23:57:18 2009 @@ -121,12 +121,15 @@ # Iterate over grouping intervals def _grouping_intervals(grouping): + last_interval = None for interval in grouping: # if grouping is -1, we are done if interval == CHAR_MAX: return # 0: re-use last group ad infinitum if interval == 0: + if last_interval is None: + raise ValueError("invalid grouping") while True: yield last_interval yield interval From python-checkins at python.org Tue Aug 4 23:58:33 2009 From: python-checkins at python.org (mark.dickinson) Date: Tue, 04 Aug 2009 21:58:33 -0000 Subject: [Python-checkins] r74314 - python/branches/release26-maint Message-ID: Author: mark.dickinson Date: Tue Aug 4 23:58:33 2009 New Revision: 74314 Log: Blocked revisions 74312 via svnmerge ........ r74312 | mark.dickinson | 2009-08-04 22:56:04 +0100 (Tue, 04 Aug 2009) | 4 lines Issue #6620: Slightly safer code for _grouping_intervals in the locale module. Fixes a 'possible use before assignment' warning from pylint. Thanks Vincent Legoll. ........ Modified: python/branches/release26-maint/ (props changed) From python-checkins at python.org Tue Aug 4 23:59:30 2009 From: python-checkins at python.org (mark.dickinson) Date: Tue, 04 Aug 2009 21:59:30 -0000 Subject: [Python-checkins] r74315 - python/branches/release31-maint Message-ID: Author: mark.dickinson Date: Tue Aug 4 23:59:30 2009 New Revision: 74315 Log: Blocked revisions 74313 via svnmerge ................ r74313 | mark.dickinson | 2009-08-04 22:57:18 +0100 (Tue, 04 Aug 2009) | 11 lines Merged revisions 74312 via svnmerge from svn+ssh://pythondev at svn.python.org/python/trunk ........ r74312 | mark.dickinson | 2009-08-04 22:56:04 +0100 (Tue, 04 Aug 2009) | 4 lines Issue #6620: Slightly safer code for _grouping_intervals in the locale module. Fixes a 'possible use before assignment' warning from pylint. Thanks Vincent Legoll. ........ ................ Modified: python/branches/release31-maint/ (props changed) From nnorwitz at gmail.com Wed Aug 5 00:54:13 2009 From: nnorwitz at gmail.com (Neal Norwitz) Date: Tue, 4 Aug 2009 18:54:13 -0400 Subject: [Python-checkins] Python Regression Test Failures refleak (1) Message-ID: <20090804225413.GA19832@python.psfb.org> More important issues: ---------------------- test_distutils leaked [50, -50, 25] references, sum=25 Less important issues: ---------------------- test_cmd_line leaked [25, 0, 0] references, sum=25 test_dumbdbm leaked [-92, 0, 0] references, sum=-92 test_file2k leaked [0, 0, 69] references, sum=69 test_smtplib leaked [-7, 0, -5] references, sum=-12 test_socketserver leaked [0, 0, 80] references, sum=80 test_ssl leaked [0, -420, 420] references, sum=0 test_threading leaked [48, 48, 48] references, sum=144 test_urllib2_localnet leaked [0, 277, -277] references, sum=0 From python-checkins at python.org Wed Aug 5 01:19:14 2009 From: python-checkins at python.org (alexandre.vassalotti) Date: Tue, 04 Aug 2009 23:19:14 -0000 Subject: [Python-checkins] r74316 - in python/branches/py3k: Lib/test/test_memoryio.py Modules/_io/bytesio.c Message-ID: Author: alexandre.vassalotti Date: Wed Aug 5 01:19:13 2009 New Revision: 74316 Log: Issue 5449: Fix io.BytesIO to not accept arbitrary keywords Patch contributed by Erick Tryzelaar. Modified: python/branches/py3k/Lib/test/test_memoryio.py python/branches/py3k/Modules/_io/bytesio.c Modified: python/branches/py3k/Lib/test/test_memoryio.py ============================================================================== --- python/branches/py3k/Lib/test/test_memoryio.py (original) +++ python/branches/py3k/Lib/test/test_memoryio.py Wed Aug 5 01:19:13 2009 @@ -461,6 +461,11 @@ self.assertEqual(memio.write(a), 10) self.assertEqual(memio.getvalue(), buf) + def test_issue5449(self): + buf = self.buftype("1234567890") + self.ioclass(initial_bytes=buf) + self.assertRaises(TypeError, self.ioclass, buf, foo=None) + class TextIOTestMixin: Modified: python/branches/py3k/Modules/_io/bytesio.c ============================================================================== --- python/branches/py3k/Modules/_io/bytesio.c (original) +++ python/branches/py3k/Modules/_io/bytesio.c Wed Aug 5 01:19:13 2009 @@ -759,9 +759,11 @@ static int bytesio_init(bytesio *self, PyObject *args, PyObject *kwds) { + char *kwlist[] = {"initial_bytes", NULL}; PyObject *initvalue = NULL; - if (!PyArg_ParseTuple(args, "|O:BytesIO", &initvalue)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:BytesIO", kwlist, + &initvalue)) return -1; /* In case, __init__ is called multiple times. */ From nnorwitz at gmail.com Wed Aug 5 11:43:51 2009 From: nnorwitz at gmail.com (Neal Norwitz) Date: Wed, 5 Aug 2009 05:43:51 -0400 Subject: [Python-checkins] Python Regression Test Failures refleak (1) Message-ID: <20090805094351.GA17867@python.psfb.org> More important issues: ---------------------- test_urllib2_localnet leaked [-291, 0, 0] references, sum=-291 Less important issues: ---------------------- test_asynchat leaked [139, -139, 0] references, sum=0 test_cmd_line leaked [0, 0, 25] references, sum=25 test_file2k leaked [0, 83, -83] references, sum=0 test_smtplib leaked [0, 88, 161] references, sum=249 test_sys leaked [0, 42, -21] references, sum=21 test_threading leaked [48, 48, 48] references, sum=144 test_threadsignals leaked [-8, 8, 0] references, sum=0 From python-checkins at python.org Wed Aug 5 15:32:54 2009 From: python-checkins at python.org (guilherme.polo) Date: Wed, 05 Aug 2009 13:32:54 -0000 Subject: [Python-checkins] r74317 - in python/branches/tk_and_idle_maintenance: .bzrignore .hgignore Demo/sockets/mcast.py Demo/turtle/tdemo_chaos.py Doc/Makefile Doc/c-api/arg.rst Doc/c-api/buffer.rst Doc/c-api/float.rst Doc/c-api/import.rst Doc/c-api/int.rst Doc/c-api/method.rst Doc/c-api/sys.rst Doc/c-api/tuple.rst Doc/c-api/type.rst Doc/c-api/typeobj.rst Doc/c-api/unicode.rst Doc/copyright.rst Doc/distutils/apiref.rst Doc/extending/extending.rst Doc/extending/newtypes.rst Doc/glossary.rst Doc/howto/doanddont.rst Doc/howto/urllib2.rst Doc/includes/sqlite3/text_factory.py Doc/library/2to3.rst Doc/library/__future__.rst Doc/library/_winreg.rst Doc/library/aifc.rst Doc/library/anydbm.rst Doc/library/array.rst Doc/library/ast.rst Doc/library/audioop.rst Doc/library/cd.rst Doc/library/cgi.rst Doc/library/cmath.rst Doc/library/codecs.rst Doc/library/collections.rst Doc/library/compiler.rst Doc/library/configparser.rst Doc/library/csv.rst Doc/library/curses.rst Doc/library/dbhash.rst Doc/library/decimal.rst Doc/library/dis.rst Doc/library/dl.rst Doc/library/exceptions.rst Doc/library/fileinput.rst Doc/library/fractions.rst Doc/library/functions.rst Doc/library/future_builtins.rst Doc/library/gc.rst Doc/library/gettext.rst Doc/library/heapq.rst Doc/library/imp.rst Doc/library/imputil.rst Doc/library/internet.rst Doc/library/intro.rst Doc/library/io.rst Doc/library/ipaddr.rst Doc/library/locale.rst Doc/library/logging.rst Doc/library/macostools.rst Doc/library/mailbox.rst Doc/library/multifile.rst Doc/library/multiprocessing.rst Doc/library/numbers.rst Doc/library/optparse.rst Doc/library/os.rst Doc/library/ossaudiodev.rst Doc/library/posixfile.rst Doc/library/pprint.rst Doc/library/pyclbr.rst Doc/library/re.rst Doc/library/repr.rst Doc/library/select.rst Doc/library/sets.rst Doc/library/shelve.rst Doc/library/simplexmlrpcserver.rst Doc/library/socket.rst Doc/library/socketserver.rst Doc/library/sqlite3.rst Doc/library/stat.rst Doc/library/stdtypes.rst Doc/library/string.rst Doc/library/stringio.rst Doc/library/subprocess.rst Doc/library/sunau.rst Doc/library/sunaudio.rst Doc/library/symtable.rst Doc/library/sys.rst Doc/library/tempfile.rst Doc/library/threading.rst Doc/library/timeit.rst Doc/library/tkinter.rst Doc/library/turtle.rst Doc/library/undoc.rst Doc/library/unittest.rst Doc/library/urllib.rst Doc/library/warnings.rst Doc/library/wave.rst Doc/library/weakref.rst Doc/library/webbrowser.rst Doc/library/xml.etree.elementtree.rst Doc/library/xmlrpclib.rst Doc/library/zipimport.rst Doc/make.bat Doc/reference/datamodel.rst Doc/reference/executionmodel.rst Doc/reference/expressions.rst Doc/reference/simple_stmts.rst Doc/tools/sphinxext/indexsidebar.html Doc/tools/sphinxext/layout.html Doc/tutorial/classes.rst Doc/tutorial/errors.rst Doc/tutorial/inputoutput.rst Doc/tutorial/interactive.rst Doc/tutorial/modules.rst Doc/tutorial/stdlib2.rst Doc/using/cmdline.rst Doc/whatsnew/2.2.rst Doc/whatsnew/2.6.rst Include/longintrepr.h Include/pymath.h Include/pyport.h Include/symtable.h Lib/BaseHTTPServer.py Lib/DocXMLRPCServer.py Lib/SimpleXMLRPCServer.py Lib/SocketServer.py Lib/collections.py Lib/contextlib.py Lib/ctypes/test/test_anon.py Lib/ctypes/test/test_array_in_pointer.py Lib/ctypes/test/test_arrays.py Lib/ctypes/test/test_as_parameter.py Lib/ctypes/test/test_bitfields.py Lib/ctypes/test/test_buffers.py Lib/ctypes/test/test_byteswap.py Lib/ctypes/test/test_callbacks.py Lib/ctypes/test/test_cast.py Lib/ctypes/test/test_cfuncs.py Lib/ctypes/test/test_checkretval.py Lib/ctypes/test/test_errno.py Lib/ctypes/test/test_find.py Lib/ctypes/test/test_frombuffer.py Lib/ctypes/test/test_funcptr.py Lib/ctypes/test/test_functions.py Lib/ctypes/test/test_incomplete.py Lib/ctypes/test/test_init.py Lib/ctypes/test/test_internals.py Lib/ctypes/test/test_keeprefs.py Lib/ctypes/test/test_libc.py Lib/ctypes/test/test_loading.py Lib/ctypes/test/test_macholib.py Lib/ctypes/test/test_memfunctions.py Lib/ctypes/test/test_numbers.py Lib/ctypes/test/test_parameters.py Lib/ctypes/test/test_pep3118.py Lib/ctypes/test/test_pickling.py Lib/ctypes/test/test_pointers.py Lib/ctypes/test/test_prototypes.py Lib/ctypes/test/test_python_api.py Lib/ctypes/test/test_random_things.py Lib/ctypes/test/test_refcounts.py Lib/ctypes/test/test_repr.py Lib/ctypes/test/test_returnfuncptrs.py Lib/ctypes/test/test_simplesubclasses.py Lib/ctypes/test/test_sizes.py Lib/ctypes/test/test_slicing.py Lib/ctypes/test/test_stringptr.py Lib/ctypes/test/test_strings.py Lib/ctypes/test/test_struct_fields.py Lib/ctypes/test/test_structures.py Lib/ctypes/test/test_unaligned_structures.py Lib/ctypes/test/test_unicode.py Lib/ctypes/test/test_values.py Lib/ctypes/test/test_varsize_struct.py Lib/ctypes/test/test_win32.py Lib/decimal.py Lib/distutils/command/bdist_dumb.py Lib/distutils/command/bdist_msi.py Lib/distutils/command/build.py Lib/distutils/command/build_ext.py Lib/distutils/command/build_py.py Lib/distutils/cygwinccompiler.py Lib/distutils/dist.py Lib/distutils/emxccompiler.py Lib/distutils/extension.py Lib/distutils/file_util.py Lib/distutils/tests/test_archive_util.py Lib/distutils/tests/test_bdist_dumb.py Lib/distutils/tests/test_bdist_rpm.py Lib/distutils/tests/test_bdist_wininst.py Lib/distutils/tests/test_build.py Lib/distutils/tests/test_build_clib.py Lib/distutils/tests/test_build_ext.py Lib/distutils/tests/test_build_py.py Lib/distutils/tests/test_build_scripts.py Lib/distutils/tests/test_clean.py Lib/distutils/tests/test_cmd.py Lib/distutils/tests/test_config.py Lib/distutils/tests/test_config_cmd.py Lib/distutils/tests/test_cygwinccompiler.py Lib/distutils/tests/test_dist.py Lib/distutils/tests/test_emxccompiler.py Lib/distutils/tests/test_file_util.py Lib/distutils/tests/test_install.py Lib/distutils/tests/test_install_data.py Lib/distutils/tests/test_install_lib.py Lib/distutils/tests/test_install_scripts.py Lib/distutils/tests/test_msvc9compiler.py Lib/distutils/tests/test_register.py Lib/distutils/tests/test_sysconfig.py Lib/distutils/tests/test_unixccompiler.py Lib/distutils/tests/test_upload.py Lib/distutils/tests/test_util.py Lib/distutils/unixccompiler.py Lib/distutils/util.py Lib/email/base64mime.py Lib/email/header.py Lib/email/message.py Lib/email/mime/nonmultipart.py Lib/email/quoprimime.py Lib/email/test/test_email.py Lib/email/test/test_email_codecs.py Lib/email/test/test_email_renamed.py Lib/email/test/test_email_torture.py Lib/encodings/cp720.py Lib/fractions.py Lib/idlelib/configDialog.py Lib/inspect.py Lib/ipaddr.py Lib/json/tests/test_decode.py Lib/json/tests/test_speedups.py Lib/lib-tk/test/test_tkinter/test_loadtk.py Lib/lib-tk/test/test_tkinter/test_text.py Lib/lib-tk/test/test_ttk/test_extensions.py Lib/lib-tk/test/test_ttk/test_functions.py Lib/lib-tk/test/test_ttk/test_style.py Lib/lib-tk/test/test_ttk/test_widgets.py Lib/lib2to3 Lib/lib2to3/fixer_base.py Lib/lib2to3/fixes/fix_dict.py Lib/lib2to3/fixes/fix_import.py Lib/lib2to3/fixes/fix_imports.py Lib/lib2to3/fixes/fix_long.py Lib/lib2to3/fixes/fix_ne.py Lib/lib2to3/fixes/fix_numliterals.py Lib/lib2to3/fixes/fix_operator.py Lib/lib2to3/fixes/fix_print.py Lib/lib2to3/fixes/fix_urllib.py Lib/lib2to3/main.py Lib/lib2to3/patcomp.py Lib/lib2to3/pgen2/grammar.py Lib/lib2to3/pygram.py Lib/lib2to3/refactor.py Lib/lib2to3/tests/data/different_encoding.py Lib/lib2to3/tests/test_fixers.py Lib/lib2to3/tests/test_pytree.py Lib/lib2to3/tests/test_refactor.py Lib/lib2to3/tests/test_util.py Lib/locale.py Lib/logging/__init__.py Lib/multiprocessing/pool.py Lib/multiprocessing/process.py Lib/platform.py Lib/pydoc.py Lib/sqlite3/test/dbapi.py Lib/sqlite3/test/factory.py Lib/sqlite3/test/hooks.py Lib/sqlite3/test/py25tests.py Lib/sqlite3/test/regression.py Lib/sqlite3/test/transactions.py Lib/sqlite3/test/types.py Lib/sqlite3/test/userfunctions.py Lib/subprocess.py Lib/symtable.py Lib/tempfile.py Lib/test/data Lib/test/mapping_tests.py Lib/test/pickletester.py Lib/test/regrtest.py Lib/test/test_StringIO.py Lib/test/test___all__.py Lib/test/test___future__.py Lib/test/test_abc.py Lib/test/test_abstract_numbers.py Lib/test/test_array.py Lib/test/test_ast.py Lib/test/test_augassign.py Lib/test/test_bigmem.py Lib/test/test_binascii.py Lib/test/test_binop.py Lib/test/test_bisect.py Lib/test/test_bool.py Lib/test/test_bsddb.py Lib/test/test_bufio.py Lib/test/test_builtin.py Lib/test/test_bytes.py Lib/test/test_capi.py Lib/test/test_cfgparser.py Lib/test/test_cgi.py Lib/test/test_cmath.py Lib/test/test_cmd_line_script.py Lib/test/test_codecs.py Lib/test/test_codeop.py Lib/test/test_coercion.py Lib/test/test_collections.py Lib/test/test_commands.py Lib/test/test_compile.py Lib/test/test_compiler.py Lib/test/test_complex.py Lib/test/test_contains.py Lib/test/test_contextlib.py Lib/test/test_cookielib.py Lib/test/test_copy.py Lib/test/test_copy_reg.py Lib/test/test_csv.py Lib/test/test_datetime.py Lib/test/test_dbm.py Lib/test/test_decimal.py Lib/test/test_defaultdict.py Lib/test/test_deque.py Lib/test/test_descr.py Lib/test/test_dict.py Lib/test/test_dircache.py Lib/test/test_doctest.py Lib/test/test_docxmlrpc.py Lib/test/test_dummy_thread.py Lib/test/test_epoll.py Lib/test/test_errno.py Lib/test/test_exceptions.py Lib/test/test_extcall.py Lib/test/test_file.py Lib/test/test_file2k.py Lib/test/test_filecmp.py Lib/test/test_fileinput.py Lib/test/test_fileio.py Lib/test/test_float.py Lib/test/test_fnmatch.py Lib/test/test_fractions.py Lib/test/test_ftplib.py Lib/test/test_funcattrs.py Lib/test/test_functools.py Lib/test/test_future4.py Lib/test/test_gdbm.py Lib/test/test_generators.py Lib/test/test_genericpath.py Lib/test/test_getargs2.py Lib/test/test_getopt.py Lib/test/test_gettext.py Lib/test/test_grammar.py Lib/test/test_grp.py Lib/test/test_gzip.py Lib/test/test_hash.py Lib/test/test_hashlib.py Lib/test/test_heapq.py Lib/test/test_hmac.py Lib/test/test_hotshot.py Lib/test/test_httplib.py Lib/test/test_httpservers.py Lib/test/test_imp.py Lib/test/test_import.py Lib/test/test_importhooks.py Lib/test/test_index.py Lib/test/test_inspect.py Lib/test/test_int.py Lib/test/test_io.py Lib/test/test_ioctl.py Lib/test/test_ipaddr.py Lib/test/test_iter.py Lib/test/test_itertools.py Lib/test/test_kqueue.py Lib/test/test_largefile.py Lib/test/test_linecache.py Lib/test/test_list.py Lib/test/test_logging.py Lib/test/test_long.py Lib/test/test_macpath.py Lib/test/test_mailbox.py Lib/test/test_marshal.py Lib/test/test_math.py Lib/test/test_memoryio.py Lib/test/test_memoryview.py Lib/test/test_mhlib.py Lib/test/test_mimetools.py Lib/test/test_mimetypes.py Lib/test/test_minidom.py Lib/test/test_mmap.py Lib/test/test_module.py Lib/test/test_modulefinder.py Lib/test/test_multibytecodec.py Lib/test/test_multiprocessing.py Lib/test/test_mutex.py Lib/test/test_netrc.py Lib/test/test_new.py Lib/test/test_normalization.py Lib/test/test_old_mailbox.py Lib/test/test_opcodes.py Lib/test/test_operator.py Lib/test/test_optparse.py Lib/test/test_os.py Lib/test/test_ossaudiodev.py Lib/test/test_peepholer.py Lib/test/test_pep247.py Lib/test/test_pep277.py Lib/test/test_pep352.py Lib/test/test_pkg.py Lib/test/test_pkgimport.py Lib/test/test_platform.py Lib/test/test_popen.py Lib/test/test_poplib.py Lib/test/test_posix.py Lib/test/test_posixpath.py Lib/test/test_pprint.py Lib/test/test_print.py Lib/test/test_property.py Lib/test/test_pwd.py Lib/test/test_py3kwarn.py Lib/test/test_pyclbr.py Lib/test/test_pydoc.py Lib/test/test_queue.py Lib/test/test_quopri.py Lib/test/test_random.py Lib/test/test_re.py Lib/test/test_repr.py Lib/test/test_rfc822.py Lib/test/test_richcmp.py Lib/test/test_robotparser.py Lib/test/test_runpy.py Lib/test/test_scope.py Lib/test/test_set.py Lib/test/test_sets.py Lib/test/test_sha.py Lib/test/test_shutil.py Lib/test/test_signal.py Lib/test/test_site.py Lib/test/test_slice.py Lib/test/test_socket.py Lib/test/test_str.py Lib/test/test_string.py Lib/test/test_stringprep.py Lib/test/test_strop.py Lib/test/test_strptime.py Lib/test/test_struct.py Lib/test/test_structseq.py Lib/test/test_subprocess.py Lib/test/test_support.py Lib/test/test_symtable.py Lib/test/test_sys.py Lib/test/test_tarfile.py Lib/test/test_tcl.py Lib/test/test_tempfile.py Lib/test/test_threading.py Lib/test/test_threading_local.py Lib/test/test_time.py Lib/test/test_timeout.py Lib/test/test_traceback.py Lib/test/test_tuple.py Lib/test/test_unary.py Lib/test/test_unicode.py Lib/test/test_unicode_file.py Lib/test/test_unicodedata.py Lib/test/test_unittest.py Lib/test/test_urllib.py Lib/test/test_urllib2.py Lib/test/test_urllib2_localnet.py Lib/test/test_urllib2net.py Lib/test/test_urllibnet.py Lib/test/test_userdict.py Lib/test/test_userstring.py Lib/test/test_uuid.py Lib/test/test_warnings.py Lib/test/test_weakref.py Lib/test/test_with.py Lib/test/test_wsgiref.py Lib/test/test_xdrlib.py Lib/test/test_xmlrpc.py Lib/test/test_xrange.py Lib/test/test_zipfile.py Lib/test/test_zipimport.py Lib/test/test_zipimport_support.py Lib/test/test_zlib.py Lib/unittest Lib/unittest.py Lib/urllib2.py Lib/webbrowser.py Lib/wsgiref/headers.py Lib/xml/sax/expatreader.py Lib/xmlrpclib.py Lib/zipfile.py Makefile.pre.in Misc/ACKS Misc/HISTORY Misc/NEWS Misc/Porting Misc/build.sh Misc/cheatsheet Misc/developers.txt Misc/gdbinit Misc/python.man Modules/_collectionsmodule.c Modules/_cursesmodule.c Modules/_io/fileio.c Modules/_multiprocessing/multiprocessing.h Modules/_sre.c Modules/_struct.c Modules/arraymodule.c Modules/cPickle.c Modules/cmathmodule.c Modules/itertoolsmodule.c Modules/main.c Modules/md5.c Modules/mmapmodule.c Modules/nismodule.c Modules/operator.c Modules/posixmodule.c Modules/selectmodule.c Modules/symtablemodule.c Objects/bytearrayobject.c Objects/dictobject.c Objects/fileobject.c Objects/funcobject.c Objects/memoryobject.c Objects/methodobject.c Objects/setobject.c Objects/stringlib/formatter.h Objects/unicodeobject.c PC/VS7.1/pcbuild.sln PC/VS8.0/pcbuild.sln PC/bdist_wininst/wininst-7.1.sln PC/bdist_wininst/wininst-8.sln PC/example_nt/example.sln PC/pyconfig.h PCbuild/pcbuild.sln Python/_warnings.c Python/ast.c Python/bltinmodule.c Python/ceval.c Python/compile.c Python/getargs.c Python/import.c Python/peephole.c Python/symtable.c Python/sysmodule.c README Tools/msi/msi.py Tools/unicode/genwincodec.py Tools/unicode/genwincodecs.bat configure configure.in pyconfig.h.in setup.py Message-ID: Author: guilherme.polo Date: Wed Aug 5 15:32:47 2009 New Revision: 74317 Log: Merged revisions 73485-73486,73488-73490,73495-73496,73499,73501-73502,73509,73511,73513-73514,73518-73519,73529,73532,73534,73536-73537,73540,73544,73546,73554,73557,73563-73565,73575-73577,73595-73596,73598,73603,73605-73606,73614-73615,73627,73638,73653,73660,73665,73669,73675,73677,73679,73681,73683,73686,73688,73693-73694,73697,73701,73704-73708,73710,73712-73714,73717,73720,73725,73738,73744,73750,73756-73757,73762,73767,73773-73774,73776,73778,73781,73786,73790,73801,73812,73814-73815,73818-73819,73821-73822,73824-73827,73834,73839,73841,73846-73847,73854,73858,73863-73864,73870-73871,73873,73877,73879-73880,73884,73888,73891,73895,73899-73901,73905-73908,73916,73921,73925-73926,73930-73933,73937-73940,73944-73946,73951-73952,73954,73962-73963,73970,73979,73985-73986,73988-73991,73994-73995,73998,74000-74002,74005-74008,74011,74014,74019-74024,74028-74029,74031-74033,74038-74040,74042,74044,74048,74051-74052,74067,74069,74072,74074-74075,74077,74080,74083,74089,74095,74098,74100,74111,74114,74117,74119,74123,74134,74139,74147-74148,74150,74152,74163,74167,74173,74175,74179,74184-74185,74187-74189,74192-74194,74197,74200-74201,74205,74207,74209-74210,74216,74219,74225,74228,74230,74234,74239-74240,74243,74245,74252-74253,74256,74258-74261,74265,74269,74277,74281,74285,74291,74300,74303,74307,74312 via svnmerge from svn+ssh://pythondev/python/trunk ................ r73485 | benjamin.peterson | 2009-06-19 19:07:47 -0300 (Fri, 19 Jun 2009) | 1 line remove duplicate test ................ r73486 | benjamin.peterson | 2009-06-19 19:09:17 -0300 (Fri, 19 Jun 2009) | 1 line add missing assertion #6313 ................ r73488 | benjamin.peterson | 2009-06-19 19:16:28 -0300 (Fri, 19 Jun 2009) | 1 line show that this one isn't used ................ r73489 | benjamin.peterson | 2009-06-19 19:21:12 -0300 (Fri, 19 Jun 2009) | 1 line use closures ................ r73490 | tarek.ziade | 2009-06-20 10:57:20 -0300 (Sat, 20 Jun 2009) | 1 line Fixed #6164 AIX specific linker argument in Distutils unixcompiler ................ r73495 | guilherme.polo | 2009-06-21 14:22:50 -0300 (Sun, 21 Jun 2009) | 4 lines Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to Lib/lib-tk/test/test_tkinter/test_loadtk in order to follow the behaviour of test_ttkguionly. ................ r73496 | vinay.sajip | 2009-06-21 14:37:27 -0300 (Sun, 21 Jun 2009) | 1 line Issue #6314: logging.basicConfig() performs extra checks on the "level" argument. ................ r73499 | steven.bethard | 2009-06-21 18:03:41 -0300 (Sun, 21 Jun 2009) | 1 line Fix memory bug in bdist_msi. (Commit okayed in issue6319.) ................ r73501 | benjamin.peterson | 2009-06-21 20:01:07 -0300 (Sun, 21 Jun 2009) | 1 line don't need to add the name 'lambda' as assigned ................ r73502 | benjamin.peterson | 2009-06-21 20:03:36 -0300 (Sun, 21 Jun 2009) | 1 line remove tmpname support since it's no longer used ................ r73509 | amaury.forgeotdarc | 2009-06-22 16:33:48 -0300 (Mon, 22 Jun 2009) | 2 lines #4490 Fix sample code run by "python -m xml.sax.xmlreader" ................ r73511 | r.david.murray | 2009-06-22 19:11:04 -0300 (Mon, 22 Jun 2009) | 2 lines Improve English phrasing. ................ r73513 | benjamin.peterson | 2009-06-22 22:18:57 -0300 (Mon, 22 Jun 2009) | 1 line fix grammar ................ r73514 | benjamin.peterson | 2009-06-23 00:01:56 -0300 (Tue, 23 Jun 2009) | 1 line remove some unused symtable constants ................ r73518 | nick.coghlan | 2009-06-23 07:19:30 -0300 (Tue, 23 Jun 2009) | 1 line Issue 6288: Update contextlib.nested() docstring to reflect new documentation ................ r73519 | nick.coghlan | 2009-06-23 07:51:02 -0300 (Tue, 23 Jun 2009) | 1 line Remove markup from docstring ................ r73529 | r.david.murray | 2009-06-23 15:02:46 -0300 (Tue, 23 Jun 2009) | 4 lines Fix issue 5230 by having pydoc's safeimport check to see if the import error was thrown from itself in order to decide if the module can't be found. Thanks to Lucas Prado Melo for collaborating on the fix and tests. ................ r73532 | raymond.hettinger | 2009-06-23 17:59:43 -0300 (Tue, 23 Jun 2009) | 3 lines Issue 6329: Fix iteration for memoryviews. ................ r73534 | amaury.forgeotdarc | 2009-06-23 18:09:09 -0300 (Tue, 23 Jun 2009) | 2 lines Remove the ipaddr module per discussion on python-dev ................ r73536 | raymond.hettinger | 2009-06-23 18:32:28 -0300 (Tue, 23 Jun 2009) | 1 line Issue 6305: Clarify error message for large arguments to itertools.islice(). ................ r73537 | amaury.forgeotdarc | 2009-06-23 18:53:46 -0300 (Tue, 23 Jun 2009) | 3 lines Remove last remnants of the ipaddr package. The changes in mcast.py come from the first version of the patch for issue5379. ................ r73540 | raymond.hettinger | 2009-06-23 19:20:04 -0300 (Tue, 23 Jun 2009) | 1 line Add procedural note. ................ r73544 | georg.brandl | 2009-06-24 03:41:19 -0300 (Wed, 24 Jun 2009) | 1 line #6332: fix word dupes throughout the source. ................ r73546 | kristjan.jonsson | 2009-06-24 06:17:04 -0300 (Wed, 24 Jun 2009) | 2 lines http://bugs.python.org/issue6192 Move the newly introduced disable_nagle_algorithm flag into the StreamRequestHandler, where it is more appropriate. ................ r73554 | r.david.murray | 2009-06-25 11:21:06 -0300 (Thu, 25 Jun 2009) | 2 lines Add a couple of missing function alias declarations to the turtle docs. ................ r73557 | r.david.murray | 2009-06-25 14:29:39 -0300 (Thu, 25 Jun 2009) | 3 lines Issue 6340: update by Gregor Lingl of his tdemo_chaos demo program. Functionally equivalent, clearer code, English comments. ................ r73563 | amaury.forgeotdarc | 2009-06-25 18:29:32 -0300 (Thu, 25 Jun 2009) | 2 lines Fix a compilation warning on Windows ................ r73564 | amaury.forgeotdarc | 2009-06-25 19:29:29 -0300 (Thu, 25 Jun 2009) | 6 lines #2016 Fix a crash in function call when the **kwargs dictionary is mutated during the function call setup. This even gives a slight speedup, probably because tuple allocation is faster than PyMem_NEW. ................ r73565 | gregory.p.smith | 2009-06-26 04:50:21 -0300 (Fri, 26 Jun 2009) | 2 lines Fixes the last problem mentioned in issue1202. ................ r73575 | benjamin.peterson | 2009-06-26 13:49:06 -0300 (Fri, 26 Jun 2009) | 1 line mark 3.1 as stable docs ................ r73576 | benjamin.peterson | 2009-06-26 20:37:06 -0300 (Fri, 26 Jun 2009) | 1 line document is_declared_global() ................ r73577 | benjamin.peterson | 2009-06-27 11:16:23 -0300 (Sat, 27 Jun 2009) | 1 line link to extensive generator docs in the reference manual ................ r73595 | ezio.melotti | 2009-06-27 20:45:39 -0300 (Sat, 27 Jun 2009) | 1 line stmt and setup can contain multiple statements, see #5896 ................ r73596 | ezio.melotti | 2009-06-27 21:07:45 -0300 (Sat, 27 Jun 2009) | 1 line Fixed a wrong apostrophe ................ r73598 | martin.v.loewis | 2009-06-28 06:32:39 -0300 (Sun, 28 Jun 2009) | 3 lines Issue 5390: Add uninstall icon independent of whether file extensions are installed. ................ r73603 | hirokazu.yamamoto | 2009-06-28 07:23:00 -0300 (Sun, 28 Jun 2009) | 1 line Issue #4856: Remove checks for win NT. ................ r73605 | georg.brandl | 2009-06-28 09:10:18 -0300 (Sun, 28 Jun 2009) | 1 line Remove stray pychecker directive. ................ r73606 | martin.v.loewis | 2009-06-28 09:24:23 -0300 (Sun, 28 Jun 2009) | 2 lines Fix types in logic to compute help file name. ................ r73614 | benjamin.peterson | 2009-06-28 13:08:02 -0300 (Sun, 28 Jun 2009) | 1 line add two generic macros for peeking and setting in the stack ................ r73615 | benjamin.peterson | 2009-06-28 13:14:07 -0300 (Sun, 28 Jun 2009) | 1 line use stack macros ................ r73627 | benjamin.peterson | 2009-06-28 16:27:55 -0300 (Sun, 28 Jun 2009) | 1 line return locals and cells in get_locals() not bound globals, though ................ r73638 | kristjan.jonsson | 2009-06-28 18:04:17 -0300 (Sun, 28 Jun 2009) | 2 lines http://bugs.python.org/issue6267 Cumulative patch to http and xmlrpc ................ r73653 | mark.dickinson | 2009-06-28 18:48:15 -0300 (Sun, 28 Jun 2009) | 1 line More Decimal quote fixing; backport of r73642 ................ r73660 | mark.dickinson | 2009-06-28 19:37:13 -0300 (Sun, 28 Jun 2009) | 1 line Remove unused stdint.h includes ................ r73665 | alexandre.vassalotti | 2009-06-28 22:01:51 -0300 (Sun, 28 Jun 2009) | 2 lines Update docstrings for sys.getdlopenflags() and sys.setdlopenflags(). ................ r73669 | benjamin.peterson | 2009-06-29 00:30:55 -0300 (Mon, 29 Jun 2009) | 1 line update to sphinx 0.6.2 ................ r73675 | hirokazu.yamamoto | 2009-06-29 08:27:03 -0300 (Mon, 29 Jun 2009) | 3 lines Issue #4856: Py_GetFileAttributesEx[AW] are not needed because GetFileAttributesEx[AW] won't fail with ERROR_CALL_NOT_IMPLEMENTED on win NT. Reviewed by Amaury Forgeot d'Arc. ................ r73677 | hirokazu.yamamoto | 2009-06-29 10:25:16 -0300 (Mon, 29 Jun 2009) | 2 lines Issue #6344: Fixed a crash of mmap.read() when passed a negative argument. Reviewed by Amaury Forgeot d'Arc. ................ r73679 | antoine.pitrou | 2009-06-29 11:14:56 -0300 (Mon, 29 Jun 2009) | 3 lines Backport fix for buglet from py3k ................ r73681 | hirokazu.yamamoto | 2009-06-29 11:29:31 -0300 (Mon, 29 Jun 2009) | 1 line Fixed NEWS. ................ r73683 | georg.brandl | 2009-06-29 11:44:49 -0300 (Mon, 29 Jun 2009) | 1 line Fix error handling in PyCode_Optimize, by Alexander Schremmer at EuroPython sprint. ................ r73686 | hirokazu.yamamoto | 2009-06-29 12:52:21 -0300 (Mon, 29 Jun 2009) | 1 line Issue #6368: Fixed unused variable warning on Unix. ................ r73688 | tarek.ziade | 2009-06-29 13:13:39 -0300 (Mon, 29 Jun 2009) | 1 line Fixed 6365: wrong inplace location for build_ext if the extension had dots ................ r73693 | jesse.noller | 2009-06-29 15:20:34 -0300 (Mon, 29 Jun 2009) | 1 line Bug 5906: add a documentation note for unix daemons vs. multiprocessing daemons ................ r73694 | jesse.noller | 2009-06-29 15:24:26 -0300 (Mon, 29 Jun 2009) | 1 line Issue 5740: multiprocessing.connection.* authkey fixes ................ r73697 | raymond.hettinger | 2009-06-29 16:10:29 -0300 (Mon, 29 Jun 2009) | 1 line Issue 6370: Performance issue with collections.Counter(). ................ r73701 | mark.dickinson | 2009-06-30 12:32:30 -0300 (Tue, 30 Jun 2009) | 3 lines Issue #6347: Add inttypes.h to the pyport.h #includes; fixes a build failure on HP-UX 11.00. ................ r73704 | georg.brandl | 2009-06-30 13:15:43 -0300 (Tue, 30 Jun 2009) | 1 line #6376: fix copy-n-paste oversight. ................ r73705 | georg.brandl | 2009-06-30 13:17:28 -0300 (Tue, 30 Jun 2009) | 1 line #6374: add a bit of explanation about shell=True on Windows. ................ r73706 | georg.brandl | 2009-06-30 13:18:55 -0300 (Tue, 30 Jun 2009) | 1 line #6384: Add a heading for the exception hierarchy. ................ r73707 | georg.brandl | 2009-06-30 13:35:11 -0300 (Tue, 30 Jun 2009) | 1 line #6371: fix link targets. ................ r73708 | jesse.noller | 2009-06-30 14:11:52 -0300 (Tue, 30 Jun 2009) | 1 line Resolves issues 5155, 5313, 5331 - bad file descriptor error with processes in processes ................ r73710 | benjamin.peterson | 2009-06-30 19:14:33 -0300 (Tue, 30 Jun 2009) | 1 line provide a dummy __exit__ on windows ................ r73712 | ezio.melotti | 2009-06-30 19:51:06 -0300 (Tue, 30 Jun 2009) | 1 line Fixed defaultTestCase -> defaultTestResult ................ r73713 | ezio.melotti | 2009-06-30 19:56:16 -0300 (Tue, 30 Jun 2009) | 1 line Fixed a backslash that was not supposed to be there ................ r73714 | benjamin.peterson | 2009-06-30 19:57:08 -0300 (Tue, 30 Jun 2009) | 1 line convert usage of fail* to assert* ................ r73717 | benjamin.peterson | 2009-06-30 20:30:12 -0300 (Tue, 30 Jun 2009) | 1 line use assert* methods in test_unittest ................ r73720 | benjamin.peterson | 2009-06-30 21:36:41 -0300 (Tue, 30 Jun 2009) | 4 lines fix a few cases where automated fail -> assert translation messed up Thanks Joe Amenta ................ r73725 | benjamin.peterson | 2009-06-30 21:49:09 -0300 (Tue, 30 Jun 2009) | 21 lines Merged revisions 73379,73388,73507,73722 via svnmerge from svn+ssh://pythondev at svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r73379 | benjamin.peterson | 2009-06-11 18:06:21 -0500 (Thu, 11 Jun 2009) | 1 line use a real conditional expresion ........ r73388 | benjamin.peterson | 2009-06-12 09:44:29 -0500 (Fri, 12 Jun 2009) | 1 line fix typo in last fix ........ r73507 | benjamin.peterson | 2009-06-22 13:32:04 -0500 (Mon, 22 Jun 2009) | 1 line remove svn:executable property ........ r73722 | benjamin.peterson | 2009-06-30 19:44:30 -0500 (Tue, 30 Jun 2009) | 1 line replace fail* with assert* ........ ................ r73738 | r.david.murray | 2009-06-30 23:49:10 -0300 (Tue, 30 Jun 2009) | 2 lines Make punctuation prettier and break up run-on sentence. ................ r73744 | benjamin.peterson | 2009-07-01 10:34:35 -0300 (Wed, 01 Jul 2009) | 1 line proxy the __exit__ call ................ r73750 | benjamin.peterson | 2009-07-01 20:45:19 -0300 (Wed, 01 Jul 2009) | 1 line small optimization: avoid popping the current block until we have to ................ r73756 | tarek.ziade | 2009-07-02 09:47:54 -0300 (Thu, 02 Jul 2009) | 1 line raising bdist_dumb test coverage ................ r73757 | tarek.ziade | 2009-07-02 09:51:56 -0300 (Thu, 02 Jul 2009) | 1 line cleaned up the bdist_dumb module ................ r73762 | tarek.ziade | 2009-07-02 11:20:47 -0300 (Thu, 02 Jul 2009) | 1 line pep8-fied and cleaned up distutils.util ................ r73767 | jesus.cea | 2009-07-02 11:30:18 -0300 (Thu, 02 Jul 2009) | 1 line multiprocessing doesn't compile in Solaris because a typo ................ r73773 | benjamin.peterson | 2009-07-02 13:51:56 -0300 (Thu, 02 Jul 2009) | 1 line remove this test; a module level warning is enough ................ r73774 | benjamin.peterson | 2009-07-02 14:06:17 -0300 (Thu, 02 Jul 2009) | 1 line only order comparisons are removed in py3k #6119 ................ r73776 | benjamin.peterson | 2009-07-02 15:16:45 -0300 (Thu, 02 Jul 2009) | 1 line when print() gets unicode arguments, sep and end should be unicode by default #4618 ................ r73778 | r.david.murray | 2009-07-02 15:19:20 -0300 (Thu, 02 Jul 2009) | 3 lines Issue 6389: add documentation for the 'mode' flags defined in the stat module. ................ r73781 | benjamin.peterson | 2009-07-02 18:38:36 -0300 (Thu, 02 Jul 2009) | 1 line test that compile() accepts the future flag ................ r73786 | benjamin.peterson | 2009-07-02 19:56:16 -0300 (Thu, 02 Jul 2009) | 1 line condense with assertRaises ................ r73790 | tarek.ziade | 2009-07-03 05:22:56 -0300 (Fri, 03 Jul 2009) | 1 line Fixed #6403 : package path usage for build_ext ................ r73801 | tarek.ziade | 2009-07-03 06:01:07 -0300 (Fri, 03 Jul 2009) | 1 line cleaned up distutils.command.build_py ................ r73812 | benjamin.peterson | 2009-07-03 11:08:20 -0300 (Fri, 03 Jul 2009) | 1 line another cStringIO restriction ................ r73814 | tarek.ziade | 2009-07-03 16:01:12 -0300 (Fri, 03 Jul 2009) | 1 line basic tests to raise distutils.file_util coverage ................ r73815 | tarek.ziade | 2009-07-03 16:14:49 -0300 (Fri, 03 Jul 2009) | 1 line cleaned distutils.file_util ................ r73818 | gregory.p.smith | 2009-07-03 17:48:31 -0300 (Fri, 03 Jul 2009) | 2 lines Adds the select.PIPE_BUF attribute to expose the system constant. ................ r73819 | kristjan.jonsson | 2009-07-03 20:07:07 -0300 (Fri, 03 Jul 2009) | 2 lines http://bugs.python.org/issue6381 some platforms may raise ENOTCONN if the stack has disconnected the socket on behalf of the peer. ................ r73821 | kristjan.jonsson | 2009-07-03 20:26:02 -0300 (Fri, 03 Jul 2009) | 2 lines http://bugs.python.org/issue6267 Incorrect exception handling for xmlrp client retry ................ r73822 | kristjan.jonsson | 2009-07-03 20:29:50 -0300 (Fri, 03 Jul 2009) | 2 lines http://bugs.python.org/issue6267 Incorrect exception handling for xmlrpc client retry ................ r73824 | ezio.melotti | 2009-07-03 22:18:08 -0300 (Fri, 03 Jul 2009) | 1 line #6398 typo: versio. -> version. ................ r73825 | gregory.p.smith | 2009-07-03 22:49:29 -0300 (Fri, 03 Jul 2009) | 9 lines Use select.poll() in subprocess, when available, rather than select() so that it does not fail when file descriptors are large. Fixes issue3392. Patch largely contributed by Frank Chu (fpmc) with some improvements by me. See http://bugs.python.org/issue3392. Candidate for backporting to release26-maint as it is a bug fix and changes no public API. ................ r73826 | gregory.p.smith | 2009-07-03 22:55:11 -0300 (Fri, 03 Jul 2009) | 2 lines news entry for r73825 ................ r73827 | tarek.ziade | 2009-07-03 23:02:41 -0300 (Fri, 03 Jul 2009) | 1 line Fixed #6413: fixed log level in distutils.dist.announce ................ r73834 | tarek.ziade | 2009-07-03 23:59:19 -0300 (Fri, 03 Jul 2009) | 1 line using print statements when used for user interaction ................ r73839 | gregory.p.smith | 2009-07-04 05:42:10 -0300 (Sat, 04 Jul 2009) | 3 lines Merge r73838 from py3k branch. Use the nondeprecated unittest method names. ................ r73841 | ezio.melotti | 2009-07-04 11:58:27 -0300 (Sat, 04 Jul 2009) | 1 line if zlib -> skipUnless(zlib) and minor cleanups ................ r73846 | alexandre.vassalotti | 2009-07-05 01:22:40 -0300 (Sun, 05 Jul 2009) | 6 lines Issue 2370: Add Python 3 warnings for the removal of operator.isCallable and operator.sequenceIncludes. Patch contributed by Jeff Balogh (and updated slightly by me). ................ r73847 | alexandre.vassalotti | 2009-07-05 01:25:46 -0300 (Sun, 05 Jul 2009) | 2 lines Fix bad variable name in r73846. ................ r73854 | alexandre.vassalotti | 2009-07-05 03:33:41 -0300 (Sun, 05 Jul 2009) | 2 lines Backport test cases added in r73852. ................ r73858 | mark.dickinson | 2009-07-05 07:01:24 -0300 (Sun, 05 Jul 2009) | 3 lines Issues #1530559, #1741130: Fix various inconsistencies in struct.pack integer packing, and reenable some previously broken tests. ................ r73863 | kristjan.jonsson | 2009-07-05 17:56:57 -0300 (Sun, 05 Jul 2009) | 2 lines http://bugs.python.org/issue6382 close_request() (which can send a socket.shutdown()) must be called by the child process in a forking server. The parent must merely close the socket handle. ................ r73864 | tarek.ziade | 2009-07-06 09:50:46 -0300 (Mon, 06 Jul 2009) | 1 line Fixed #6377: distutils compiler switch ignored (and added a deprecation warning if compiler is not used as supposed = a string option) ................ r73870 | r.david.murray | 2009-07-06 22:06:13 -0300 (Mon, 06 Jul 2009) | 5 lines Issue 6070: when creating a compiled file, after copying the mode bits, on posix zap the execute bit in case it was set on the .py file, since the compiled files are not directly executable on posix. Patch by Marco N. ................ r73871 | alexandre.vassalotti | 2009-07-06 23:17:30 -0300 (Mon, 06 Jul 2009) | 7 lines Grow the allocated buffer in PyUnicode_EncodeUTF7 to avoid buffer overrun. Without this change, test_unicode.UnicodeTest.test_codecs_utf7 crashes in debug mode. What happens is the unicode string u'\U000abcde' with a length of 1 encodes to the string '+2m/c3g-' of length 8. Since only 5 bytes is reserved in the buffer, a buffer overrun occurs. ................ r73873 | amaury.forgeotdarc | 2009-07-07 03:49:41 -0300 (Tue, 07 Jul 2009) | 2 lines #6420: Fix a compilation warning in the nis module, for OpenBSD and FreeBSD. ................ r73877 | kristjan.jonsson | 2009-07-07 06:01:34 -0300 (Tue, 07 Jul 2009) | 2 lines http://bugs.python.org/issue6382 added the shutdown_request() which can perform shutdown before calling close. This is needed for the ForkingMixIn because different close semantics are required for child and parent process. shutdown_request(), for TCP servers, calls socket.shutdown() and then calls close_request(). Therefore, this is not an backwards incompatible change, since subclasses that continue to override close_request() continue to work. ................ r73879 | r.david.murray | 2009-07-07 06:54:16 -0300 (Tue, 07 Jul 2009) | 3 lines Update issue 6070 patch to match the patch that was actually tested on Windows. ................ r73880 | mark.dickinson | 2009-07-07 07:18:22 -0300 (Tue, 07 Jul 2009) | 1 line Typo in error message ................ r73884 | mark.dickinson | 2009-07-07 08:08:23 -0300 (Tue, 07 Jul 2009) | 1 line Add skipping to struct test that only applies when overflow masking is in effect ................ r73888 | mark.dickinson | 2009-07-07 11:15:45 -0300 (Tue, 07 Jul 2009) | 3 lines Expand test coverage for struct.pack with native integer packing; reorganize the test_struct module to remove duplicated code and tests. ................ r73891 | mark.dickinson | 2009-07-07 12:08:28 -0300 (Tue, 07 Jul 2009) | 3 lines Issue #1523: Remove deprecated overflow masking in struct module, and make sure that out-of-range values consistently raise struct.error. ................ r73895 | tarek.ziade | 2009-07-08 19:40:51 -0300 (Wed, 08 Jul 2009) | 1 line Sets the compiler attribute to keep the old behavior for third-party packages. ................ r73899 | r.david.murray | 2009-07-08 22:43:41 -0300 (Wed, 08 Jul 2009) | 3 lines Conditionalize test cleanup code to eliminate traceback, which will hopefully reveal the real problem. ................ r73900 | r.david.murray | 2009-07-08 23:06:17 -0300 (Wed, 08 Jul 2009) | 2 lines Make test work with -O. ................ r73901 | tarek.ziade | 2009-07-09 04:42:42 -0300 (Thu, 09 Jul 2009) | 1 line PendingDeprecationWarning -> DeprecationWarning in build_ext ................ r73905 | r.david.murray | 2009-07-09 10:55:44 -0300 (Thu, 09 Jul 2009) | 3 lines Specify umask in execute bit test to get consistent results and make sure we test resetting all three execute bits. ................ r73906 | r.david.murray | 2009-07-09 12:35:33 -0300 (Thu, 09 Jul 2009) | 5 lines Curdir needs to be in the path for the test to work on all buildbots. (I copied this from another import test, but currently this will fail if TESTFN ends up in /tmp...see issue 2609). ................ r73907 | r.david.murray | 2009-07-09 13:17:30 -0300 (Thu, 09 Jul 2009) | 4 lines Temporarily ignore rmtree errors in test_getcwd_long_pathnames to see if the test gives useful failure info on Solaris buildbot. ................ r73908 | r.david.murray | 2009-07-09 15:41:03 -0300 (Thu, 09 Jul 2009) | 6 lines Try to fix Solaris buildbot rmtree failure in test_getcwd_long_pathnames cleanup. If this fix works, it means that Solaris is unique among our platforms in what happens when shutil.rmtree is called on the current working directory (ie: it doesn't work on Solaris, but it does everywhere else). ................ r73916 | amaury.forgeotdarc | 2009-07-09 19:37:22 -0300 (Thu, 09 Jul 2009) | 5 lines #6416: Fix compilation of the select module on Windows, as well as test_subprocess: PIPE_BUF is not defined on Windows, and probably has no meaning there. Anyway the subprocess module uses another way to perform non-blocking reads (with a thread) ................ r73921 | tarek.ziade | 2009-07-10 06:10:33 -0300 (Fri, 10 Jul 2009) | 1 line Fixed #6455 (the test shall use pyd files under win32, rather than so files) ................ r73925 | tarek.ziade | 2009-07-10 06:57:15 -0300 (Fri, 10 Jul 2009) | 1 line Added test coverage for distutils.command.build ................ r73926 | tarek.ziade | 2009-07-10 07:00:21 -0300 (Fri, 10 Jul 2009) | 1 line cleaned up distutils.command.build ................ r73930 | amaury.forgeotdarc | 2009-07-10 13:47:42 -0300 (Fri, 10 Jul 2009) | 2 lines #6447: typo in subprocess docstring ................ r73931 | ezio.melotti | 2009-07-10 17:25:56 -0300 (Fri, 10 Jul 2009) | 1 line more cleanups and if zlib -> skipUnless(zlib) ................ r73932 | kristjan.jonsson | 2009-07-11 05:44:43 -0300 (Sat, 11 Jul 2009) | 3 lines http://bugs.python.org/issue6460 Need to be careful with thread switching when testing the xmlrpc server. The server thread may not have updated stats when the client thread tests them. ................ r73933 | amaury.forgeotdarc | 2009-07-11 06:09:59 -0300 (Sat, 11 Jul 2009) | 3 lines Add basic tests for the return value of os.popen().close(). According to #6358, python 3.0 has a different implementation that behaves differently. ................ r73937 | georg.brandl | 2009-07-11 07:12:36 -0300 (Sat, 11 Jul 2009) | 1 line Fix style. ................ r73938 | georg.brandl | 2009-07-11 07:14:54 -0300 (Sat, 11 Jul 2009) | 1 line #6446: fix import_spam() function to use correct error and reference handling. ................ r73939 | georg.brandl | 2009-07-11 07:18:10 -0300 (Sat, 11 Jul 2009) | 1 line #6448: clarify docs for find_module(). ................ r73940 | georg.brandl | 2009-07-11 07:37:38 -0300 (Sat, 11 Jul 2009) | 1 line #6430: add note about size of "u" type. ................ r73944 | tarek.ziade | 2009-07-11 07:48:31 -0300 (Sat, 11 Jul 2009) | 1 line cleaned up distutils.build_ext module ................ r73945 | georg.brandl | 2009-07-11 07:51:31 -0300 (Sat, 11 Jul 2009) | 1 line #6456: clarify the meaning of constants used as arguments to nl_langinfo(). ................ r73946 | tarek.ziade | 2009-07-11 07:55:27 -0300 (Sat, 11 Jul 2009) | 1 line fixed #6459: distutils.command.build_ext.get_export_symbols now uses 'PyInit' ................ r73951 | georg.brandl | 2009-07-11 11:23:38 -0300 (Sat, 11 Jul 2009) | 2 lines array.array is actually a class. ................ r73952 | amaury.forgeotdarc | 2009-07-11 11:33:51 -0300 (Sat, 11 Jul 2009) | 4 lines #2622 Import errors in email.message, from a py2app standalone application. Patch by Mads Kiilerich, Reviewed by Barry Warsaw. ................ r73954 | tarek.ziade | 2009-07-11 14:21:00 -0300 (Sat, 11 Jul 2009) | 1 line reverted changes for #6459 (doesn't apply on 2.x) ................ r73962 | benjamin.peterson | 2009-07-11 19:15:13 -0300 (Sat, 11 Jul 2009) | 1 line put downloaded test support files in Lib/test/data instead of the cwd ................ r73963 | benjamin.peterson | 2009-07-11 19:25:24 -0300 (Sat, 11 Jul 2009) | 1 line ignore things in Lib/test/data/ ................ r73970 | hirokazu.yamamoto | 2009-07-11 23:04:47 -0300 (Sat, 11 Jul 2009) | 1 line Fixed distutils test. ................ r73979 | benjamin.peterson | 2009-07-12 13:56:54 -0300 (Sun, 12 Jul 2009) | 1 line add versionadded ................ r73985 | benjamin.peterson | 2009-07-12 18:18:55 -0300 (Sun, 12 Jul 2009) | 1 line add Joe ................ r73986 | kristjan.jonsson | 2009-07-12 19:42:08 -0300 (Sun, 12 Jul 2009) | 2 lines http://bugs.python.org/issue6267 Add more tests for the xlmrpc.ServerProxy ................ r73988 | benjamin.peterson | 2009-07-12 20:40:33 -0300 (Sun, 12 Jul 2009) | 1 line fix Tarek's name ................ r73989 | benjamin.peterson | 2009-07-12 20:44:43 -0300 (Sun, 12 Jul 2009) | 1 line change encoding to utf-8 ................ r73990 | benjamin.peterson | 2009-07-12 20:49:23 -0300 (Sun, 12 Jul 2009) | 1 line fix another name ................ r73991 | benjamin.peterson | 2009-07-12 20:56:18 -0300 (Sun, 12 Jul 2009) | 1 line change encoding to utf-8 ................ r73994 | benjamin.peterson | 2009-07-12 21:03:20 -0300 (Sun, 12 Jul 2009) | 1 line fix umlaut ................ r73995 | vinay.sajip | 2009-07-13 08:21:05 -0300 (Mon, 13 Jul 2009) | 1 line Issue #6314: logging: Extra checks on the "level" argument in more places. ................ r73998 | amaury.forgeotdarc | 2009-07-13 16:14:17 -0300 (Mon, 13 Jul 2009) | 3 lines Set svn:eol-style=CRLF on all Visual Studio solution files. This should allow direct compilation from a downloaded source tar ball. ................ r74000 | amaury.forgeotdarc | 2009-07-13 17:01:11 -0300 (Mon, 13 Jul 2009) | 4 lines #1616979: Add the cp720 (Arabic DOS) encoding. Since there is no official mapping file from unicode.org, the codec file is generated on Windows with the new genwincodec.py script. ................ r74001 | amaury.forgeotdarc | 2009-07-13 17:03:21 -0300 (Mon, 13 Jul 2009) | 2 lines NEWS entry for r74000. ................ r74002 | marc-andre.lemburg | 2009-07-13 17:23:49 -0300 (Mon, 13 Jul 2009) | 6 lines Use a new global DEV_NULL instead of hard-coding /dev/null into the system command helper functions. See #6479 for some motivation. ................ r74005 | marc-andre.lemburg | 2009-07-13 18:28:33 -0300 (Mon, 13 Jul 2009) | 6 lines Use a different VER command output parser to address the localization issues mentioned in #3410. Prepare for Windows 7 (still commented out). ................ r74006 | amaury.forgeotdarc | 2009-07-13 20:11:54 -0300 (Mon, 13 Jul 2009) | 2 lines Document the newly added codec ................ r74007 | michael.foord | 2009-07-14 14:58:12 -0300 (Tue, 14 Jul 2009) | 1 line Move TestRunner initialisation into unittest.TestProgram.runTests. Fixes issue 6418. ................ r74008 | benjamin.peterson | 2009-07-14 21:46:42 -0300 (Tue, 14 Jul 2009) | 1 line update year ................ r74011 | ezio.melotti | 2009-07-15 14:07:04 -0300 (Wed, 15 Jul 2009) | 1 line methods' names pep8ification ................ r74014 | alexandre.vassalotti | 2009-07-15 15:19:47 -0300 (Wed, 15 Jul 2009) | 3 lines Issue #2389: Pickle array objects using a list representation for portability across different machine architectures and compatibility with Python 3.x. ................ r74019 | amaury.forgeotdarc | 2009-07-15 18:29:27 -0300 (Wed, 15 Jul 2009) | 2 lines #6076 Add a title to the IDLE Preferences window. ................ r74020 | georg.brandl | 2009-07-16 04:18:07 -0300 (Thu, 16 Jul 2009) | 1 line #5910: fix kqueue for calls with more than one event. ................ r74021 | georg.brandl | 2009-07-16 04:33:04 -0300 (Thu, 16 Jul 2009) | 1 line #6486: start with built in functions rather than "built in objects". ................ r74022 | georg.brandl | 2009-07-16 04:38:35 -0300 (Thu, 16 Jul 2009) | 1 line #6481: fix typo in os.system() replacement. ................ r74023 | jesse.noller | 2009-07-16 11:23:04 -0300 (Thu, 16 Jul 2009) | 1 line Issue 6433: multiprocessing.pool.map hangs on empty list ................ r74024 | tarek.ziade | 2009-07-16 12:35:45 -0300 (Thu, 16 Jul 2009) | 1 line #6466 refactored distutils duplicate get_versions() functions (used to get gcc/ld/dllwrap versions) ................ r74028 | georg.brandl | 2009-07-16 16:24:48 -0300 (Thu, 16 Jul 2009) | 1 line #6482: simplify "except: raise" to "finally:". ................ r74029 | georg.brandl | 2009-07-16 18:47:51 -0300 (Thu, 16 Jul 2009) | 1 line Revert r74028. ................ r74031 | alexandre.vassalotti | 2009-07-17 01:24:45 -0300 (Fri, 17 Jul 2009) | 2 lines Use AC_CHECK_SIZEOF to find the size of off_t, pthread_t and time_t. ................ r74032 | alexandre.vassalotti | 2009-07-17 01:59:05 -0300 (Fri, 17 Jul 2009) | 4 lines Rename the useless AC_INCLUDES_DEFAULT and protect the includes. This is mostly an aesthetic change. ................ r74033 | alexandre.vassalotti | 2009-07-17 02:26:39 -0300 (Fri, 17 Jul 2009) | 8 lines Cache the results of all runtime checks. This will be helpful to people who want to compile Python with a cross-compiler. Now you can upload the configure script on your host machine, run it with caching enabled, and download the cached results on your build machine. ................ r74038 | alexandre.vassalotti | 2009-07-17 03:10:06 -0300 (Fri, 17 Jul 2009) | 3 lines Double-quote the test cases for chflags() and lchflags() to ensure they don't get mangled. ................ r74039 | alexandre.vassalotti | 2009-07-17 03:17:33 -0300 (Fri, 17 Jul 2009) | 2 lines Clean up the test case for broken poll(). ................ r74040 | hirokazu.yamamoto | 2009-07-17 03:20:46 -0300 (Fri, 17 Jul 2009) | 1 line Issue #6415: Fixed warnings.warn sagfault on bad formatted string. ................ r74042 | hirokazu.yamamoto | 2009-07-17 03:26:54 -0300 (Fri, 17 Jul 2009) | 1 line NEWS about r74040. ................ r74044 | alexandre.vassalotti | 2009-07-17 03:33:51 -0300 (Fri, 17 Jul 2009) | 3 lines Double-quote the test case for %zd printf() format support to avoid mangling the array declarations in it. ................ r74048 | alexandre.vassalotti | 2009-07-17 04:46:46 -0300 (Fri, 17 Jul 2009) | 2 lines Regenerate configure script. ................ r74051 | alexandre.vassalotti | 2009-07-17 04:54:23 -0300 (Fri, 17 Jul 2009) | 2 lines Initialize variables in PyCurses_getsyx() to avoid compiler warnings. ................ r74052 | alexandre.vassalotti | 2009-07-17 05:09:04 -0300 (Fri, 17 Jul 2009) | 3 lines Fix GCC warning about fprintf used without a string literal and without format arguments. ................ r74067 | alexandre.vassalotti | 2009-07-17 20:09:02 -0300 (Fri, 17 Jul 2009) | 2 lines Revert r74048. ................ r74069 | alexandre.vassalotti | 2009-07-17 20:17:48 -0300 (Fri, 17 Jul 2009) | 2 lines Regenerate configure script using autoconf 2.61. ................ r74072 | alexandre.vassalotti | 2009-07-17 21:31:06 -0300 (Fri, 17 Jul 2009) | 5 lines Add a check to ensure the correct autoconf version is used for generating the configure script. Original idea by Martin von L??wis. ................ r74074 | georg.brandl | 2009-07-18 06:03:10 -0300 (Sat, 18 Jul 2009) | 1 line #6513: fix example code: warning categories are classes, not instances. ................ r74075 | georg.brandl | 2009-07-18 06:06:31 -0300 (Sat, 18 Jul 2009) | 1 line #6505: fix typos. ................ r74077 | georg.brandl | 2009-07-18 06:43:40 -0300 (Sat, 18 Jul 2009) | 1 line #6489: fix an ambiguity in getiterator() documentation. ................ r74080 | mark.dickinson | 2009-07-18 12:18:18 -0300 (Sat, 18 Jul 2009) | 3 lines Issue #6431: Fix Fraction comparisons with unknown types, and with float infinities and nans. Backport of r74078 from py3k. ................ r74083 | mark.dickinson | 2009-07-18 13:01:57 -0300 (Sat, 18 Jul 2009) | 1 line Add Case Van Horsen to Misc/ACKS, for fractions module patches and other work ................ r74089 | senthil.kumaran | 2009-07-18 23:43:43 -0300 (Sat, 18 Jul 2009) | 3 lines Fix for issue5102, timeout value propages between redirects, proxy, digest and auth handlers. Fixed tests to reflect the same. ................ r74095 | benjamin.peterson | 2009-07-19 17:18:21 -0300 (Sun, 19 Jul 2009) | 1 line split unittest.py into a package ................ r74098 | kristjan.jonsson | 2009-07-19 19:14:00 -0300 (Sun, 19 Jul 2009) | 2 lines http://bugs.python.org/issue6499 zlib/gzip may not be present for all builds. Make xmlrpclib gracefully not supporg gzip encoding in this case ................ r74100 | kristjan.jonsson | 2009-07-19 19:35:44 -0300 (Sun, 19 Jul 2009) | 2 lines http://bugs.python.org/issue6499 gzip.GzipFile may not exist as a parent class ................ r74111 | benjamin.peterson | 2009-07-20 10:30:10 -0300 (Mon, 20 Jul 2009) | 1 line remove docs for deprecated -p option ................ r74114 | benjamin.peterson | 2009-07-20 12:33:09 -0300 (Mon, 20 Jul 2009) | 110 lines Merged revisions 73771,73811,73840,73842,73848-73849,73861,73957-73960,73964-73969,73972-73974,73977,73981,73984,74065,74113 via svnmerge from svn+ssh://pythondev at svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line force the imports fixer to be run after the import one #6400 ........ r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line check for sep, not pathsep when looking for a subpackage #6408 ........ r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line don't print diffs by default; it's annoying ........ r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line complain when not showing diffs or writing ........ r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines Fix test_refactor_stdin to handle print_output() method with 4 arguments. ........ r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines Issue 2370: Add fixer for the removal of operator.isCallable() and operator.sequenceIncludes(). Patch contributed by Jeff Balogh (and updated by me). ........ r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line cleanup and use unicode where appropiate ........ r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line fix calls to str() with unicode() ........ r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line more str() -> unicode() ........ r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line add tests for refactor_dir() ........ r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line don't parse files just because they end with 'py' (no dot) ........ r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line simplify ........ r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line remove usage of get_prefix() ........ r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line revert unintended change in 73965 ........ r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line avoid expensive checks and assume the node did change ........ r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line use a regular dict for the heads to avoid adding lists in the loop ........ r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line prefix headnode functions with '_' ........ r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line try to make the head node dict as sparse as possible ........ r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line a better idea; add an option to *not* print diffs ........ r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line add space ........ r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line update get_headnode_dict tests for recent changes ........ r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines detect when "from __future__ import print_function" is given Deprecate the 'print_function' option and the -p flag ........ r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line add tests for Call; thanks Joe Amenta ........ r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line pathname2url and url2pathname are in urllib.request not urllib.parse #6496 ........ r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line fix deprecation warnings in tests ........ ................ r74117 | benjamin.peterson | 2009-07-20 14:24:30 -0300 (Mon, 20 Jul 2009) | 9 lines Merged revisions 74116 via svnmerge from svn+ssh://pythondev at svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r74116 | benjamin.peterson | 2009-07-20 12:22:35 -0500 (Mon, 20 Jul 2009) | 1 line placate windows ........ ................ r74119 | benjamin.peterson | 2009-07-20 17:28:08 -0300 (Mon, 20 Jul 2009) | 2 lines the Slice in x[::] has to have step as None to help the interpreter ................ r74123 | benjamin.peterson | 2009-07-20 18:09:45 -0300 (Mon, 20 Jul 2009) | 13 lines Merged revisions 74121-74122 via svnmerge from svn+ssh://pythondev at svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r74121 | benjamin.peterson | 2009-07-20 15:40:59 -0500 (Mon, 20 Jul 2009) | 1 line try to make warning tests more robust ........ r74122 | benjamin.peterson | 2009-07-20 15:44:14 -0500 (Mon, 20 Jul 2009) | 1 line platform compat ........ ................ r74134 | thomas.heller | 2009-07-21 03:27:14 -0300 (Tue, 21 Jul 2009) | 3 lines Issue #6493: Fix a ctypes problem setting bitfields more than 31 bits wide. ................ r74139 | benjamin.peterson | 2009-07-21 11:08:40 -0300 (Tue, 21 Jul 2009) | 1 line must use _PyThreadState_Current so it isn't checked for NULL #6530 ................ r74147 | thomas.heller | 2009-07-21 16:04:02 -0300 (Tue, 21 Jul 2009) | 1 line Revert rev 74134, as it does not completely fixx issue #6493. ................ r74148 | ezio.melotti | 2009-07-21 17:18:27 -0300 (Tue, 21 Jul 2009) | 1 line #6536 fixed typo ................ r74150 | benjamin.peterson | 2009-07-21 20:13:14 -0300 (Tue, 21 Jul 2009) | 1 line install unittest as a package ................ r74152 | benjamin.peterson | 2009-07-21 21:03:43 -0300 (Tue, 21 Jul 2009) | 1 line simplify ................ r74163 | tarek.ziade | 2009-07-22 05:55:19 -0300 (Wed, 22 Jul 2009) | 1 line Issue #6545: Removed assert statements in distutils.Extension, so the behavior is similar when used with -O ................ r74167 | georg.brandl | 2009-07-22 08:57:15 -0300 (Wed, 22 Jul 2009) | 1 line Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. ................ r74173 | benjamin.peterson | 2009-07-22 13:34:37 -0300 (Wed, 22 Jul 2009) | 1 line revert r74152 ................ r74175 | r.david.murray | 2009-07-22 14:22:58 -0300 (Wed, 22 Jul 2009) | 4 lines Backport of fix for issue 6542: make sure test_os.TestInvalidFD.test_closerange does not close any valid file descriptors. ................ r74179 | ezio.melotti | 2009-07-22 18:08:49 -0300 (Wed, 22 Jul 2009) | 1 line #6423 has_key -> in ................ r74184 | georg.brandl | 2009-07-23 04:08:58 -0300 (Thu, 23 Jul 2009) | 1 line #6548: dont suggest existence of real and imag functions in cmath. ................ r74185 | georg.brandl | 2009-07-23 06:17:09 -0300 (Thu, 23 Jul 2009) | 1 line Fix the "pylocals" gdb command. ................ r74187 | benjamin.peterson | 2009-07-23 11:19:08 -0300 (Thu, 23 Jul 2009) | 1 line use bools for autoraise ................ r74188 | benjamin.peterson | 2009-07-23 11:25:31 -0300 (Thu, 23 Jul 2009) | 1 line use bools ................ r74189 | amaury.forgeotdarc | 2009-07-23 16:26:02 -0300 (Thu, 23 Jul 2009) | 4 lines #6553: crash in cPickle.load(), when given a StringIO with incomplete data. Will backport to 2.6, 3.x already fixed a similar issue with issue4298. ................ r74192 | georg.brandl | 2009-07-24 13:28:38 -0300 (Fri, 24 Jul 2009) | 1 line Fix arg types of et#. ................ r74193 | georg.brandl | 2009-07-24 13:46:38 -0300 (Fri, 24 Jul 2009) | 1 line Dont put "void" in signature for nullary functions. ................ r74194 | georg.brandl | 2009-07-24 17:09:46 -0300 (Fri, 24 Jul 2009) | 1 line #6564: fix section about the two raise syntaxes. ................ r74197 | benjamin.peterson | 2009-07-24 23:03:48 -0300 (Fri, 24 Jul 2009) | 1 line clarify ................ r74200 | georg.brandl | 2009-07-25 10:02:15 -0300 (Sat, 25 Jul 2009) | 1 line #6571: add index entries for more operators. ................ r74201 | amaury.forgeotdarc | 2009-07-25 13:22:06 -0300 (Sat, 25 Jul 2009) | 2 lines Better name a variable: 'buf' seems to imply a mutable buffer. ................ r74205 | georg.brandl | 2009-07-26 10:36:39 -0300 (Sun, 26 Jul 2009) | 1 line #6576: fix cross-refs in re docs. ................ r74207 | georg.brandl | 2009-07-26 11:19:57 -0300 (Sun, 26 Jul 2009) | 1 line #6577: fix (hopefully) all links to builtin instead of module/class-specific objects. ................ r74209 | georg.brandl | 2009-07-26 11:37:28 -0300 (Sun, 26 Jul 2009) | 1 line builtin -> built-in. ................ r74210 | georg.brandl | 2009-07-26 11:44:23 -0300 (Sun, 26 Jul 2009) | 1 line Move member descriptions inside the classes. ................ r74216 | michael.foord | 2009-07-26 18:12:14 -0300 (Sun, 26 Jul 2009) | 1 line Issue 6581. Michael Foord ................ r74219 | eric.smith | 2009-07-26 22:58:25 -0300 (Sun, 26 Jul 2009) | 1 line Sync trunk and py3k versions of string formatting. Will manually merge into py3k. ................ r74225 | kurt.kaiser | 2009-07-27 13:09:28 -0300 (Mon, 27 Jul 2009) | 5 lines 1. Clean workspace more thoughly before build. 2. Add url of branch we are building to 'results' webpage. (url is now available in $repo_path, could be added to failure email.) 3. Adjust permissions to improve upload reliability. ................ r74228 | raymond.hettinger | 2009-07-27 17:32:04 -0300 (Mon, 27 Jul 2009) | 1 line Issue 6573: Fix set.union() for cases where self is in the argument chain. ................ r74230 | mark.dickinson | 2009-07-28 13:12:40 -0300 (Tue, 28 Jul 2009) | 4 lines Issue #6458: Reorganize cmath documentation into sections (similar to the way that the math documentation is organized); clarify section on conversions to and from polar coordinates. ................ r74234 | mark.dickinson | 2009-07-28 13:45:13 -0300 (Tue, 28 Jul 2009) | 1 line Remove leading blank line from cmath.rst ................ r74239 | georg.brandl | 2009-07-28 15:55:32 -0300 (Tue, 28 Jul 2009) | 1 line Clarify quote_plus() usage. ................ r74240 | mark.dickinson | 2009-07-28 17:35:03 -0300 (Tue, 28 Jul 2009) | 4 lines Issue #6561: '\d' regular expression should not match characters of category [No]; only those of category [Nd]. (Backport of r74237 from py3k.) ................ r74243 | amaury.forgeotdarc | 2009-07-28 17:47:55 -0300 (Tue, 28 Jul 2009) | 2 lines "Fix" for the refleak report: the ABC classes are now in the _pyio module ................ r74245 | amaury.forgeotdarc | 2009-07-28 19:15:30 -0300 (Tue, 28 Jul 2009) | 3 lines #6511: ZipFile will now raise BadZipfile when opening an empty or tiny file, like it does for larger invalid files. ................ r74252 | georg.brandl | 2009-07-29 13:06:31 -0300 (Wed, 29 Jul 2009) | 1 line #6593: fix link targets. ................ r74253 | georg.brandl | 2009-07-29 13:09:17 -0300 (Wed, 29 Jul 2009) | 1 line #6591: add reference to ioctl in fcntl module for platforms other than Windows. ................ r74256 | georg.brandl | 2009-07-29 13:32:30 -0300 (Wed, 29 Jul 2009) | 1 line #6336: Add nb_divide. ................ r74258 | georg.brandl | 2009-07-29 13:57:05 -0300 (Wed, 29 Jul 2009) | 1 line Add a link to readline, and mention IPython and bpython. ................ r74259 | georg.brandl | 2009-07-29 14:07:21 -0300 (Wed, 29 Jul 2009) | 1 line Fix some markup and small factual glitches found by M. Markert. ................ r74260 | georg.brandl | 2009-07-29 14:15:20 -0300 (Wed, 29 Jul 2009) | 1 line Fix a few markup glitches. ................ r74261 | georg.brandl | 2009-07-29 14:50:25 -0300 (Wed, 29 Jul 2009) | 1 line Rewrite the section about classes a bit; mostly tidbits, and a larger update to the section about "private" variables to reflect the Pythonic consensus better. ................ r74265 | mark.dickinson | 2009-07-30 07:00:10 -0300 (Thu, 30 Jul 2009) | 1 line Documentation fix for change introduced in r71832 ................ r74269 | eric.smith | 2009-07-30 10:39:44 -0300 (Thu, 30 Jul 2009) | 1 line Issue 6330: Fix --enable-unicode=ucs4. ................ r74277 | sean.reifschneider | 2009-08-01 20:54:55 -0300 (Sat, 01 Aug 2009) | 3 lines - Issue #6624: yArg_ParseTuple with "s" format when parsing argument with NUL: Bogus TypeError detail string. ................ r74281 | mark.dickinson | 2009-08-02 07:59:36 -0300 (Sun, 02 Aug 2009) | 4 lines Issue #6595: Allow Decimal constructor to accept non-European decimal digits, as recommended by the specification. (Backport of r74279 from py3k.) ................ r74285 | mark.dickinson | 2009-08-02 12:40:11 -0300 (Sun, 02 Aug 2009) | 3 lines Issue #6619: Remove duplicate 'isgenerator' function from inspect module. Thanks Vincent Legoll. ................ r74291 | frank.wierzbicki | 2009-08-02 17:37:48 -0300 (Sun, 02 Aug 2009) | 6 lines Adding tests derived from the Jython project. These are primarily tests of 'single' statements with partial sentences (so they test things like "try:" in interactive mode). Others tests hit areas that previously failed in Jython. A couple still fail in Jython, mainly due to the difficulty of parsing partial sentences (but should be fixed by Jython 2.6). ................ r74300 | raymond.hettinger | 2009-08-04 16:08:05 -0300 (Tue, 04 Aug 2009) | 1 line Issue 6637: defaultdict.copy() failed with an empty factory. ................ r74303 | mark.dickinson | 2009-08-04 16:22:35 -0300 (Tue, 04 Aug 2009) | 2 lines Issue #6644: Fix compile error on AIX. ................ r74307 | georg.brandl | 2009-08-04 17:22:43 -0300 (Tue, 04 Aug 2009) | 1 line Add donation link to docs footer. ................ r74312 | mark.dickinson | 2009-08-04 18:56:04 -0300 (Tue, 04 Aug 2009) | 4 lines Issue #6620: Slightly safer code for _grouping_intervals in the locale module. Fixes a 'possible use before assignment' warning from pylint. Thanks Vincent Legoll. ................ Added: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build.py - copied unchanged from r74312, /python/trunk/Lib/distutils/tests/test_build.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_emxccompiler.py - copied unchanged from r74312, /python/trunk/Lib/distutils/tests/test_emxccompiler.py python/branches/tk_and_idle_maintenance/Lib/encodings/cp720.py - copied unchanged from r74312, /python/trunk/Lib/encodings/cp720.py python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_tkinter/test_loadtk.py - copied unchanged from r74312, /python/trunk/Lib/lib-tk/test/test_tkinter/test_loadtk.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_operator.py - copied unchanged from r74312, /python/trunk/Lib/lib2to3/fixes/fix_operator.py python/branches/tk_and_idle_maintenance/Lib/test/data/ (props changed) - copied from r74312, /python/trunk/Lib/test/data/ python/branches/tk_and_idle_maintenance/Lib/unittest/ - copied from r74312, /python/trunk/Lib/unittest/ python/branches/tk_and_idle_maintenance/Tools/unicode/genwincodec.py - copied unchanged from r74312, /python/trunk/Tools/unicode/genwincodec.py python/branches/tk_and_idle_maintenance/Tools/unicode/genwincodecs.bat - copied unchanged from r74312, /python/trunk/Tools/unicode/genwincodecs.bat Removed: python/branches/tk_and_idle_maintenance/Doc/library/ipaddr.rst python/branches/tk_and_idle_maintenance/Lib/ipaddr.py python/branches/tk_and_idle_maintenance/Lib/test/test_ipaddr.py python/branches/tk_and_idle_maintenance/Lib/unittest.py Modified: python/branches/tk_and_idle_maintenance/ (props changed) python/branches/tk_and_idle_maintenance/.bzrignore python/branches/tk_and_idle_maintenance/.hgignore python/branches/tk_and_idle_maintenance/Demo/sockets/mcast.py python/branches/tk_and_idle_maintenance/Demo/turtle/tdemo_chaos.py python/branches/tk_and_idle_maintenance/Doc/Makefile python/branches/tk_and_idle_maintenance/Doc/c-api/arg.rst python/branches/tk_and_idle_maintenance/Doc/c-api/buffer.rst python/branches/tk_and_idle_maintenance/Doc/c-api/float.rst python/branches/tk_and_idle_maintenance/Doc/c-api/import.rst python/branches/tk_and_idle_maintenance/Doc/c-api/int.rst python/branches/tk_and_idle_maintenance/Doc/c-api/method.rst python/branches/tk_and_idle_maintenance/Doc/c-api/sys.rst python/branches/tk_and_idle_maintenance/Doc/c-api/tuple.rst python/branches/tk_and_idle_maintenance/Doc/c-api/type.rst python/branches/tk_and_idle_maintenance/Doc/c-api/typeobj.rst python/branches/tk_and_idle_maintenance/Doc/c-api/unicode.rst python/branches/tk_and_idle_maintenance/Doc/copyright.rst python/branches/tk_and_idle_maintenance/Doc/distutils/apiref.rst python/branches/tk_and_idle_maintenance/Doc/extending/extending.rst python/branches/tk_and_idle_maintenance/Doc/extending/newtypes.rst python/branches/tk_and_idle_maintenance/Doc/glossary.rst python/branches/tk_and_idle_maintenance/Doc/howto/doanddont.rst python/branches/tk_and_idle_maintenance/Doc/howto/urllib2.rst python/branches/tk_and_idle_maintenance/Doc/includes/sqlite3/text_factory.py python/branches/tk_and_idle_maintenance/Doc/library/2to3.rst python/branches/tk_and_idle_maintenance/Doc/library/__future__.rst python/branches/tk_and_idle_maintenance/Doc/library/_winreg.rst python/branches/tk_and_idle_maintenance/Doc/library/aifc.rst python/branches/tk_and_idle_maintenance/Doc/library/anydbm.rst python/branches/tk_and_idle_maintenance/Doc/library/array.rst python/branches/tk_and_idle_maintenance/Doc/library/ast.rst python/branches/tk_and_idle_maintenance/Doc/library/audioop.rst python/branches/tk_and_idle_maintenance/Doc/library/cd.rst python/branches/tk_and_idle_maintenance/Doc/library/cgi.rst python/branches/tk_and_idle_maintenance/Doc/library/cmath.rst python/branches/tk_and_idle_maintenance/Doc/library/codecs.rst python/branches/tk_and_idle_maintenance/Doc/library/collections.rst python/branches/tk_and_idle_maintenance/Doc/library/compiler.rst python/branches/tk_and_idle_maintenance/Doc/library/configparser.rst python/branches/tk_and_idle_maintenance/Doc/library/csv.rst python/branches/tk_and_idle_maintenance/Doc/library/curses.rst python/branches/tk_and_idle_maintenance/Doc/library/dbhash.rst python/branches/tk_and_idle_maintenance/Doc/library/decimal.rst python/branches/tk_and_idle_maintenance/Doc/library/dis.rst python/branches/tk_and_idle_maintenance/Doc/library/dl.rst python/branches/tk_and_idle_maintenance/Doc/library/exceptions.rst python/branches/tk_and_idle_maintenance/Doc/library/fileinput.rst python/branches/tk_and_idle_maintenance/Doc/library/fractions.rst python/branches/tk_and_idle_maintenance/Doc/library/functions.rst python/branches/tk_and_idle_maintenance/Doc/library/future_builtins.rst python/branches/tk_and_idle_maintenance/Doc/library/gc.rst python/branches/tk_and_idle_maintenance/Doc/library/gettext.rst python/branches/tk_and_idle_maintenance/Doc/library/heapq.rst python/branches/tk_and_idle_maintenance/Doc/library/imp.rst python/branches/tk_and_idle_maintenance/Doc/library/imputil.rst python/branches/tk_and_idle_maintenance/Doc/library/internet.rst python/branches/tk_and_idle_maintenance/Doc/library/intro.rst python/branches/tk_and_idle_maintenance/Doc/library/io.rst python/branches/tk_and_idle_maintenance/Doc/library/locale.rst python/branches/tk_and_idle_maintenance/Doc/library/logging.rst python/branches/tk_and_idle_maintenance/Doc/library/macostools.rst python/branches/tk_and_idle_maintenance/Doc/library/mailbox.rst python/branches/tk_and_idle_maintenance/Doc/library/multifile.rst python/branches/tk_and_idle_maintenance/Doc/library/multiprocessing.rst python/branches/tk_and_idle_maintenance/Doc/library/numbers.rst python/branches/tk_and_idle_maintenance/Doc/library/optparse.rst python/branches/tk_and_idle_maintenance/Doc/library/os.rst python/branches/tk_and_idle_maintenance/Doc/library/ossaudiodev.rst python/branches/tk_and_idle_maintenance/Doc/library/posixfile.rst python/branches/tk_and_idle_maintenance/Doc/library/pprint.rst python/branches/tk_and_idle_maintenance/Doc/library/pyclbr.rst python/branches/tk_and_idle_maintenance/Doc/library/re.rst python/branches/tk_and_idle_maintenance/Doc/library/repr.rst python/branches/tk_and_idle_maintenance/Doc/library/select.rst python/branches/tk_and_idle_maintenance/Doc/library/sets.rst python/branches/tk_and_idle_maintenance/Doc/library/shelve.rst python/branches/tk_and_idle_maintenance/Doc/library/simplexmlrpcserver.rst python/branches/tk_and_idle_maintenance/Doc/library/socket.rst python/branches/tk_and_idle_maintenance/Doc/library/socketserver.rst python/branches/tk_and_idle_maintenance/Doc/library/sqlite3.rst python/branches/tk_and_idle_maintenance/Doc/library/stat.rst python/branches/tk_and_idle_maintenance/Doc/library/stdtypes.rst python/branches/tk_and_idle_maintenance/Doc/library/string.rst python/branches/tk_and_idle_maintenance/Doc/library/stringio.rst python/branches/tk_and_idle_maintenance/Doc/library/subprocess.rst python/branches/tk_and_idle_maintenance/Doc/library/sunau.rst python/branches/tk_and_idle_maintenance/Doc/library/sunaudio.rst python/branches/tk_and_idle_maintenance/Doc/library/symtable.rst python/branches/tk_and_idle_maintenance/Doc/library/sys.rst python/branches/tk_and_idle_maintenance/Doc/library/tempfile.rst python/branches/tk_and_idle_maintenance/Doc/library/threading.rst python/branches/tk_and_idle_maintenance/Doc/library/timeit.rst python/branches/tk_and_idle_maintenance/Doc/library/tkinter.rst python/branches/tk_and_idle_maintenance/Doc/library/turtle.rst python/branches/tk_and_idle_maintenance/Doc/library/undoc.rst python/branches/tk_and_idle_maintenance/Doc/library/unittest.rst python/branches/tk_and_idle_maintenance/Doc/library/urllib.rst python/branches/tk_and_idle_maintenance/Doc/library/warnings.rst python/branches/tk_and_idle_maintenance/Doc/library/wave.rst python/branches/tk_and_idle_maintenance/Doc/library/weakref.rst python/branches/tk_and_idle_maintenance/Doc/library/webbrowser.rst python/branches/tk_and_idle_maintenance/Doc/library/xml.etree.elementtree.rst python/branches/tk_and_idle_maintenance/Doc/library/xmlrpclib.rst python/branches/tk_and_idle_maintenance/Doc/library/zipimport.rst python/branches/tk_and_idle_maintenance/Doc/make.bat python/branches/tk_and_idle_maintenance/Doc/reference/datamodel.rst python/branches/tk_and_idle_maintenance/Doc/reference/executionmodel.rst python/branches/tk_and_idle_maintenance/Doc/reference/expressions.rst python/branches/tk_and_idle_maintenance/Doc/reference/simple_stmts.rst python/branches/tk_and_idle_maintenance/Doc/tools/sphinxext/indexsidebar.html python/branches/tk_and_idle_maintenance/Doc/tools/sphinxext/layout.html python/branches/tk_and_idle_maintenance/Doc/tutorial/classes.rst python/branches/tk_and_idle_maintenance/Doc/tutorial/errors.rst python/branches/tk_and_idle_maintenance/Doc/tutorial/inputoutput.rst python/branches/tk_and_idle_maintenance/Doc/tutorial/interactive.rst python/branches/tk_and_idle_maintenance/Doc/tutorial/modules.rst python/branches/tk_and_idle_maintenance/Doc/tutorial/stdlib2.rst python/branches/tk_and_idle_maintenance/Doc/using/cmdline.rst python/branches/tk_and_idle_maintenance/Doc/whatsnew/2.2.rst python/branches/tk_and_idle_maintenance/Doc/whatsnew/2.6.rst python/branches/tk_and_idle_maintenance/Include/longintrepr.h python/branches/tk_and_idle_maintenance/Include/pymath.h python/branches/tk_and_idle_maintenance/Include/pyport.h python/branches/tk_and_idle_maintenance/Include/symtable.h python/branches/tk_and_idle_maintenance/Lib/BaseHTTPServer.py python/branches/tk_and_idle_maintenance/Lib/DocXMLRPCServer.py python/branches/tk_and_idle_maintenance/Lib/SimpleXMLRPCServer.py python/branches/tk_and_idle_maintenance/Lib/SocketServer.py python/branches/tk_and_idle_maintenance/Lib/collections.py python/branches/tk_and_idle_maintenance/Lib/contextlib.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_anon.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_array_in_pointer.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_arrays.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_as_parameter.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_bitfields.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_buffers.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_byteswap.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_callbacks.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_cast.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_cfuncs.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_checkretval.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_errno.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_find.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_frombuffer.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_funcptr.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_functions.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_incomplete.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_init.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_internals.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_keeprefs.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_libc.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_loading.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_macholib.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_memfunctions.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_numbers.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_parameters.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pep3118.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pickling.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pointers.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_prototypes.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_python_api.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_random_things.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_refcounts.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_repr.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_returnfuncptrs.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_simplesubclasses.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_sizes.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_slicing.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_stringptr.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_strings.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_struct_fields.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_structures.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_unaligned_structures.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_unicode.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_values.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_varsize_struct.py python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_win32.py python/branches/tk_and_idle_maintenance/Lib/decimal.py python/branches/tk_and_idle_maintenance/Lib/distutils/command/bdist_dumb.py python/branches/tk_and_idle_maintenance/Lib/distutils/command/bdist_msi.py python/branches/tk_and_idle_maintenance/Lib/distutils/command/build.py python/branches/tk_and_idle_maintenance/Lib/distutils/command/build_ext.py python/branches/tk_and_idle_maintenance/Lib/distutils/command/build_py.py python/branches/tk_and_idle_maintenance/Lib/distutils/cygwinccompiler.py python/branches/tk_and_idle_maintenance/Lib/distutils/dist.py python/branches/tk_and_idle_maintenance/Lib/distutils/emxccompiler.py python/branches/tk_and_idle_maintenance/Lib/distutils/extension.py python/branches/tk_and_idle_maintenance/Lib/distutils/file_util.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_archive_util.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_dumb.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_rpm.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_wininst.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_clib.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_ext.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_py.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_scripts.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_clean.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_cmd.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_config.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_config_cmd.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_cygwinccompiler.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_dist.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_file_util.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_data.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_lib.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_scripts.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_msvc9compiler.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_register.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_sysconfig.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_unixccompiler.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_upload.py python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_util.py python/branches/tk_and_idle_maintenance/Lib/distutils/unixccompiler.py python/branches/tk_and_idle_maintenance/Lib/distutils/util.py python/branches/tk_and_idle_maintenance/Lib/email/base64mime.py python/branches/tk_and_idle_maintenance/Lib/email/header.py python/branches/tk_and_idle_maintenance/Lib/email/message.py python/branches/tk_and_idle_maintenance/Lib/email/mime/nonmultipart.py python/branches/tk_and_idle_maintenance/Lib/email/quoprimime.py python/branches/tk_and_idle_maintenance/Lib/email/test/test_email.py python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_codecs.py python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_renamed.py python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_torture.py python/branches/tk_and_idle_maintenance/Lib/fractions.py python/branches/tk_and_idle_maintenance/Lib/idlelib/configDialog.py python/branches/tk_and_idle_maintenance/Lib/inspect.py python/branches/tk_and_idle_maintenance/Lib/json/tests/test_decode.py python/branches/tk_and_idle_maintenance/Lib/json/tests/test_speedups.py python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_tkinter/test_text.py python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_extensions.py python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_functions.py python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_style.py python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_widgets.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/ (props changed) python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixer_base.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_dict.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_import.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_imports.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_long.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_ne.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_numliterals.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_print.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_urllib.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/main.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/patcomp.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/pgen2/grammar.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/pygram.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/refactor.py (contents, props changed) python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/data/different_encoding.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_fixers.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_pytree.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_refactor.py python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_util.py python/branches/tk_and_idle_maintenance/Lib/locale.py python/branches/tk_and_idle_maintenance/Lib/logging/__init__.py python/branches/tk_and_idle_maintenance/Lib/multiprocessing/pool.py python/branches/tk_and_idle_maintenance/Lib/multiprocessing/process.py python/branches/tk_and_idle_maintenance/Lib/platform.py python/branches/tk_and_idle_maintenance/Lib/pydoc.py python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/dbapi.py python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/factory.py python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/hooks.py python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/py25tests.py python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/regression.py python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/transactions.py python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/types.py python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/userfunctions.py python/branches/tk_and_idle_maintenance/Lib/subprocess.py python/branches/tk_and_idle_maintenance/Lib/symtable.py python/branches/tk_and_idle_maintenance/Lib/tempfile.py python/branches/tk_and_idle_maintenance/Lib/test/mapping_tests.py python/branches/tk_and_idle_maintenance/Lib/test/pickletester.py python/branches/tk_and_idle_maintenance/Lib/test/regrtest.py python/branches/tk_and_idle_maintenance/Lib/test/test_StringIO.py python/branches/tk_and_idle_maintenance/Lib/test/test___all__.py python/branches/tk_and_idle_maintenance/Lib/test/test___future__.py python/branches/tk_and_idle_maintenance/Lib/test/test_abc.py python/branches/tk_and_idle_maintenance/Lib/test/test_abstract_numbers.py python/branches/tk_and_idle_maintenance/Lib/test/test_array.py python/branches/tk_and_idle_maintenance/Lib/test/test_ast.py python/branches/tk_and_idle_maintenance/Lib/test/test_augassign.py python/branches/tk_and_idle_maintenance/Lib/test/test_bigmem.py python/branches/tk_and_idle_maintenance/Lib/test/test_binascii.py python/branches/tk_and_idle_maintenance/Lib/test/test_binop.py python/branches/tk_and_idle_maintenance/Lib/test/test_bisect.py python/branches/tk_and_idle_maintenance/Lib/test/test_bool.py python/branches/tk_and_idle_maintenance/Lib/test/test_bsddb.py python/branches/tk_and_idle_maintenance/Lib/test/test_bufio.py python/branches/tk_and_idle_maintenance/Lib/test/test_builtin.py python/branches/tk_and_idle_maintenance/Lib/test/test_bytes.py python/branches/tk_and_idle_maintenance/Lib/test/test_capi.py python/branches/tk_and_idle_maintenance/Lib/test/test_cfgparser.py python/branches/tk_and_idle_maintenance/Lib/test/test_cgi.py python/branches/tk_and_idle_maintenance/Lib/test/test_cmath.py python/branches/tk_and_idle_maintenance/Lib/test/test_cmd_line_script.py python/branches/tk_and_idle_maintenance/Lib/test/test_codecs.py python/branches/tk_and_idle_maintenance/Lib/test/test_codeop.py python/branches/tk_and_idle_maintenance/Lib/test/test_coercion.py python/branches/tk_and_idle_maintenance/Lib/test/test_collections.py python/branches/tk_and_idle_maintenance/Lib/test/test_commands.py python/branches/tk_and_idle_maintenance/Lib/test/test_compile.py python/branches/tk_and_idle_maintenance/Lib/test/test_compiler.py python/branches/tk_and_idle_maintenance/Lib/test/test_complex.py python/branches/tk_and_idle_maintenance/Lib/test/test_contains.py python/branches/tk_and_idle_maintenance/Lib/test/test_contextlib.py python/branches/tk_and_idle_maintenance/Lib/test/test_cookielib.py python/branches/tk_and_idle_maintenance/Lib/test/test_copy.py python/branches/tk_and_idle_maintenance/Lib/test/test_copy_reg.py python/branches/tk_and_idle_maintenance/Lib/test/test_csv.py python/branches/tk_and_idle_maintenance/Lib/test/test_datetime.py python/branches/tk_and_idle_maintenance/Lib/test/test_dbm.py python/branches/tk_and_idle_maintenance/Lib/test/test_decimal.py python/branches/tk_and_idle_maintenance/Lib/test/test_defaultdict.py python/branches/tk_and_idle_maintenance/Lib/test/test_deque.py python/branches/tk_and_idle_maintenance/Lib/test/test_descr.py python/branches/tk_and_idle_maintenance/Lib/test/test_dict.py python/branches/tk_and_idle_maintenance/Lib/test/test_dircache.py python/branches/tk_and_idle_maintenance/Lib/test/test_doctest.py python/branches/tk_and_idle_maintenance/Lib/test/test_docxmlrpc.py python/branches/tk_and_idle_maintenance/Lib/test/test_dummy_thread.py python/branches/tk_and_idle_maintenance/Lib/test/test_epoll.py python/branches/tk_and_idle_maintenance/Lib/test/test_errno.py python/branches/tk_and_idle_maintenance/Lib/test/test_exceptions.py python/branches/tk_and_idle_maintenance/Lib/test/test_extcall.py python/branches/tk_and_idle_maintenance/Lib/test/test_file.py python/branches/tk_and_idle_maintenance/Lib/test/test_file2k.py python/branches/tk_and_idle_maintenance/Lib/test/test_filecmp.py python/branches/tk_and_idle_maintenance/Lib/test/test_fileinput.py python/branches/tk_and_idle_maintenance/Lib/test/test_fileio.py python/branches/tk_and_idle_maintenance/Lib/test/test_float.py python/branches/tk_and_idle_maintenance/Lib/test/test_fnmatch.py python/branches/tk_and_idle_maintenance/Lib/test/test_fractions.py python/branches/tk_and_idle_maintenance/Lib/test/test_ftplib.py python/branches/tk_and_idle_maintenance/Lib/test/test_funcattrs.py python/branches/tk_and_idle_maintenance/Lib/test/test_functools.py python/branches/tk_and_idle_maintenance/Lib/test/test_future4.py python/branches/tk_and_idle_maintenance/Lib/test/test_gdbm.py python/branches/tk_and_idle_maintenance/Lib/test/test_generators.py python/branches/tk_and_idle_maintenance/Lib/test/test_genericpath.py python/branches/tk_and_idle_maintenance/Lib/test/test_getargs2.py python/branches/tk_and_idle_maintenance/Lib/test/test_getopt.py python/branches/tk_and_idle_maintenance/Lib/test/test_gettext.py python/branches/tk_and_idle_maintenance/Lib/test/test_grammar.py python/branches/tk_and_idle_maintenance/Lib/test/test_grp.py python/branches/tk_and_idle_maintenance/Lib/test/test_gzip.py python/branches/tk_and_idle_maintenance/Lib/test/test_hash.py python/branches/tk_and_idle_maintenance/Lib/test/test_hashlib.py python/branches/tk_and_idle_maintenance/Lib/test/test_heapq.py python/branches/tk_and_idle_maintenance/Lib/test/test_hmac.py python/branches/tk_and_idle_maintenance/Lib/test/test_hotshot.py python/branches/tk_and_idle_maintenance/Lib/test/test_httplib.py python/branches/tk_and_idle_maintenance/Lib/test/test_httpservers.py python/branches/tk_and_idle_maintenance/Lib/test/test_imp.py python/branches/tk_and_idle_maintenance/Lib/test/test_import.py python/branches/tk_and_idle_maintenance/Lib/test/test_importhooks.py python/branches/tk_and_idle_maintenance/Lib/test/test_index.py python/branches/tk_and_idle_maintenance/Lib/test/test_inspect.py python/branches/tk_and_idle_maintenance/Lib/test/test_int.py python/branches/tk_and_idle_maintenance/Lib/test/test_io.py python/branches/tk_and_idle_maintenance/Lib/test/test_ioctl.py python/branches/tk_and_idle_maintenance/Lib/test/test_iter.py python/branches/tk_and_idle_maintenance/Lib/test/test_itertools.py python/branches/tk_and_idle_maintenance/Lib/test/test_kqueue.py python/branches/tk_and_idle_maintenance/Lib/test/test_largefile.py python/branches/tk_and_idle_maintenance/Lib/test/test_linecache.py python/branches/tk_and_idle_maintenance/Lib/test/test_list.py python/branches/tk_and_idle_maintenance/Lib/test/test_logging.py python/branches/tk_and_idle_maintenance/Lib/test/test_long.py python/branches/tk_and_idle_maintenance/Lib/test/test_macpath.py python/branches/tk_and_idle_maintenance/Lib/test/test_mailbox.py python/branches/tk_and_idle_maintenance/Lib/test/test_marshal.py python/branches/tk_and_idle_maintenance/Lib/test/test_math.py python/branches/tk_and_idle_maintenance/Lib/test/test_memoryio.py python/branches/tk_and_idle_maintenance/Lib/test/test_memoryview.py python/branches/tk_and_idle_maintenance/Lib/test/test_mhlib.py python/branches/tk_and_idle_maintenance/Lib/test/test_mimetools.py python/branches/tk_and_idle_maintenance/Lib/test/test_mimetypes.py python/branches/tk_and_idle_maintenance/Lib/test/test_minidom.py python/branches/tk_and_idle_maintenance/Lib/test/test_mmap.py python/branches/tk_and_idle_maintenance/Lib/test/test_module.py python/branches/tk_and_idle_maintenance/Lib/test/test_modulefinder.py python/branches/tk_and_idle_maintenance/Lib/test/test_multibytecodec.py python/branches/tk_and_idle_maintenance/Lib/test/test_multiprocessing.py python/branches/tk_and_idle_maintenance/Lib/test/test_mutex.py python/branches/tk_and_idle_maintenance/Lib/test/test_netrc.py python/branches/tk_and_idle_maintenance/Lib/test/test_new.py python/branches/tk_and_idle_maintenance/Lib/test/test_normalization.py python/branches/tk_and_idle_maintenance/Lib/test/test_old_mailbox.py python/branches/tk_and_idle_maintenance/Lib/test/test_opcodes.py python/branches/tk_and_idle_maintenance/Lib/test/test_operator.py python/branches/tk_and_idle_maintenance/Lib/test/test_optparse.py python/branches/tk_and_idle_maintenance/Lib/test/test_os.py python/branches/tk_and_idle_maintenance/Lib/test/test_ossaudiodev.py python/branches/tk_and_idle_maintenance/Lib/test/test_peepholer.py python/branches/tk_and_idle_maintenance/Lib/test/test_pep247.py python/branches/tk_and_idle_maintenance/Lib/test/test_pep277.py python/branches/tk_and_idle_maintenance/Lib/test/test_pep352.py python/branches/tk_and_idle_maintenance/Lib/test/test_pkg.py python/branches/tk_and_idle_maintenance/Lib/test/test_pkgimport.py python/branches/tk_and_idle_maintenance/Lib/test/test_platform.py python/branches/tk_and_idle_maintenance/Lib/test/test_popen.py python/branches/tk_and_idle_maintenance/Lib/test/test_poplib.py python/branches/tk_and_idle_maintenance/Lib/test/test_posix.py python/branches/tk_and_idle_maintenance/Lib/test/test_posixpath.py python/branches/tk_and_idle_maintenance/Lib/test/test_pprint.py python/branches/tk_and_idle_maintenance/Lib/test/test_print.py python/branches/tk_and_idle_maintenance/Lib/test/test_property.py python/branches/tk_and_idle_maintenance/Lib/test/test_pwd.py python/branches/tk_and_idle_maintenance/Lib/test/test_py3kwarn.py python/branches/tk_and_idle_maintenance/Lib/test/test_pyclbr.py python/branches/tk_and_idle_maintenance/Lib/test/test_pydoc.py python/branches/tk_and_idle_maintenance/Lib/test/test_queue.py python/branches/tk_and_idle_maintenance/Lib/test/test_quopri.py python/branches/tk_and_idle_maintenance/Lib/test/test_random.py python/branches/tk_and_idle_maintenance/Lib/test/test_re.py python/branches/tk_and_idle_maintenance/Lib/test/test_repr.py python/branches/tk_and_idle_maintenance/Lib/test/test_rfc822.py python/branches/tk_and_idle_maintenance/Lib/test/test_richcmp.py python/branches/tk_and_idle_maintenance/Lib/test/test_robotparser.py python/branches/tk_and_idle_maintenance/Lib/test/test_runpy.py python/branches/tk_and_idle_maintenance/Lib/test/test_scope.py python/branches/tk_and_idle_maintenance/Lib/test/test_set.py python/branches/tk_and_idle_maintenance/Lib/test/test_sets.py python/branches/tk_and_idle_maintenance/Lib/test/test_sha.py python/branches/tk_and_idle_maintenance/Lib/test/test_shutil.py python/branches/tk_and_idle_maintenance/Lib/test/test_signal.py python/branches/tk_and_idle_maintenance/Lib/test/test_site.py python/branches/tk_and_idle_maintenance/Lib/test/test_slice.py python/branches/tk_and_idle_maintenance/Lib/test/test_socket.py python/branches/tk_and_idle_maintenance/Lib/test/test_str.py python/branches/tk_and_idle_maintenance/Lib/test/test_string.py python/branches/tk_and_idle_maintenance/Lib/test/test_stringprep.py python/branches/tk_and_idle_maintenance/Lib/test/test_strop.py python/branches/tk_and_idle_maintenance/Lib/test/test_strptime.py python/branches/tk_and_idle_maintenance/Lib/test/test_struct.py python/branches/tk_and_idle_maintenance/Lib/test/test_structseq.py python/branches/tk_and_idle_maintenance/Lib/test/test_subprocess.py python/branches/tk_and_idle_maintenance/Lib/test/test_support.py python/branches/tk_and_idle_maintenance/Lib/test/test_symtable.py python/branches/tk_and_idle_maintenance/Lib/test/test_sys.py python/branches/tk_and_idle_maintenance/Lib/test/test_tarfile.py python/branches/tk_and_idle_maintenance/Lib/test/test_tcl.py python/branches/tk_and_idle_maintenance/Lib/test/test_tempfile.py python/branches/tk_and_idle_maintenance/Lib/test/test_threading.py python/branches/tk_and_idle_maintenance/Lib/test/test_threading_local.py python/branches/tk_and_idle_maintenance/Lib/test/test_time.py python/branches/tk_and_idle_maintenance/Lib/test/test_timeout.py python/branches/tk_and_idle_maintenance/Lib/test/test_traceback.py python/branches/tk_and_idle_maintenance/Lib/test/test_tuple.py python/branches/tk_and_idle_maintenance/Lib/test/test_unary.py python/branches/tk_and_idle_maintenance/Lib/test/test_unicode.py python/branches/tk_and_idle_maintenance/Lib/test/test_unicode_file.py python/branches/tk_and_idle_maintenance/Lib/test/test_unicodedata.py python/branches/tk_and_idle_maintenance/Lib/test/test_unittest.py python/branches/tk_and_idle_maintenance/Lib/test/test_urllib.py python/branches/tk_and_idle_maintenance/Lib/test/test_urllib2.py python/branches/tk_and_idle_maintenance/Lib/test/test_urllib2_localnet.py python/branches/tk_and_idle_maintenance/Lib/test/test_urllib2net.py python/branches/tk_and_idle_maintenance/Lib/test/test_urllibnet.py python/branches/tk_and_idle_maintenance/Lib/test/test_userdict.py python/branches/tk_and_idle_maintenance/Lib/test/test_userstring.py python/branches/tk_and_idle_maintenance/Lib/test/test_uuid.py python/branches/tk_and_idle_maintenance/Lib/test/test_warnings.py python/branches/tk_and_idle_maintenance/Lib/test/test_weakref.py python/branches/tk_and_idle_maintenance/Lib/test/test_with.py python/branches/tk_and_idle_maintenance/Lib/test/test_wsgiref.py python/branches/tk_and_idle_maintenance/Lib/test/test_xdrlib.py python/branches/tk_and_idle_maintenance/Lib/test/test_xmlrpc.py python/branches/tk_and_idle_maintenance/Lib/test/test_xrange.py python/branches/tk_and_idle_maintenance/Lib/test/test_zipfile.py python/branches/tk_and_idle_maintenance/Lib/test/test_zipimport.py python/branches/tk_and_idle_maintenance/Lib/test/test_zipimport_support.py python/branches/tk_and_idle_maintenance/Lib/test/test_zlib.py python/branches/tk_and_idle_maintenance/Lib/urllib2.py python/branches/tk_and_idle_maintenance/Lib/webbrowser.py python/branches/tk_and_idle_maintenance/Lib/wsgiref/headers.py python/branches/tk_and_idle_maintenance/Lib/xml/sax/expatreader.py python/branches/tk_and_idle_maintenance/Lib/xmlrpclib.py python/branches/tk_and_idle_maintenance/Lib/zipfile.py python/branches/tk_and_idle_maintenance/Makefile.pre.in python/branches/tk_and_idle_maintenance/Misc/ACKS python/branches/tk_and_idle_maintenance/Misc/HISTORY python/branches/tk_and_idle_maintenance/Misc/NEWS python/branches/tk_and_idle_maintenance/Misc/Porting python/branches/tk_and_idle_maintenance/Misc/build.sh python/branches/tk_and_idle_maintenance/Misc/cheatsheet python/branches/tk_and_idle_maintenance/Misc/developers.txt python/branches/tk_and_idle_maintenance/Misc/gdbinit python/branches/tk_and_idle_maintenance/Misc/python.man python/branches/tk_and_idle_maintenance/Modules/_collectionsmodule.c python/branches/tk_and_idle_maintenance/Modules/_cursesmodule.c python/branches/tk_and_idle_maintenance/Modules/_io/fileio.c python/branches/tk_and_idle_maintenance/Modules/_multiprocessing/multiprocessing.h python/branches/tk_and_idle_maintenance/Modules/_sre.c python/branches/tk_and_idle_maintenance/Modules/_struct.c python/branches/tk_and_idle_maintenance/Modules/arraymodule.c python/branches/tk_and_idle_maintenance/Modules/cPickle.c python/branches/tk_and_idle_maintenance/Modules/cmathmodule.c python/branches/tk_and_idle_maintenance/Modules/itertoolsmodule.c python/branches/tk_and_idle_maintenance/Modules/main.c python/branches/tk_and_idle_maintenance/Modules/md5.c python/branches/tk_and_idle_maintenance/Modules/mmapmodule.c python/branches/tk_and_idle_maintenance/Modules/nismodule.c python/branches/tk_and_idle_maintenance/Modules/operator.c python/branches/tk_and_idle_maintenance/Modules/posixmodule.c python/branches/tk_and_idle_maintenance/Modules/selectmodule.c python/branches/tk_and_idle_maintenance/Modules/symtablemodule.c python/branches/tk_and_idle_maintenance/Objects/bytearrayobject.c python/branches/tk_and_idle_maintenance/Objects/dictobject.c python/branches/tk_and_idle_maintenance/Objects/fileobject.c python/branches/tk_and_idle_maintenance/Objects/funcobject.c python/branches/tk_and_idle_maintenance/Objects/memoryobject.c python/branches/tk_and_idle_maintenance/Objects/methodobject.c python/branches/tk_and_idle_maintenance/Objects/setobject.c python/branches/tk_and_idle_maintenance/Objects/stringlib/formatter.h python/branches/tk_and_idle_maintenance/Objects/unicodeobject.c python/branches/tk_and_idle_maintenance/PC/VS7.1/pcbuild.sln (contents, props changed) python/branches/tk_and_idle_maintenance/PC/VS8.0/pcbuild.sln (contents, props changed) python/branches/tk_and_idle_maintenance/PC/bdist_wininst/wininst-7.1.sln (contents, props changed) python/branches/tk_and_idle_maintenance/PC/bdist_wininst/wininst-8.sln (contents, props changed) python/branches/tk_and_idle_maintenance/PC/example_nt/example.sln (contents, props changed) python/branches/tk_and_idle_maintenance/PC/pyconfig.h python/branches/tk_and_idle_maintenance/PCbuild/pcbuild.sln (contents, props changed) python/branches/tk_and_idle_maintenance/Python/_warnings.c python/branches/tk_and_idle_maintenance/Python/ast.c python/branches/tk_and_idle_maintenance/Python/bltinmodule.c python/branches/tk_and_idle_maintenance/Python/ceval.c python/branches/tk_and_idle_maintenance/Python/compile.c python/branches/tk_and_idle_maintenance/Python/getargs.c python/branches/tk_and_idle_maintenance/Python/import.c python/branches/tk_and_idle_maintenance/Python/peephole.c python/branches/tk_and_idle_maintenance/Python/symtable.c python/branches/tk_and_idle_maintenance/Python/sysmodule.c python/branches/tk_and_idle_maintenance/README python/branches/tk_and_idle_maintenance/Tools/msi/msi.py python/branches/tk_and_idle_maintenance/configure python/branches/tk_and_idle_maintenance/configure.in python/branches/tk_and_idle_maintenance/pyconfig.h.in python/branches/tk_and_idle_maintenance/setup.py Modified: python/branches/tk_and_idle_maintenance/.bzrignore ============================================================================== --- python/branches/tk_and_idle_maintenance/.bzrignore (original) +++ python/branches/tk_and_idle_maintenance/.bzrignore Wed Aug 5 15:32:47 2009 @@ -14,24 +14,7 @@ pyconfig.h libpython*.a python.exe -CP936.TXT -SHIFT_JISX0213.TXT -JOHAB.TXT -EUC-JP.TXT -NormalizationTest-3.2.0.txt -NormalizationTest.txt -BIG5.TXT -BIG5HKSCS-2004.TXT -CP949.TXT -EUC-CN.TXT -BIG5HKSCS.TXT -SHIFTJIS.TXT -EUC-KR.TXT -EUC-JISX0213.TXT -CP932.TXT -CP950.TXT reflog.txt -gb-18030-2000.xml tags TAGS .gdb_history @@ -45,5 +28,6 @@ Modules/Setup.local Modules/config.c Parser/pgen +Lib/test/data/* Lib/lib2to3/Grammar*.pickle Lib/lib2to3/PatternGrammar*.pickle Modified: python/branches/tk_and_idle_maintenance/.hgignore ============================================================================== --- python/branches/tk_and_idle_maintenance/.hgignore (original) +++ python/branches/tk_and_idle_maintenance/.hgignore Wed Aug 5 15:32:47 2009 @@ -1,24 +1,8 @@ .gdb_history .purify .svn -BIG5.TXT -BIG5HKSCS-2004.TXT -BIG5HKSCS.TXT -CP932.TXT -CP936.TXT -CP949.TXT -CP950.TXT -EUC-CN.TXT -EUC-JISX0213.TXT -EUC-JP.TXT -EUC-KR.TXT -JOHAB.TXT Makefile Makefile.pre -NormalizationTest-3.2.0.txt -NormalizationTest.txt -SHIFTJIS.TXT -SHIFT_JISX0213.TXT TAGS autom4te.cache build @@ -28,7 +12,6 @@ config.status config.status.lineno db_home -gb-18030-2000.xml platform pyconfig.h python @@ -59,6 +42,7 @@ *.rej *~ Lib/lib2to3/*.pickle +Lib/test/data/* PCbuild/*.exe PCbuild/*.dll PCbuild/*.pdb Modified: python/branches/tk_and_idle_maintenance/Demo/sockets/mcast.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Demo/sockets/mcast.py (original) +++ python/branches/tk_and_idle_maintenance/Demo/sockets/mcast.py Wed Aug 5 15:32:47 2009 @@ -14,7 +14,6 @@ MYGROUP_6 = 'ff15:7079:7468:6f6e:6465:6d6f:6d63:6173' MYTTL = 1 # Increase to reach other networks -import ipaddr import time import struct import socket @@ -28,38 +27,31 @@ else: receiver(group) -def _sockfam(ip): - """Returns the family argument of socket.socket""" - if ip.version == 4: - return socket.AF_INET - elif ip.version == 6: - return socket.AF_INET6 - else: - raise ValueError('IPv' + ip.version + ' is not supported') def sender(group): - group_ip = ipaddr.IP(group) + addrinfo = socket.getaddrinfo(group, None)[0] - s = socket.socket(_sockfam(group_ip), socket.SOCK_DGRAM) + s = socket.socket(addrinfo[0], socket.SOCK_DGRAM) # Set Time-to-live (optional) ttl_bin = struct.pack('@i', MYTTL) - if group_ip.version == 4: + if addrinfo[0] == socket.AF_INET: # IPv4 s.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, ttl_bin) else: s.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_MULTICAST_HOPS, ttl_bin) while True: data = repr(time.time()) - s.sendto(data + '\0', (group_ip.ip_ext_full, MYPORT)) + s.sendto(data + '\0', (addrinfo[4][0], MYPORT)) time.sleep(1) def receiver(group): - group_ip = ipaddr.IP(group) + # Look up multicast group address in name server and find out IP version + addrinfo = socket.getaddrinfo(group, None)[0] # Create a socket - s = socket.socket(_sockfam(group_ip), socket.SOCK_DGRAM) + s = socket.socket(addrinfo[0], socket.SOCK_DGRAM) # Allow multiple copies of this program on one machine # (not strictly needed) @@ -68,12 +60,13 @@ # Bind it to the port s.bind(('', MYPORT)) + group_bin = socket.inet_pton(addrinfo[0], addrinfo[4][0]) # Join group - if group_ip.version == 4: # IPv4 - mreq = group_ip.packed + struct.pack('=I', socket.INADDR_ANY) + if addrinfo[0] == socket.AF_INET: # IPv4 + mreq = group_bin + struct.pack('=I', socket.INADDR_ANY) s.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, mreq) else: - mreq = group_ip.packed + struct.pack('@I', 0) + mreq = group_bin + struct.pack('@I', 0) s.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_JOIN_GROUP, mreq) # Loop, printing any data we receive Modified: python/branches/tk_and_idle_maintenance/Demo/turtle/tdemo_chaos.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Demo/turtle/tdemo_chaos.py (original) +++ python/branches/tk_and_idle_maintenance/Demo/turtle/tdemo_chaos.py Wed Aug 5 15:32:47 2009 @@ -1,11 +1,13 @@ -# Datei: chaosplotter.py -# Autor: Gregor Lingl -# Datum: 31. 5. 2008 +# File: tdemo_chaos.py +# Author: Gregor Lingl +# Date: 2009-06-24 -# Ein einfaches Programm zur Demonstration von "chaotischem Verhalten". +# A demonstration of chaos from turtle import * +N = 80 + def f(x): return 3.9*x*(1-x) @@ -15,47 +17,41 @@ def h(x): return 3.9*x-3.9*x*x -def coosys(): - penup() - goto(-1,0) - pendown() - goto(n+1,0) - penup() - goto(0, -0.1) +def jumpto(x, y): + penup(); goto(x,y) + +def line(x1, y1, x2, y2): + jumpto(x1, y1) pendown() - goto(-0.1, 1.1) + goto(x2, y2) -def plot(fun, start, farbe): +def coosys(): + line(-1, 0, N+1, 0) + line(0, -0.1, 0, 1.1) + +def plot(fun, start, colour): + pencolor(colour) x = start - pencolor(farbe) - penup() - goto(0, x) + jumpto(0, x) pendown() dot(5) - for i in range(n): + for i in range(N): x=fun(x) goto(i+1,x) dot(5) def main(): - global n - n = 80 - ox=-250.0 - oy=-150.0 - ex= -2.0*ox / n - ey=300.0 - reset() - setworldcoordinates(-1.0,-0.1, n+1, 1.1) + setworldcoordinates(-1.0,-0.1, N+1, 1.1) speed(0) hideturtle() coosys() plot(f, 0.35, "blue") plot(g, 0.35, "green") plot(h, 0.35, "red") + # Now zoom in: for s in range(100): - setworldcoordinates(0.5*s,-0.1, n+1, 1.1) - + setworldcoordinates(0.5*s,-0.1, N+1, 1.1) return "Done!" if __name__ == "__main__": Modified: python/branches/tk_and_idle_maintenance/Doc/Makefile ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/Makefile (original) +++ python/branches/tk_and_idle_maintenance/Doc/Makefile Wed Aug 5 15:32:47 2009 @@ -32,7 +32,7 @@ checkout: @if [ ! -d tools/sphinx ]; then \ echo "Checking out Sphinx..."; \ - svn checkout $(SVNROOT)/external/Sphinx-0.6.1/sphinx tools/sphinx; \ + svn checkout $(SVNROOT)/external/Sphinx-0.6.2/sphinx tools/sphinx; \ fi @if [ ! -d tools/docutils ]; then \ echo "Checking out Docutils..."; \ Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/arg.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/arg.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/arg.rst Wed Aug 5 15:32:47 2009 @@ -136,7 +136,7 @@ In both cases, *\*buffer_length* is set to the length of the encoded data without the trailing NUL byte. -``et#`` (string, Unicode object or character buffer compatible object) [const char \*encoding, char \*\*buffer] +``et#`` (string, Unicode object or character buffer compatible object) [const char \*encoding, char \*\*buffer, int \*buffer_length] Same as ``es#`` except that string objects are passed through without recoding them. Instead, the implementation assumes that the string object uses the encoding passed in as parameter. Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/buffer.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/buffer.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/buffer.rst Wed Aug 5 15:32:47 2009 @@ -31,7 +31,7 @@ returning data from the target object. Starting from version 1.6, Python has been providing Python-level buffer -objects and a C-level buffer API so that any builtin or used-defined type can +objects and a C-level buffer API so that any built-in or used-defined type can expose its characteristics. Both, however, have been deprecated because of various shortcomings, and have been officially removed in Python 3.0 in favour of a new C-level buffer API and a new Python-level object named Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/float.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/float.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/float.rst Wed Aug 5 15:32:47 2009 @@ -72,21 +72,21 @@ .. versionadded:: 2.6 -.. cfunction:: double PyFloat_GetMax(void) +.. cfunction:: double PyFloat_GetMax() Return the maximum representable finite float *DBL_MAX* as C :ctype:`double`. .. versionadded:: 2.6 -.. cfunction:: double PyFloat_GetMin(void) +.. cfunction:: double PyFloat_GetMin() Return the minimum normalized positive float *DBL_MIN* as C :ctype:`double`. .. versionadded:: 2.6 -.. cfunction:: int PyFloat_ClearFreeList(void) +.. cfunction:: int PyFloat_ClearFreeList() Clear the float free list. Return the number of items that could not be freed. Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/import.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/import.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/import.rst Wed Aug 5 15:32:47 2009 @@ -28,10 +28,10 @@ leaves the module in ``sys.modules``. .. versionchanged:: 2.4 - failing imports remove incomplete module objects. + Failing imports remove incomplete module objects. .. versionchanged:: 2.6 - always use absolute imports + Always uses absolute imports. .. cfunction:: PyObject* PyImport_ImportModuleNoBlock(const char *name) @@ -62,7 +62,7 @@ unless a non-empty *fromlist* was given. .. versionchanged:: 2.4 - failing imports remove incomplete module objects. + Failing imports remove incomplete module objects. .. versionchanged:: 2.6 The function is an alias for :cfunc:`PyImport_ImportModuleLevel` with @@ -95,7 +95,7 @@ are installed in the current environment, e.g. by :mod:`rexec` or :mod:`ihooks`. .. versionchanged:: 2.6 - always use absolute imports + Always uses absolute imports. .. cfunction:: PyObject* PyImport_ReloadModule(PyObject *m) @@ -167,7 +167,7 @@ *path*, possibly by fetching it from the :data:`sys.path_importer_cache` dict. If it wasn't yet cached, traverse :data:`sys.path_hooks` until a hook is found that can handle the path item. Return ``None`` if no hook could; - this tells our caller it should fall back to the builtin import mechanism. + this tells our caller it should fall back to the built-in import mechanism. Cache the result in :data:`sys.path_importer_cache`. Return a new reference to the importer object. Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/int.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/int.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/int.rst Wed Aug 5 15:32:47 2009 @@ -131,7 +131,7 @@ (:const:`LONG_MAX`, as defined in the system header files). -.. cfunction:: int PyInt_ClearFreeList(void) +.. cfunction:: int PyInt_ClearFreeList() Clear the integer free list. Return the number of items that could not be freed. Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/method.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/method.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/method.rst Wed Aug 5 15:32:47 2009 @@ -65,7 +65,7 @@ Macro version of :cfunc:`PyMethod_Self` which avoids error checking. -.. cfunction:: int PyMethod_ClearFreeList(void) +.. cfunction:: int PyMethod_ClearFreeList() Clear the free list. Return the total number of freed items. Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/sys.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/sys.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/sys.rst Wed Aug 5 15:32:47 2009 @@ -73,7 +73,7 @@ case *name* is deleted from the sys module. Returns ``0`` on success, ``-1`` on error. -.. cfunction:: void PySys_ResetWarnOptions(void) +.. cfunction:: void PySys_ResetWarnOptions() Reset :data:`sys.warnoptions` to an empty list. Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/tuple.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/tuple.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/tuple.rst Wed Aug 5 15:32:47 2009 @@ -157,7 +157,7 @@ require changes in your code for properly supporting 64-bit systems. -.. cfunction:: int PyTuple_ClearFreeList(void) +.. cfunction:: int PyTuple_ClearFreeList() Clear the free list. Return the total number of freed items. Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/type.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/type.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/type.rst Wed Aug 5 15:32:47 2009 @@ -35,7 +35,7 @@ .. versionadded:: 2.2 -.. cfunction:: unsigned int PyType_ClearCache(void) +.. cfunction:: unsigned int PyType_ClearCache() Clear the internal lookup cache. Return the current version tag. Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/typeobj.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/typeobj.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/typeobj.rst Wed Aug 5 15:32:47 2009 @@ -1160,6 +1160,7 @@ binaryfunc nb_add; binaryfunc nb_subtract; binaryfunc nb_multiply; + binaryfunc nb_divide; binaryfunc nb_remainder; binaryfunc nb_divmod; ternaryfunc nb_power; Modified: python/branches/tk_and_idle_maintenance/Doc/c-api/unicode.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/c-api/unicode.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/c-api/unicode.rst Wed Aug 5 15:32:47 2009 @@ -98,12 +98,13 @@ :ctype:`PyUnicodeObject` (not checked). -.. cfunction:: int PyUnicode_ClearFreeList(void) +.. cfunction:: int PyUnicode_ClearFreeList() Clear the free list. Return the total number of freed items. .. versionadded:: 2.6 + Unicode provides many different character properties. The most often needed ones are available through these macros which are mapped to C functions depending on the Python configuration. @@ -291,12 +292,12 @@ Built-in Codecs ^^^^^^^^^^^^^^^ -Python provides a set of builtin codecs which are written in C for speed. All of +Python provides a set of built-in codecs which are written in C for speed. All of these codecs are directly usable via the following functions. Many of the following APIs take two arguments encoding and errors. These parameters encoding and errors have the same semantics as the ones of the -builtin unicode() Unicode object constructor. +built-in :func:`unicode` Unicode object constructor. Setting encoding to *NULL* causes the default encoding to be used which is ASCII. The file system calls should use :cdata:`Py_FileSystemDefaultEncoding` @@ -306,7 +307,7 @@ Error handling is set by errors which may also be set to *NULL* meaning to use the default handling defined for the codec. Default error handling for all -builtin codecs is "strict" (:exc:`ValueError` is raised). +built-in codecs is "strict" (:exc:`ValueError` is raised). The codecs all use a similar interface. Only deviation from the following generic ones are documented for simplicity. @@ -320,7 +321,7 @@ Create a Unicode object by decoding *size* bytes of the encoded string *s*. *encoding* and *errors* have the same meaning as the parameters of the same name - in the :func:`unicode` builtin function. The codec to be used is looked up + in the :func:`unicode` built-in function. The codec to be used is looked up using the Python codec registry. Return *NULL* if an exception was raised by the codec. Modified: python/branches/tk_and_idle_maintenance/Doc/copyright.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/copyright.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/copyright.rst Wed Aug 5 15:32:47 2009 @@ -4,7 +4,7 @@ Python and this documentation is: -Copyright ?? 2001-2008 Python Software Foundation. All rights reserved. +Copyright ?? 2001-2009 Python Software Foundation. All rights reserved. Copyright ?? 2000 BeOpen.com. All rights reserved. Modified: python/branches/tk_and_idle_maintenance/Doc/distutils/apiref.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/distutils/apiref.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/distutils/apiref.rst Wed Aug 5 15:32:47 2009 @@ -1601,7 +1601,7 @@ +------------------+--------------------------------+---------+ Note that since *rstrip_ws* can strip the trailing newline, the semantics of - :meth:`readline` must differ from those of the builtin file object's + :meth:`readline` must differ from those of the built-in file object's :meth:`readline` method! In particular, :meth:`readline` returns ``None`` for end-of-file: an empty string might just be a blank line (or an all-whitespace line), if *rstrip_ws* is true but *skip_blanks* is not. @@ -1609,8 +1609,8 @@ .. method:: TextFile.open(filename) - Open a new file *filename*. This overrides any *file* or *filename* constructor - arguments. + Open a new file *filename*. This overrides any *file* or *filename* + constructor arguments. .. method:: TextFile.close() Modified: python/branches/tk_and_idle_maintenance/Doc/extending/extending.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/extending/extending.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/extending/extending.rst Wed Aug 5 15:32:47 2009 @@ -1219,16 +1219,23 @@ static int import_spam(void) { - PyObject *module = PyImport_ImportModule("spam"); + PyObject *c_api_object; + PyObject *module; - if (module != NULL) { - PyObject *c_api_object = PyObject_GetAttrString(module, "_C_API"); - if (c_api_object == NULL) - return -1; - if (PyCObject_Check(c_api_object)) - PySpam_API = (void **)PyCObject_AsVoidPtr(c_api_object); - Py_DECREF(c_api_object); + module = PyImport_ImportModule("spam"); + if (module == NULL) + return -1; + + c_api_object = PyObject_GetAttrString(module, "_C_API"); + if (c_api_object == NULL) { + Py_DECREF(module); + return -1; } + if (PyCObject_Check(c_api_object)) + PySpam_API = (void **)PyCObject_AsVoidPtr(c_api_object); + + Py_DECREF(c_api_object); + Py_DECREF(module); return 0; } Modified: python/branches/tk_and_idle_maintenance/Doc/extending/newtypes.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/extending/newtypes.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/extending/newtypes.rst Wed Aug 5 15:32:47 2009 @@ -819,7 +819,7 @@ these :class:`PyTypeObject` structures between extension modules. In this example we will create a :class:`Shoddy` type that inherits from the -builtin :class:`list` type. The new type will be completely compatible with +built-in :class:`list` type. The new type will be completely compatible with regular lists, but will have an additional :meth:`increment` method that increases an internal counter. :: Modified: python/branches/tk_and_idle_maintenance/Doc/glossary.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/glossary.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/glossary.rst Wed Aug 5 15:32:47 2009 @@ -28,11 +28,11 @@ abstract base class Abstract Base Classes (abbreviated ABCs) complement :term:`duck-typing` by - providing a way to define interfaces when other techniques like :func:`hasattr` - would be clumsy. Python comes with many builtin ABCs for data structures - (in the :mod:`collections` module), numbers (in the :mod:`numbers` - module), and streams (in the :mod:`io` module). You can create your own - ABC with the :mod:`abc` module. + providing a way to define interfaces when other techniques like + :func:`hasattr` would be clumsy. Python comes with many built-in ABCs for + data structures (in the :mod:`collections` module), numbers (in the + :mod:`numbers` module), and streams (in the :mod:`io` module). You can + create your own ABC with the :mod:`abc` module. argument A value passed to a function or method, assigned to a named local @@ -79,7 +79,7 @@ in ``3+4.5``, each argument is of a different type (one int, one float), and both must be converted to the same type before they can be added or it will raise a ``TypeError``. Coercion between two operands can be - performed with the ``coerce`` builtin function; thus, ``3+4.5`` is + performed with the ``coerce`` built-in function; thus, ``3+4.5`` is equivalent to calling ``operator.add(*coerce(3, 4.5))`` and results in ``operator.add(3.0, 4.5)``. Without coercion, all arguments of even compatible types would have to be normalized to the same value by the @@ -90,7 +90,7 @@ expressed as a sum of a real part and an imaginary part. Imaginary numbers are real multiples of the imaginary unit (the square root of ``-1``), often written ``i`` in mathematics or ``j`` in - engineering. Python has builtin support for complex numbers, which are + engineering. Python has built-in support for complex numbers, which are written with this latter notation; the imaginary part is written with a ``j`` suffix, e.g., ``3+1j``. To get access to complex equivalents of the :mod:`math` module, use :mod:`cmath`. Use of complex numbers is a fairly @@ -322,7 +322,7 @@ define with an :meth:`__iter__` or :meth:`__getitem__` method. Iterables can be used in a :keyword:`for` loop and in many other places where a sequence is needed (:func:`zip`, :func:`map`, ...). When an iterable - object is passed as an argument to the builtin function :func:`iter`, it + object is passed as an argument to the built-in function :func:`iter`, it returns an iterator for the object. This iterator is good for one pass over the set of values. When using iterables, it is usually not necessary to call :func:`iter` or deal with iterator objects yourself. The ``for`` @@ -424,7 +424,7 @@ namespace The place where a variable is stored. Namespaces are implemented as - dictionaries. There are the local, global and builtin namespaces as well + dictionaries. There are the local, global and built-in namespaces as well as nested namespaces in objects (in methods). Namespaces support modularity by preventing naming conflicts. For instance, the functions :func:`__builtin__.open` and :func:`os.open` are distinguished by their Modified: python/branches/tk_and_idle_maintenance/Doc/howto/doanddont.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/howto/doanddont.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/howto/doanddont.rst Wed Aug 5 15:32:47 2009 @@ -261,7 +261,7 @@ More useful functions in :mod:`os.path`: :func:`basename`, :func:`dirname` and :func:`splitext`. -There are also many useful builtin functions people seem not to be aware of for +There are also many useful built-in functions people seem not to be aware of for some reason: :func:`min` and :func:`max` can find the minimum/maximum of any sequence with comparable semantics, for example, yet many people write their own :func:`max`/:func:`min`. Another highly useful function is :func:`reduce`. A Modified: python/branches/tk_and_idle_maintenance/Doc/howto/urllib2.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/howto/urllib2.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/howto/urllib2.rst Wed Aug 5 15:32:47 2009 @@ -182,10 +182,9 @@ Handling Exceptions =================== -*urlopen* raises :exc:`URLError` when it cannot handle a response (though as usual -with Python APIs, builtin exceptions such as -:exc:`ValueError`, :exc:`TypeError` etc. may also -be raised). +*urlopen* raises :exc:`URLError` when it cannot handle a response (though as +usual with Python APIs, built-in exceptions such as :exc:`ValueError`, +:exc:`TypeError` etc. may also be raised). :exc:`HTTPError` is the subclass of :exc:`URLError` raised in the specific case of HTTP URLs. @@ -488,7 +487,7 @@ .. note:: - In the above example we only supplied our ``HHTPBasicAuthHandler`` to + In the above example we only supplied our ``HTTPBasicAuthHandler`` to ``build_opener``. By default openers have the handlers for normal situations -- ``ProxyHandler``, ``UnknownHandler``, ``HTTPHandler``, ``HTTPDefaultErrorHandler``, ``HTTPRedirectHandler``, ``FTPHandler``, Modified: python/branches/tk_and_idle_maintenance/Doc/includes/sqlite3/text_factory.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/includes/sqlite3/text_factory.py (original) +++ python/branches/tk_and_idle_maintenance/Doc/includes/sqlite3/text_factory.py Wed Aug 5 15:32:47 2009 @@ -31,7 +31,7 @@ row = cur.fetchone() assert type(row[0]) == unicode -# sqlite3 offers a builtin optimized text_factory that will return bytestring +# sqlite3 offers a built-in optimized text_factory that will return bytestring # objects, if the data is in ASCII only, and otherwise return unicode objects con.text_factory = sqlite3.OptimizedUnicode cur.execute("select ?", (AUSTRIA,)) Modified: python/branches/tk_and_idle_maintenance/Doc/library/2to3.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/2to3.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/2to3.rst Wed Aug 5 15:32:47 2009 @@ -86,13 +86,6 @@ The :option:`-v` option enables output of more information on the translation process. -When the :option:`-p` is passed, the :2to3fixer:`print` fixer ``print`` as a -function instead of a statement. This is useful when ``from __future__ import -print_function`` is being used. If this option is not given, the print fixer -will surround print calls in an extra set of parentheses because it cannot -differentiate between the print statement with parentheses (such as ``print -("a" + "b" + "c")``) and a true function call. - .. _2to3-fixers: @@ -216,7 +209,7 @@ .. 2to3fixer:: itertools Changes usage of :func:`itertools.ifilter`, :func:`itertools.izip`, and - :func:`itertools.imap` to their builtin equivalents. + :func:`itertools.imap` to their built-in equivalents. :func:`itertools.ifilterfalse` is changed to :func:`itertools.filterfalse`. .. 2to3fixer:: long @@ -246,8 +239,9 @@ .. 2to3fixer:: next - Converts the use of iterator's :meth:`next` methods to the :func:`next` - function. It also renames :meth:`next` methods to :meth:`~object.__next__`. + Converts the use of iterator's :meth:`~iterator.next` methods to the + :func:`next` function. It also renames :meth:`next` methods to + :meth:`~object.__next__`. .. 2to3fixer:: nonzero Modified: python/branches/tk_and_idle_maintenance/Doc/library/__future__.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/__future__.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/__future__.rst Wed Aug 5 15:32:47 2009 @@ -52,7 +52,7 @@ :meth:`getOptionalRelease` and :meth:`getMandatoryRelease`. *CompilerFlag* is the (bitfield) flag that should be passed in the fourth -argument to the builtin function :func:`compile` to enable the feature in +argument to the built-in function :func:`compile` to enable the feature in dynamically compiled code. This flag is stored in the :attr:`compiler_flag` attribute on :class:`_Feature` instances. Modified: python/branches/tk_and_idle_maintenance/Doc/library/_winreg.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/_winreg.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/_winreg.rst Wed Aug 5 15:32:47 2009 @@ -408,7 +408,7 @@ The object also support comparison semantics, so handle objects will compare true if they both reference the same underlying Windows handle value. -Handle objects can be converted to an integer (e.g., using the builtin +Handle objects can be converted to an integer (e.g., using the built-in :func:`int` function), in which case the underlying Windows handle value is returned. You can also use the :meth:`Detach` method to return the integer handle, and also disconnect the Windows handle from the handle object. Modified: python/branches/tk_and_idle_maintenance/Doc/library/aifc.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/aifc.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/aifc.rst Wed Aug 5 15:32:47 2009 @@ -48,7 +48,7 @@ time how many samples you are going to write in total and use :meth:`writeframesraw` and :meth:`setnframes`. -Objects returned by :func:`open` when a file is opened for reading have the +Objects returned by :func:`.open` when a file is opened for reading have the following methods: @@ -131,7 +131,7 @@ Close the AIFF file. After calling this method, the object can no longer be used. -Objects returned by :func:`open` when a file is opened for writing have all the +Objects returned by :func:`.open` when a file is opened for writing have all the above methods, except for :meth:`readframes` and :meth:`setpos`. In addition the following methods exist. The :meth:`get\*` methods can only be called after the corresponding :meth:`set\*` methods have been called. Before the first Modified: python/branches/tk_and_idle_maintenance/Doc/library/anydbm.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/anydbm.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/anydbm.rst Wed Aug 5 15:32:47 2009 @@ -62,7 +62,7 @@ modules, with a unique exception also named :exc:`anydbm.error` as the first item --- the latter is used when :exc:`anydbm.error` is raised. -The object returned by :func:`open` supports most of the same functionality as +The object returned by :func:`.open` supports most of the same functionality as dictionaries; keys and their corresponding values can be stored, retrieved, and deleted, and the :meth:`has_key` and :meth:`keys` methods are available. Keys and values must always be strings. Modified: python/branches/tk_and_idle_maintenance/Doc/library/array.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/array.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/array.rst Wed Aug 5 15:32:47 2009 @@ -24,7 +24,7 @@ +-----------+----------------+-------------------+-----------------------+ | ``'B'`` | unsigned char | int | 1 | +-----------+----------------+-------------------+-----------------------+ -| ``'u'`` | Py_UNICODE | Unicode character | 2 | +| ``'u'`` | Py_UNICODE | Unicode character | 2 (see note) | +-----------+----------------+-------------------+-----------------------+ | ``'h'`` | signed short | int | 2 | +-----------+----------------+-------------------+-----------------------+ @@ -43,6 +43,11 @@ | ``'d'`` | double | float | 8 | +-----------+----------------+-------------------+-----------------------+ +.. note:: + + The ``'u'`` typecode corresponds to Python's unicode character. On narrow + Unicode builds this is 2-bytes, on wide builds this is 4-bytes. + The actual representation of values is determined by the machine architecture (strictly speaking, by the C implementation). The actual size can be accessed through the :attr:`itemsize` attribute. The values stored for ``'L'`` and @@ -53,9 +58,9 @@ The module defines the following type: -.. function:: array(typecode[, initializer]) +.. class:: array(typecode[, initializer]) - Return a new array whose items are restricted by *typecode*, and initialized + A new array whose items are restricted by *typecode*, and initialized from the optional *initializer* value, which must be a list, string, or iterable over elements of the appropriate type. @@ -70,7 +75,7 @@ .. data:: ArrayType - Obsolete alias for :func:`array`. + Obsolete alias for :class:`array`. Array objects support the ordinary sequence operations of indexing, slicing, concatenation, and multiplication. When using slice assignment, the assigned @@ -80,7 +85,6 @@ The following data items and methods are also supported: - .. attribute:: array.typecode The typecode character used to create the array. Modified: python/branches/tk_and_idle_maintenance/Doc/library/ast.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/ast.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/ast.rst Wed Aug 5 15:32:47 2009 @@ -22,7 +22,7 @@ grammar looks like. An abstract syntax tree can be generated by passing :data:`ast.PyCF_ONLY_AST` as -a flag to the :func:`compile` builtin function, or using the :func:`parse` +a flag to the :func:`compile` built-in function, or using the :func:`parse` helper provided in this module. The result will be a tree of objects whose classes all inherit from :class:`ast.AST`. An abstract syntax tree can be compiled into a Python code object using the built-in :func:`compile` function. Modified: python/branches/tk_and_idle_maintenance/Doc/library/audioop.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/audioop.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/audioop.rst Wed Aug 5 15:32:47 2009 @@ -228,7 +228,7 @@ u-LAW encoding always uses 8 bits samples, so *width* refers only to the sample width of the output fragment here. -Note that operations such as :func:`mul` or :func:`max` make no distinction +Note that operations such as :func:`.mul` or :func:`.max` make no distinction between mono and stereo fragments, i.e. all samples are treated equal. If this is a problem the stereo fragment should be split into two mono fragments first and recombined later. Here is an example of how to do that:: Modified: python/branches/tk_and_idle_maintenance/Doc/library/cd.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/cd.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/cd.rst Wed Aug 5 15:32:47 2009 @@ -16,8 +16,8 @@ available only on Silicon Graphics systems. The way the library works is as follows. A program opens the CD-ROM device with -:func:`open` and creates a parser to parse the data from the CD with -:func:`createparser`. The object returned by :func:`open` can be used to read +:func:`.open` and creates a parser to parse the data from the CD with +:func:`createparser`. The object returned by :func:`.open` can be used to read data from the CD, but also to get status information for the CD-ROM device, and to get information about the CD, such as the table of contents. Data from the CD is passed to the parser, which parses the frames, and calls any callback @@ -133,7 +133,7 @@ Player Objects -------------- -Player objects (returned by :func:`open`) have the following methods: +Player objects (returned by :func:`.open`) have the following methods: .. method:: CD player.allowremoval() Modified: python/branches/tk_and_idle_maintenance/Doc/library/cgi.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/cgi.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/cgi.rst Wed Aug 5 15:32:47 2009 @@ -91,12 +91,13 @@ various environment variables set according to the CGI standard). Since it may consume standard input, it should be instantiated only once. -The :class:`FieldStorage` instance can be indexed like a Python dictionary, and -also supports the standard dictionary methods :meth:`has_key` and :meth:`keys`. -The built-in :func:`len` is also supported. Form fields containing empty -strings are ignored and do not appear in the dictionary; to keep such values, -provide a true value for the optional *keep_blank_values* keyword parameter when -creating the :class:`FieldStorage` instance. +The :class:`FieldStorage` instance can be indexed like a Python dictionary. +It allows membership testing with the :keyword:`in` operator, and also supports +the standard dictionary method :meth:`keys` and the built-in function +:func:`len`. Form fields containing empty strings are ignored and do not appear +in the dictionary; to keep such values, provide a true value for the optional +*keep_blank_values* keyword parameter when creating the :class:`FieldStorage` +instance. For instance, the following code (which assumes that the :mailheader:`Content-Type` header and blank line have already been printed) @@ -104,7 +105,7 @@ string:: form = cgi.FieldStorage() - if not (form.has_key("name") and form.has_key("addr")): + if "name" not in form or "addr" not in form: print "

Error

" print "Please fill in the name and addr fields." return @@ -135,8 +136,8 @@ If a field represents an uploaded file, accessing the value via the :attr:`value` attribute or the :func:`getvalue` method reads the entire file in memory as a string. This may not be what you want. You can test for an uploaded -file by testing either the :attr:`filename` attribute or the :attr:`file` -attribute. You can then read the data at leisure from the :attr:`file` +file by testing either the :attr:`filename` attribute or the :attr:`!file` +attribute. You can then read the data at leisure from the :attr:`!file` attribute:: fileitem = form["userfile"] @@ -156,7 +157,7 @@ The file upload draft standard entertains the possibility of uploading multiple files from one field (using a recursive :mimetype:`multipart/\*` encoding). When this occurs, the item will be a dictionary-like :class:`FieldStorage` item. -This can be determined by testing its :attr:`type` attribute, which should be +This can be determined by testing its :attr:`!type` attribute, which should be :mimetype:`multipart/form-data` (or perhaps another MIME type matching :mimetype:`multipart/\*`). In this case, it can be iterated over recursively just like the top-level form object. @@ -164,7 +165,7 @@ When a form is submitted in the "old" format (as the query string or as a single data part of type :mimetype:`application/x-www-form-urlencoded`), the items will actually be instances of the class :class:`MiniFieldStorage`. In this case, the -:attr:`list`, :attr:`file`, and :attr:`filename` attributes are always ``None``. +:attr:`!list`, :attr:`!file`, and :attr:`filename` attributes are always ``None``. A form submitted via POST that also has a query string will contain both :class:`FieldStorage` and :class:`MiniFieldStorage` items. Modified: python/branches/tk_and_idle_maintenance/Doc/library/cmath.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/cmath.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/cmath.rst Wed Aug 5 15:32:47 2009 @@ -1,4 +1,3 @@ - :mod:`cmath` --- Mathematical functions for complex numbers =========================================================== @@ -23,100 +22,112 @@ support signed zeros the continuity is as specified below. -Complex coordinates -------------------- - -Complex numbers can be expressed by two important coordinate systems. -Python's :class:`complex` type uses rectangular coordinates where a number -on the complex plain is defined by two floats, the real part and the imaginary -part. - -Definition:: - - z = x + 1j * y - - x := real(z) - y := imag(z) - -In engineering the polar coordinate system is popular for complex numbers. In -polar coordinates a complex number is defined by the radius *r* and the phase -angle *phi*. The radius *r* is the absolute value of the complex, which can be -viewed as distance from (0, 0). The radius *r* is always 0 or a positive float. -The phase angle *phi* is the counter clockwise angle from the positive x axis, -e.g. *1* has the angle *0*, *1j* has the angle *??/2* and *-1* the angle *-??*. - -.. note:: - While :func:`phase` and func:`polar` return *+??* for a negative real they - may return *-??* for a complex with a very small negative imaginary - part, e.g. *-1-1E-300j*. +Conversions to and from polar coordinates +----------------------------------------- +A Python complex number ``z`` is stored internally using *rectangular* +or *Cartesian* coordinates. It is completely determined by its *real +part* ``z.real`` and its *imaginary part* ``z.imag``. In other +words:: + + z == z.real + z.imag*1j + +*Polar coordinates* give an alternative way to represent a complex +number. In polar coordinates, a complex number *z* is defined by the +modulus *r* and the phase angle *phi*. The modulus *r* is the distance +from *z* to the origin, while the phase *phi* is the counterclockwise +angle from the positive x-axis to the line segment that joins the +origin to *z*. -Definition:: +The following functions can be used to convert from the native +rectangular coordinates to polar coordinates and back. - z = r * exp(1j * phi) - z = r * cis(phi) +.. function:: phase(x) - r := abs(z) := sqrt(real(z)**2 + imag(z)**2) - phi := phase(z) := atan2(imag(z), real(z)) - cis(phi) := cos(phi) + 1j * sin(phi) + Return the phase of *x* (also known as the *argument* of *x*), as a + float. ``phase(x)`` is equivalent to ``math.atan2(x.imag, + x.real)``. The result lies in the range [-??, ??], and the branch + cut for this operation lies along the negative real axis, + continuous from above. On systems with support for signed zeros + (which includes most systems in current use), this means that the + sign of the result is the same as the sign of ``x.imag``, even when + ``x.imag`` is zero:: + + >>> phase(complex(-1.0, 0.0)) + 3.1415926535897931 + >>> phase(complex(-1.0, -0.0)) + -3.1415926535897931 + .. versionadded:: 2.6 -.. function:: phase(x) - Return phase, also known as the argument, of a complex. +.. note:: - .. versionadded:: 2.6 + The modulus (absolute value) of a complex number *x* can be + computed using the built-in :func:`abs` function. There is no + separate :mod:`cmath` module function for this operation. .. function:: polar(x) - Convert a :class:`complex` from rectangular coordinates to polar - coordinates. The function returns a tuple with the two elements - *r* and *phi*. *r* is the distance from 0 and *phi* the phase - angle. + Return the representation of *x* in polar coordinates. Returns a + pair ``(r, phi)`` where *r* is the modulus of *x* and phi is the + phase of *x*. ``polar(x)`` is equivalent to ``(abs(x), + phase(x))``. .. versionadded:: 2.6 .. function:: rect(r, phi) - Convert from polar coordinates to rectangular coordinates and return - a :class:`complex`. + Return the complex number *x* with polar coordinates *r* and *phi*. + Equivalent to ``r * (math.cos(phi) + math.sin(phi)*1j)``. .. versionadded:: 2.6 +Power and logarithmic functions +------------------------------- -cmath functions ---------------- +.. function:: exp(x) -.. function:: acos(x) + Return the exponential value ``e**x``. - Return the arc cosine of *x*. There are two branch cuts: One extends right from - 1 along the real axis to ???, continuous from below. The other extends left from - -1 along the real axis to -???, continuous from above. +.. function:: log(x[, base]) -.. function:: acosh(x) + Returns the logarithm of *x* to the given *base*. If the *base* is not + specified, returns the natural logarithm of *x*. There is one branch cut, from 0 + along the negative real axis to -???, continuous from above. - Return the hyperbolic arc cosine of *x*. There is one branch cut, extending left - from 1 along the real axis to -???, continuous from above. + .. versionchanged:: 2.4 + *base* argument added. -.. function:: asin(x) +.. function:: log10(x) - Return the arc sine of *x*. This has the same branch cuts as :func:`acos`. + Return the base-10 logarithm of *x*. This has the same branch cut as + :func:`log`. -.. function:: asinh(x) +.. function:: sqrt(x) - Return the hyperbolic arc sine of *x*. There are two branch cuts: - One extends from ``1j`` along the imaginary axis to ``???j``, - continuous from the right. The other extends from ``-1j`` along - the imaginary axis to ``-???j``, continuous from the left. + Return the square root of *x*. This has the same branch cut as :func:`log`. + + +Trigonometric functions +----------------------- + +.. function:: acos(x) + + Return the arc cosine of *x*. There are two branch cuts: One extends right from + 1 along the real axis to ???, continuous from below. The other extends left from + -1 along the real axis to -???, continuous from above. - .. versionchanged:: 2.6 - branch cuts moved to match those recommended by the C99 standard + +.. function:: asin(x) + + Return the arc sine of *x*. This has the same branch cuts as :func:`acos`. .. function:: atan(x) @@ -130,93 +141,92 @@ direction of continuity of upper cut reversed -.. function:: atanh(x) - - Return the hyperbolic arc tangent of *x*. There are two branch cuts: One - extends from ``1`` along the real axis to ``???``, continuous from below. The - other extends from ``-1`` along the real axis to ``-???``, continuous from - above. - - .. versionchanged:: 2.6 - direction of continuity of right cut reversed - - .. function:: cos(x) Return the cosine of *x*. -.. function:: cosh(x) +.. function:: sin(x) - Return the hyperbolic cosine of *x*. + Return the sine of *x*. -.. function:: exp(x) +.. function:: tan(x) - Return the exponential value ``e**x``. + Return the tangent of *x*. -.. function:: isinf(x) +Hyperbolic functions +-------------------- - Return *True* if the real or the imaginary part of x is positive - or negative infinity. +.. function:: acosh(x) - .. versionadded:: 2.6 + Return the hyperbolic arc cosine of *x*. There is one branch cut, extending left + from 1 along the real axis to -???, continuous from above. -.. function:: isnan(x) +.. function:: asinh(x) - Return *True* if the real or imaginary part of x is not a number (NaN). + Return the hyperbolic arc sine of *x*. There are two branch cuts: + One extends from ``1j`` along the imaginary axis to ``???j``, + continuous from the right. The other extends from ``-1j`` along + the imaginary axis to ``-???j``, continuous from the left. - .. versionadded:: 2.6 + .. versionchanged:: 2.6 + branch cuts moved to match those recommended by the C99 standard -.. function:: log(x[, base]) +.. function:: atanh(x) - Returns the logarithm of *x* to the given *base*. If the *base* is not - specified, returns the natural logarithm of *x*. There is one branch cut, from 0 - along the negative real axis to -???, continuous from above. + Return the hyperbolic arc tangent of *x*. There are two branch cuts: One + extends from ``1`` along the real axis to ``???``, continuous from below. The + other extends from ``-1`` along the real axis to ``-???``, continuous from + above. - .. versionchanged:: 2.4 - *base* argument added. + .. versionchanged:: 2.6 + direction of continuity of right cut reversed -.. function:: log10(x) +.. function:: cosh(x) - Return the base-10 logarithm of *x*. This has the same branch cut as - :func:`log`. + Return the hyperbolic cosine of *x*. -.. function:: sin(x) +.. function:: sinh(x) - Return the sine of *x*. + Return the hyperbolic sine of *x*. -.. function:: sinh(x) +.. function:: tanh(x) - Return the hyperbolic sine of *x*. + Return the hyperbolic tangent of *x*. -.. function:: sqrt(x) +Classification functions +------------------------ - Return the square root of *x*. This has the same branch cut as :func:`log`. +.. function:: isinf(x) + Return *True* if the real or the imaginary part of x is positive + or negative infinity. -.. function:: tan(x) + .. versionadded:: 2.6 - Return the tangent of *x*. +.. function:: isnan(x) -.. function:: tanh(x) + Return *True* if the real or imaginary part of x is not a number (NaN). + + .. versionadded:: 2.6 - Return the hyperbolic tangent of *x*. -The module also defines two mathematical constants: +Constants +--------- .. data:: pi - The mathematical constant *pi*, as a float. + The mathematical constant *??*, as a float. .. data:: e Modified: python/branches/tk_and_idle_maintenance/Doc/library/codecs.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/codecs.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/codecs.rst Wed Aug 5 15:32:47 2009 @@ -897,6 +897,8 @@ | cp500 | EBCDIC-CP-BE, EBCDIC-CP-CH, | Western Europe | | | IBM500 | | +-----------------+--------------------------------+--------------------------------+ +| cp720 | | Arabic | ++-----------------+--------------------------------+--------------------------------+ | cp737 | | Greek | +-----------------+--------------------------------+--------------------------------+ | cp775 | IBM775 | Baltic languages | Modified: python/branches/tk_and_idle_maintenance/Doc/library/collections.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/collections.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/collections.rst Wed Aug 5 15:32:47 2009 @@ -509,7 +509,7 @@ .. class:: defaultdict([default_factory[, ...]]) Returns a new dictionary-like object. :class:`defaultdict` is a subclass of the - builtin :class:`dict` class. It overrides one method and adds one writable + built-in :class:`dict` class. It overrides one method and adds one writable instance variable. The remaining functionality is the same as for the :class:`dict` class and is not documented here. Modified: python/branches/tk_and_idle_maintenance/Doc/library/compiler.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/compiler.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/compiler.rst Wed Aug 5 15:32:47 2009 @@ -21,11 +21,11 @@ generated a concrete syntax tree. This tree is used to generate an abstract syntax tree (AST) and then Python bytecode. -The full functionality of the package duplicates the builtin compiler provided +The full functionality of the package duplicates the built-in compiler provided with the Python interpreter. It is intended to match its behavior almost exactly. Why implement another compiler that does the same thing? The package is useful for a variety of purposes. It can be modified more easily than the -builtin compiler. The AST it generates is useful for analyzing Python source +built-in compiler. The AST it generates is useful for analyzing Python source code. This chapter explains how the various components of the :mod:`compiler` package @@ -118,7 +118,7 @@ introduced by Python's precedence rules. The abstract syntax tree is created by the :mod:`compiler.transformer` module. -The transformer relies on the builtin Python parser to generate a concrete +The transformer relies on the built-in Python parser to generate a concrete syntax tree. It generates an abstract syntax tree from the concrete tree. .. index:: Modified: python/branches/tk_and_idle_maintenance/Doc/library/configparser.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/configparser.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/configparser.rst Wed Aug 5 15:32:47 2009 @@ -56,7 +56,7 @@ constructor as a dictionary. Additional defaults may be passed into the :meth:`get` method which will override all others. -Sections are normally stored in a builtin dictionary. An alternative dictionary +Sections are normally stored in a built-in dictionary. An alternative dictionary type can be passed to the :class:`ConfigParser` constructor. For example, if a dictionary type is passed that sorts its keys, the sections will be sorted on write-back, as will be the keys within each section. Modified: python/branches/tk_and_idle_maintenance/Doc/library/csv.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/csv.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/csv.rst Wed Aug 5 15:32:47 2009 @@ -61,7 +61,7 @@ Return a reader object which will iterate over lines in the given *csvfile*. *csvfile* can be any object which supports the :term:`iterator` protocol and returns a - string each time its :meth:`next` method is called --- file objects and list + string each time its :meth:`!next` method is called --- file objects and list objects are both suitable. If *csvfile* is a file object, it must be opened with the 'b' flag on platforms where that makes a difference. An optional *dialect* parameter can be given which is used to define a set of parameters Modified: python/branches/tk_and_idle_maintenance/Doc/library/curses.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/curses.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/curses.rst Wed Aug 5 15:32:47 2009 @@ -186,7 +186,7 @@ .. function:: filter() - The :func:`filter` routine, if used, must be called before :func:`initscr` is + The :func:`.filter` routine, if used, must be called before :func:`initscr` is called. The effect is that, during those calls, LINES is set to 1; the capabilities clear, cup, cud, cud1, cuu1, cuu, vpa are disabled; and the home string is set to the value of cr. The effect is that the cursor is confined to @@ -609,9 +609,9 @@ .. note:: A *character* means a C character (an ASCII code), rather then a Python - character (a string of length 1). (This note is true whenever the documentation - mentions a character.) The builtin :func:`ord` is handy for conveying strings to - codes. + character (a string of length 1). (This note is true whenever the + documentation mentions a character.) The built-in :func:`ord` is handy for + conveying strings to codes. Paint character *ch* at ``(y, x)`` with attributes *attr*, overwriting any character previously painter at that location. By default, the character Modified: python/branches/tk_and_idle_maintenance/Doc/library/dbhash.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/dbhash.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/dbhash.rst Wed Aug 5 15:32:47 2009 @@ -72,7 +72,7 @@ Database Objects ---------------- -The database objects returned by :func:`open` provide the methods common to all +The database objects returned by :func:`.open` provide the methods common to all the DBM-style databases and mapping objects. The following methods are available in addition to the standard methods. @@ -80,7 +80,7 @@ .. method:: dbhash.first() It's possible to loop over every key/value pair in the database using this - method and the :meth:`next` method. The traversal is ordered by the databases + method and the :meth:`!next` method. The traversal is ordered by the databases internal hash values, and won't be sorted by the key values. This method returns the starting key. Modified: python/branches/tk_and_idle_maintenance/Doc/library/decimal.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/decimal.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/decimal.rst Wed Aug 5 15:32:47 2009 @@ -330,6 +330,12 @@ numeric-value ::= decimal-part [exponent-part] | infinity numeric-string ::= [sign] numeric-value | [sign] nan + If *value* is a unicode string then other Unicode decimal digits + are also permitted where ``digit`` appears above. These include + decimal digits from various other alphabets (for example, + Arabic-Indic and Devan??gar?? digits) along with the fullwidth digits + ``u'\uff10'`` through ``u'\uff19'``. + If *value* is a :class:`tuple`, it should have three components, a sign (:const:`0` for positive or :const:`1` for negative), a :class:`tuple` of digits, and an integer exponent. For example, ``Decimal((0, (1, 4, 1, 4), -3))`` @@ -624,10 +630,9 @@ .. versionadded:: 2.6 - .. method:: logical_invert(other[, context]) + .. method:: logical_invert([context]) - :meth:`logical_invert` is a logical operation. The argument must - be a *logical operand* (see :ref:`logical_operands_label`). The + :meth:`logical_invert` is a logical operation. The result is the digit-wise inversion of the operand. .. versionadded:: 2.6 @@ -657,7 +662,7 @@ .. method:: max_mag(other[, context]) - Similar to the :meth:`max` method, but the comparison is done using the + Similar to the :meth:`.max` method, but the comparison is done using the absolute values of the operands. .. versionadded:: 2.6 @@ -671,7 +676,7 @@ .. method:: min_mag(other[, context]) - Similar to the :meth:`min` method, but the comparison is done using the + Similar to the :meth:`.min` method, but the comparison is done using the absolute values of the operands. .. versionadded:: 2.6 Modified: python/branches/tk_and_idle_maintenance/Doc/library/dis.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/dis.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/dis.rst Wed Aug 5 15:32:47 2009 @@ -705,7 +705,7 @@ .. opcode:: FOR_ITER (delta) - ``TOS`` is an :term:`iterator`. Call its :meth:`next` method. If this + ``TOS`` is an :term:`iterator`. Call its :meth:`!next` method. If this yields a new value, push it on the stack (leaving the iterator below it). If the iterator indicates it is exhausted ``TOS`` is popped, and the bytecode counter is incremented by *delta*. Modified: python/branches/tk_and_idle_maintenance/Doc/library/dl.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/dl.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/dl.rst Wed Aug 5 15:32:47 2009 @@ -44,12 +44,12 @@ .. data:: RTLD_LAZY - Useful as an argument to :func:`open`. + Useful as an argument to :func:`.open`. .. data:: RTLD_NOW - Useful as an argument to :func:`open`. Note that on systems which do not + Useful as an argument to :func:`.open`. Note that on systems which do not support immediate binding, this constant will not appear in the module. For maximum portability, use :func:`hasattr` to determine if the system supports immediate binding. @@ -78,7 +78,7 @@ Dl Objects ---------- -Dl objects, as returned by :func:`open` above, have the following methods: +Dl objects, as returned by :func:`.open` above, have the following methods: .. method:: dl.close() Modified: python/branches/tk_and_idle_maintenance/Doc/library/exceptions.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/exceptions.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/exceptions.rst Wed Aug 5 15:32:47 2009 @@ -281,10 +281,10 @@ .. exception:: StopIteration - Raised by an :term:`iterator`\'s :meth:`next` method to signal that there are - no further values. This is derived from :exc:`Exception` rather than - :exc:`StandardError`, since this is not considered an error in its normal - application. + Raised by an :term:`iterator`\'s :meth:`~iterator.next` method to signal that + there are no further values. This is derived from :exc:`Exception` rather + than :exc:`StandardError`, since this is not considered an error in its + normal application. .. versionadded:: 2.2 @@ -477,7 +477,10 @@ .. versionadded:: 2.5 -The class hierarchy for built-in exceptions is: +Exception hierarchy +------------------- + +The class hierarchy for built-in exceptions is: .. literalinclude:: ../../Lib/test/exception_hierarchy.txt Modified: python/branches/tk_and_idle_maintenance/Doc/library/fileinput.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/fileinput.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/fileinput.rst Wed Aug 5 15:32:47 2009 @@ -20,10 +20,10 @@ This iterates over the lines of all files listed in ``sys.argv[1:]``, defaulting to ``sys.stdin`` if the list is empty. If a filename is ``'-'``, it is also replaced by ``sys.stdin``. To specify an alternative list of filenames, pass it -as the first argument to :func:`input`. A single file name is also allowed. +as the first argument to :func:`.input`. A single file name is also allowed. All files are opened in text mode by default, but you can override this by -specifying the *mode* parameter in the call to :func:`input` or +specifying the *mode* parameter in the call to :func:`.input` or :class:`FileInput()`. If an I/O error occurs during opening or reading a file, :exc:`IOError` is raised. Modified: python/branches/tk_and_idle_maintenance/Doc/library/fractions.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/fractions.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/fractions.rst Wed Aug 5 15:32:47 2009 @@ -20,7 +20,7 @@ Fraction(string) The first version requires that *numerator* and *denominator* are - instances of :class:`numbers.Integral` and returns a new + instances of :class:`numbers.Rational` and returns a new :class:`Fraction` instance with value ``numerator/denominator``. If *denominator* is :const:`0`, it raises a :exc:`ZeroDivisionError`. The second version requires that Modified: python/branches/tk_and_idle_maintenance/Doc/library/functions.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/functions.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/functions.rst Wed Aug 5 15:32:47 2009 @@ -151,7 +151,7 @@ ``'exec'`` if *source* consists of a sequence of statements, ``'eval'`` if it consists of a single expression, or ``'single'`` if it consists of a single interactive statement (in the latter case, expression statements that - evaluate to something else than ``None`` will be printed). + evaluate to something other than ``None`` will be printed). The optional arguments *flags* and *dont_inherit* control which future statements (see :pep:`236`) affect the compilation of *source*. If neither @@ -291,7 +291,7 @@ Return an enumerate object. *sequence* must be a sequence, an :term:`iterator`, or some other object which supports iteration. The - :meth:`next` method of the iterator returned by :func:`enumerate` returns a + :meth:`!next` method of the iterator returned by :func:`enumerate` returns a tuple containing a count (from *start* which defaults to 0) and the corresponding value obtained from iterating over *iterable*. :func:`enumerate` is useful for obtaining an indexed series: ``(0, seq[0])``, @@ -595,7 +595,7 @@ does not support either of those protocols, :exc:`TypeError` is raised. If the second argument, *sentinel*, is given, then *o* must be a callable object. The iterator created in this case will call *o* with no arguments for each call to - its :meth:`next` method; if the value returned is equal to *sentinel*, + its :meth:`~iterator.next` method; if the value returned is equal to *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will be returned. One useful application of the second form of :func:`iter` is to read lines of @@ -705,9 +705,9 @@ .. function:: next(iterator[, default]) - Retrieve the next item from the *iterator* by calling its :meth:`next` - method. If *default* is given, it is returned if the iterator is exhausted, - otherwise :exc:`StopIteration` is raised. + Retrieve the next item from the *iterator* by calling its + :meth:`~iterator.next` method. If *default* is given, it is returned if the + iterator is exhausted, otherwise :exc:`StopIteration` is raised. .. versionadded:: 2.6 @@ -847,7 +847,7 @@ .. note:: - This function is not normally available as a builtin since the name + This function is not normally available as a built-in since the name ``print`` is recognized as the :keyword:`print` statement. To disable the statement and use the :func:`print` function, use this future statement at the top of your module:: Modified: python/branches/tk_and_idle_maintenance/Doc/library/future_builtins.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/future_builtins.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/future_builtins.rst Wed Aug 5 15:32:47 2009 @@ -1,14 +1,14 @@ -:mod:`future_builtins` --- Python 3 builtins -============================================ +:mod:`future_builtins` --- Python 3 built-ins +============================================= .. module:: future_builtins .. sectionauthor:: Georg Brandl .. versionadded:: 2.6 This module provides functions that exist in 2.x, but have different behavior in -Python 3, so they cannot be put into the 2.x builtin namespace. +Python 3, so they cannot be put into the 2.x builtins namespace. -Instead, if you want to write code compatible with Python 3 builtins, import +Instead, if you want to write code compatible with Python 3 built-ins, import them from this module, like this:: from future_builtins import map, filter @@ -16,17 +16,17 @@ ... code using Python 3-style map and filter ... The :term:`2to3` tool that ports Python 2 code to Python 3 will recognize -this usage and leave the new builtins alone. +this usage and leave the new built-ins alone. .. note:: - The Python 3 :func:`print` function is already in the builtins, but cannot be + The Python 3 :func:`print` function is already in the built-ins, but cannot be accessed from Python 2 code unless you use the appropriate future statement:: from __future__ import print_function -Available builtins are: +Available built-ins are: .. function:: ascii(object) @@ -42,7 +42,7 @@ .. function:: hex(object) - Works like the builtin :func:`hex`, but instead of :meth:`__hex__` it will + Works like the built-in :func:`hex`, but instead of :meth:`__hex__` it will use the :meth:`__index__` method on its argument to get an integer that is then converted to hexadecimal. @@ -52,7 +52,7 @@ .. function:: oct(object) - Works like the builtin :func:`oct`, but instead of :meth:`__oct__` it will + Works like the built-in :func:`oct`, but instead of :meth:`__oct__` it will use the :meth:`__index__` method on its argument to get an integer that is then converted to octal. Modified: python/branches/tk_and_idle_maintenance/Doc/library/gc.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/gc.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/gc.rst Wed Aug 5 15:32:47 2009 @@ -48,7 +48,7 @@ The optional *generation* argument was added. .. versionchanged:: 2.6 - The free lists maintained for a number of builtin types are cleared + The free lists maintained for a number of built-in types are cleared whenever a full collection or collection of the highest generation (2) is run. Not all items in some free lists may be freed due to the particular implementation, in particular :class:`int` and :class:`float`. Modified: python/branches/tk_and_idle_maintenance/Doc/library/gettext.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/gettext.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/gettext.rst Wed Aug 5 15:32:47 2009 @@ -205,13 +205,13 @@ .. function:: install(domain[, localedir[, unicode [, codeset[, names]]]]) - This installs the function :func:`_` in Python's builtin namespace, based on + This installs the function :func:`_` in Python's builtins namespace, based on *domain*, *localedir*, and *codeset* which are passed to the function :func:`translation`. The *unicode* flag is passed to the resulting translation - object's :meth:`install` method. + object's :meth:`~NullTranslations.install` method. For the *names* parameter, please see the description of the translation - object's :meth:`install` method. + object's :meth:`~NullTranslations.install` method. As seen below, you usually mark the strings in your application that are candidates for translation, by wrapping them in a call to the :func:`_` @@ -220,7 +220,7 @@ print _('This string will be translated.') For convenience, you want the :func:`_` function to be installed in Python's - builtin namespace, so it is easily accessible in all modules of your + builtins namespace, so it is easily accessible in all modules of your application. .. versionchanged:: 2.4 @@ -347,7 +347,7 @@ it binds :meth:`self.ugettext` instead. By default, *unicode* is false. If the *names* parameter is given, it must be a sequence containing the - names of functions you want to install in the builtin namespace in + names of functions you want to install in the builtins namespace in addition to :func:`_`. Supported names are ``'gettext'`` (bound to :meth:`self.gettext` or :meth:`self.ugettext` according to the *unicode* flag), ``'ngettext'`` (bound to :meth:`self.ngettext` or Modified: python/branches/tk_and_idle_maintenance/Doc/library/heapq.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/heapq.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/heapq.rst Wed Aug 5 15:32:47 2009 @@ -147,7 +147,7 @@ The latter two functions perform best for smaller values of *n*. For larger values, it is more efficient to use the :func:`sorted` function. Also, when -``n==1``, it is more efficient to use the builtin :func:`min` and :func:`max` +``n==1``, it is more efficient to use the built-in :func:`min` and :func:`max` functions. Modified: python/branches/tk_and_idle_maintenance/Doc/library/imp.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/imp.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/imp.rst Wed Aug 5 15:32:47 2009 @@ -34,16 +34,17 @@ .. function:: find_module(name[, path]) - Try to find the module *name* on the search path *path*. If *path* is a list - of directory names, each directory is searched for files with any of the - suffixes returned by :func:`get_suffixes` above. Invalid names in the list - are silently ignored (but all list items must be strings). If *path* is - omitted or ``None``, the list of directory names given by ``sys.path`` is - searched, but first it searches a few special places: it tries to find a - built-in module with the given name (:const:`C_BUILTIN`), then a frozen - module (:const:`PY_FROZEN`), and on some systems some other places are looked - in as well (on Windows, it looks in the registry which may point to a - specific file). + Try to find the module *name*. If *path* is omitted or ``None``, the list of + directory names given by ``sys.path`` is searched, but first a few special + places are searched: the function tries to find a built-in module with the + given name (:const:`C_BUILTIN`), then a frozen module (:const:`PY_FROZEN`), + and on some systems some other places are looked in as well (on Windows, it + looks in the registry which may point to a specific file). + + Otherwise, *path* must be a list of directory names; each directory is + searched for files with any of the suffixes returned by :func:`get_suffixes` + above. Invalid names in the list are silently ignored (but all list items + must be strings). If search is successful, the return value is a 3-element tuple ``(file, pathname, description)``: Modified: python/branches/tk_and_idle_maintenance/Doc/library/imputil.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/imputil.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/imputil.rst Wed Aug 5 15:32:47 2009 @@ -79,7 +79,7 @@ .. class:: BuiltinImporter() - Emulate the import mechanism for builtin and frozen modules. This is a + Emulate the import mechanism for built-in and frozen modules. This is a sub-class of the :class:`Importer` class. .. method:: BuiltinImporter.get_code(parent, modname, fqname) Modified: python/branches/tk_and_idle_maintenance/Doc/library/internet.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/internet.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/internet.rst Wed Aug 5 15:32:47 2009 @@ -35,7 +35,6 @@ smtpd.rst telnetlib.rst uuid.rst - ipaddr.rst urlparse.rst socketserver.rst basehttpserver.rst Modified: python/branches/tk_and_idle_maintenance/Doc/library/intro.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/intro.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/intro.rst Wed Aug 5 15:32:47 2009 @@ -44,8 +44,9 @@ function, module or term in the index (in the back). And finally, if you enjoy learning about random subjects, you choose a random page number (see module :mod:`random`) and read a section or two. Regardless of the order in which you -read the sections of this manual, it helps to start with chapter :ref:`builtin`, -as the remainder of the manual assumes familiarity with this material. +read the sections of this manual, it helps to start with chapter +:ref:`built-in-funcs`, as the remainder of the manual assumes familiarity with +this material. Let the show begin! Modified: python/branches/tk_and_idle_maintenance/Doc/library/io.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/io.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/io.rst Wed Aug 5 15:32:47 2009 @@ -10,7 +10,7 @@ .. versionadded:: 2.6 The :mod:`io` module provides the Python interfaces to stream handling. The -builtin :func:`open` function is defined in this module. +built-in :func:`open` function is defined in this module. At the top of the I/O hierarchy is the abstract base class :class:`IOBase`. It defines the basic interface to a stream. Note, however, that there is no @@ -37,7 +37,7 @@ stream for text. Argument names are not part of the specification, and only the arguments of -:func:`open` are intended to be used as keyword arguments. +:func:`.open` are intended to be used as keyword arguments. Module Interface @@ -46,7 +46,7 @@ .. data:: DEFAULT_BUFFER_SIZE An int containing the default buffer size used by the module's buffered I/O - classes. :func:`open` uses the file's blksize (as obtained by + classes. :func:`.open` uses the file's blksize (as obtained by :func:`os.stat`) if possible. .. function:: open(file[, mode[, buffering[, encoding[, errors[, newline[, closefd=True]]]]]]) @@ -138,8 +138,8 @@ when the file is closed. If a filename is given *closefd* has no effect but must be ``True`` (the default). - The type of file object returned by the :func:`open` function depends - on the mode. When :func:`open` is used to open a file in a text mode + The type of file object returned by the :func:`.open` function depends + on the mode. When :func:`.open` is used to open a file in a text mode (``'w'``, ``'r'``, ``'wt'``, ``'rt'``, etc.), it returns a :class:`TextIOWrapper`. When used to open a file in a binary mode, the returned class varies: in read binary mode, it returns a @@ -250,7 +250,7 @@ most *limit* bytes will be read. The line terminator is always ``b'\n'`` for binary files; for text files, - the *newlines* argument to :func:`open` can be used to select the line + the *newlines* argument to :func:`.open` can be used to select the line terminator(s) recognized. .. method:: readlines([hint]) Deleted: python/branches/tk_and_idle_maintenance/Doc/library/ipaddr.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/ipaddr.rst Wed Aug 5 15:32:47 2009 +++ (empty file) @@ -1,417 +0,0 @@ -:mod:`ipaddr` --- IP address manipulation library -================================================= - -.. module:: ipaddr - :synopsis: IPv4 and IPv6 network address manipulation classes. -.. moduleauthor:: Google, Inc. -.. sectionauthor:: Gregory P. Smith - - -.. versionadded:: 2.7 - -.. index:: - single: IP address, IPv4, IPv6, netmask - -This module implements classes for working with IP host and network addresses, -both IPv4 and IPv6. - - -.. _ipaddr_examples: - -Examples --------- - -Netmask. - - >>> ipaddr.IP('1.1.1.1/255.255.255.0') - IPv4('1.1.1.1/24') - >>> ipaddr.IP('1080::200C:417B/96') - IPv6('1080::200c:417b/96') - -Hostmask. - - >>> ipaddr.IPv4('1.1.1.1/0.0.0.255') - IPv4('1.1.1.1/24') - -Prefix length. - - >>> addr = ipaddr.IPv4('1.1.1.1/24') - >>> addr.prefixlen - 24 - -Individual addresses. - - >>> ipaddr.IP('1.1.1.1') - IPv4('1.1.1.1/32') - -Many standard Python operations are also supported. - -Comparison. - - >>> ipaddr.IPv4('1.1.1.1') == ipaddr.IPv4('1.1.1.2') - False - >>> ipaddr.IPv4('1.1.1.1') < ipaddr.IPv4('1.1.1.2') - True - -Inclusion. - - >>> ipaddr.IPv4('1.1.1.1') in ipaddr.IPv4("1.0.0.0/8") - True - -Sorting. - - >>> a = ipaddr.IPv4('1.1.1.10') - >>> b = ipaddr.IPv4('1.10.1.10') - >>> c = ipaddr.IPv4('1.1.10.10') - >>> d = ipaddr.IPv4('1.1.1.1') - >>> sorted([a, b, c, d]) - [IPv4('1.1.1.1/32'), IPv4('1.1.1.10/32'), IPv4('1.1.10.10/32'), IPv4('1.10.1.10/32')] - -Conversion to string and integer forms. - - >>> spam = ipaddr.IPv4('192.168.1.254')) - >>> str(spam) - '192.168.1.254/32' - >>> spam.ip_ext - '192.168.1.254' - >>> int(spam) - 3232236030 - >>> eggs = ipaddr.IPv6('ffff::1/120') - >>> int(eggs) - 340277174624079928635746076935438991361 - -Additionally, there are quite a few network-specific features available to -ipaddr. - - >>> ipaddr.IPv4('10.0.0.0/8').supernet() - IPv4('10.0.0.0/7') - >>> ipaddr.IPv4('10.0.0.0/8').subnet() - [IPv4('10.0.0.0/9'), IPv4('10.128.0.0/9')] - # This returns networks with a prefix length of /10 - >>> ipaddr.IPv4('10.0.0.0/8').subnet(prefixlen_diff=2) - [IPv4('10.0.0.0/10'), IPv4('10.64.0.0/10'), IPv4('10.128.0.0/10'), IPv4('10.192.0.0/10')] - # Remove an address from a superblock. - >>> ipaddr.IP('10.0.0.0/24').address_exclude(ipaddr.IP('10.0.0.0/28')) - [IPv4('10.0.0.16/28'), IPv4('10.0.0.32/27'), IPv4('10.0.0.64/26'), IPv4('10.0.0.128/25')] - - -.. _ipaddr_funcs_and_classes: - -Functions And Classes ---------------------- - -.. function:: IP(ipaddr) - - Take an IP string or int and return an object of the correct type. Returns - an :class:`IPv4` or :class:`IPv6` object. - - The *ipaddr* parameter must be a string or integer representing the IP - address. Either IPv4 or IPv6 addresses may be supplied. Integers less than - 2**32 will be considered to be IPv4. - - Raises :exc:`ValueError` if the *ipaddr* passed is not either an IPv4 or an - IPv6 address. - - -.. function:: collapse_address_list(addresses) - - Collapse a sequence of :class:`IPv4` or :class:`IPv6` objects into the most - concise representation. Returns a list of :class:`IPv4` or :class:`IPv6` - objects. - - Example usage:: - - >>> collapse_address_list([IPv4('1.1.0.0/24'), IPv4('1.1.1.0/24')]) - [IPv4('1.1.0.0/23')] - - -.. class:: BaseIP() - - A generic IP address object. This base class defines the API and contains - common code. Most authors should either use the :func:`IP` function or - create :class:`IPv4` or :class:`IPv6` objects directly rather than using this - base class. - - IP address objects support the following python operators: - ``=``, ``!=``, ``<``, ``>``, ``<=``, ``>=``, and ``in``. - - An IP address object may be used as a sequence index or as a hash key and can - be converted back to an integer representation using :func:`int`. It may - also be used as a sequence that yields the string representation of every IP - address within the object's subnet. - - The following properties are available on all IP address objects: - - .. attribute:: broadcast - - Integer representation of the broadcast address. Read only. - - .. attribute:: broadcast_ext - - Dotted decimal or colon string version of the broadcast address. Read - only. - - .. attribute:: hostmask - - Integer representation of the hostmask. Read only. - - .. attribute:: hostmask_ext - - Dotted decimal or colon string version of the hostmask. Read only. - - .. attribute:: ip - - Integer representation of the IP address. Read only. - - .. attribute:: ip_ext - - Dotted decimal or colon string version of the IP address. Read only. - - .. attribute:: ip_ext_full - - Canonical string version of the IP address. Read only. - - .. attribute:: is_loopback - - True if the address is a loopback address as defined in IPv4 :rfc:`3330` - or IPv6 :rfc:`2373` section 2.5.3. - - .. attribute:: is_link_local - - True if the address is a link-local address as defined in IPv4 :rfc:`3927` - or IPv6 :rfc:`4291`. - - .. attribute:: is_multicast - - True if the address is reserved for multicast use. See IPv4 :rfc:`3171` - or IPv6 :rfc:`2373` section 2.7 for details. - - .. attribute:: is_private - - True if the address is reserved for private networks as defined in IPv4 - :rfc:`1918` or IPv6 :rfc:`4193`. - - .. attribute:: netmask - - Integer representation of the netmask. Read only. - - .. attribute:: netmask_ext - - Dotted decimal or colon string version of the netmask. Read only. - - .. attribute:: network - - Integer representation of the network. Read only. - - .. attribute:: network_ext - - Dotted decimal or colon string version of the network. Read only. - - .. attribute:: numhosts - - Number of hosts in the current subnet. Read only. - - .. attribute:: packed - - The packed network byte order representation of this network address. - Read only. - - .. attribute:: prefixlen - - A property to get and set the prefix length. Readable and writeable. - - .. attribute:: version - - Integer IP version number. Read only. - - - The following methods are available on all IP address objects: - - .. method:: address_exclude(other) - - Remove an address from within a larger block. Returns a sorted list of IP - address objects representing networks. - - Examples:: - - >>> addr1 = IP('10.1.1.0/24') - >>> addr2 = IP('10.1.1.0/26') - >>> addr1.address_exclude(addr2) - [IP('10.1.1.64/26'), IP('10.1.1.128/25')] - - >>> addr1 = IP('::1/32') - >>> addr2 = IP('::1/128') - >>> addr1.address_exclude(addr2) - [IP('::0/128'), IP('::2/127'), IP('::4/126'), IP('::8/125'), IP('0:0:8000::/33')] - - Raises :exc:`ValueError` if *other* is not completely contained by *self*. - - - .. method:: compare_networks(other) - - Compare this IP object's network to another IP network. - Returns -1, 0 or 1. - - This compares the integer representation of the network addresses. The - host bits are not considered by this method. If you want to compare host - bits, you can use ``host_a.ip < host_b.ip``. - - If the IP versions of self and other are the same, returns: - - -1 if self < other - eg: IPv4('1.1.1.0/24') < IPv4('1.1.2.0/24') - - IPv6('1080::200C:417A') < IPv6('1080::200B:417B') - - 0 if self == other - eg: IPv4('1.1.1.1/24') == IPv4('1.1.1.2/24') - - IPv6('1080::200C:417A/96') == IPv6('1080::200C:417B/96') - - 1 if self > other - eg: IPv4('1.1.1.0/24') > IPv4('1.1.0.0/24') - - IPv6('1080::1:200C:417A/112') > IPv6('1080::0:200C:417A/112') - - If the IP versions of self and other are different, returns: - - -1 if self.version < other.version - eg: IPv4('10.0.0.1/24') < IPv6('::1/128') - - 1 if self.version > other.version - eg: IPv6('::1/128') > IPv4('255.255.255.0/24') - - - .. method:: subnet(prefixlen_diff=1) - - Returns a list of subnets which when joined make up the current subnet. - - The optional *prefixlen_diff* argument specifies how many bits the prefix - length should be increased by. Given a /24 network and - ``prefixlen_diff=3``, for example, 8 subnets of size /27 will be returned. - - If called on a host IP address rather than a network, a list containing - the host itself will be returned. - - Raises :exc:`PrefixlenDiffInvalidError` if the *prefixlen_diff* is out of - range. - - - .. method:: supernet(prefixlen_diff=1) - - Returns a single IP object representing the supernet containing the - current network. - - The optional *prefixlen_diff* argument specifies how many bits the prefix - length should be decreased by. Given a /24 network and - ``prefixlen_diff=3``, for example, a supernet with a 21 bit netmask is - returned. - - Raises :exc:`PrefixlenDiffInvalidError` if the prefixlen_diff is out of - range. - - -.. class:: IPv4() - - This class represents and manipulates 32-bit IPv4 addresses. - - Attributes:: - - # These examples for IPv4('1.2.3.4/27') - .ip: 16909060 - .ip_ext: '1.2.3.4' - .ip_ext_full: '1.2.3.4' - .network: 16909056 - .network_ext: '1.2.3.0' - .hostmask: 31 (0x1F) - .hostmask_ext: '0.0.0.31' - .broadcast: 16909087 (0x102031F) - .broadcast_ext: '1.2.3.31' - .netmask: 4294967040 (0xFFFFFFE0) - .netmask_ext: '255.255.255.224' - .prefixlen: 27 - - -.. class:: IPv6() - - This class respresents and manipulates 128-bit IPv6 addresses. - - Attributes:: - - # These examples are for IPv6('2001:658:22A:CAFE:200::1/64') - .ip: 42540616829182469433547762482097946625 - .ip_ext: '2001:658:22a:cafe:200::1' - .ip_ext_full: '2001:0658:022a:cafe:0200:0000:0000:0001' - .network: 42540616829182469433403647294022090752 - .network_ext: '2001:658:22a:cafe::' - .hostmask: 18446744073709551615 - .hostmask_ext: '::ffff:ffff:ffff:ffff' - .broadcast: 42540616829182469451850391367731642367 - .broadcast_ext: '2001:658:22a:cafe:ffff:ffff:ffff:ffff' - .netmask: 340282366920938463444927863358058659840 - .netmask_ext: 64 - .prefixlen: 64 - - .. attribute:: is_site_local - - True if the address was reserved as site-local in :rfc:`3513` section - 2.5.6. - - .. note:: - - The IPv6 site-local address space has been deprecated by :rfc:`3879`. - Use :data:`is_private` to test if this address is in the space of - unique local addresses as defined by :rfc:`4193`. - - .. attribute:: is_unspecified - - True if this is the unspecified address as defined in :rfc:`2373` section - 2.5.2. - - -.. _ipaddr_exceptions: - -Exceptions ----------- - -The following exceptions are defined by this module: - -.. exception:: Error - - Base class for all exceptions defined in this module. - -.. exception:: IPTypeError - - Tried to perform a v4 action on v6 object or vice versa. - -.. exception:: IPAddressExclusionError - - An Error we should never see occurred in address exclusion. - -.. exception:: IPv4IpValidationError - - Raised when an IPv4 address is invalid. - -.. exception:: IPv4NetmaskValidationError - - Raised when a netmask is invalid. - -.. exception:: IPv6IpValidationError - - Raised when an IPv6 address is invalid. - -.. exception:: IPv6NetmaskValidationError - - Raised when an IPv6 netmask is invalid. - -.. exception:: PrefixlenDiffInvalidError - - Raised when :meth:`BaseIP.subnet` or :meth:`BaseIP.supernet` is called with a - bad ``prefixlen_diff``. - - -.. seealso:: - - http://code.google.com/p/ipaddr-py/ - The original source of this module and a place to download it as a package - for use on earlier versions of Python. Modified: python/branches/tk_and_idle_maintenance/Doc/library/locale.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/locale.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/locale.rst Wed Aug 5 15:32:47 2009 @@ -148,10 +148,124 @@ .. function:: nl_langinfo(option) - Return some locale-specific information as a string. This function is not - available on all systems, and the set of possible options might also vary across - platforms. The possible argument values are numbers, for which symbolic - constants are available in the locale module. + Return some locale-specific information as a string. This function is not + available on all systems, and the set of possible options might also vary + across platforms. The possible argument values are numbers, for which + symbolic constants are available in the locale module. + + The :func:`nl_langinfo` function accepts one of the following keys. Most + descriptions are taken from the corresponding description in the GNU C + library. + + .. data:: CODESET + + Get a string with the name of the character encoding used in the + selected locale. + + .. data:: D_T_FMT + + Get a string that can be used as a format string for :func:`strftime` to + represent time and date in a locale-specific way. + + .. data:: D_FMT + + Get a string that can be used as a format string for :func:`strftime` to + represent a date in a locale-specific way. + + .. data:: T_FMT + + Get a string that can be used as a format string for :func:`strftime` to + represent a time in a locale-specific way. + + .. data:: T_FMT_AMPM + + Get a format string for :func:`strftime` to represent time in the am/pm + format. + + .. data:: DAY_1 ... DAY_7 + + Get the name of the n-th day of the week. + + .. note:: + + This follows the US convention of :const:`DAY_1` being Sunday, not the + international convention (ISO 8601) that Monday is the first day of the + week. + + .. data:: ABDAY_1 ... ABDAY_7 + + Get the abbreviated name of the n-th day of the week. + + .. data:: MON_1 ... MON_12 + + Get the name of the n-th month. + + .. data:: ABMON_1 ... ABMON_12 + + Get the abbreviated name of the n-th month. + + .. data:: RADIXCHAR + + Get the radix character (decimal dot, decimal comma, etc.) + + .. data:: THOUSEP + + Get the separator character for thousands (groups of three digits). + + .. data:: YESEXPR + + Get a regular expression that can be used with the regex function to + recognize a positive response to a yes/no question. + + .. note:: + + The expression is in the syntax suitable for the :cfunc:`regex` function + from the C library, which might differ from the syntax used in :mod:`re`. + + .. data:: NOEXPR + + Get a regular expression that can be used with the regex(3) function to + recognize a negative response to a yes/no question. + + .. data:: CRNCYSTR + + Get the currency symbol, preceded by "-" if the symbol should appear before + the value, "+" if the symbol should appear after the value, or "." if the + symbol should replace the radix character. + + .. data:: ERA + + Get a string that represents the era used in the current locale. + + Most locales do not define this value. An example of a locale which does + define this value is the Japanese one. In Japan, the traditional + representation of dates includes the name of the era corresponding to the + then-emperor's reign. + + Normally it should not be necessary to use this value directly. Specifying + the ``E`` modifier in their format strings causes the :func:`strftime` + function to use this information. The format of the returned string is not + specified, and therefore you should not assume knowledge of it on different + systems. + + .. data:: ERA_YEAR + + Get the year in the relevant era of the locale. + + .. data:: ERA_D_T_FMT + + Get a format string for :func:`strftime` to represent dates and times in a + locale-specific era-based way. + + .. data:: ERA_D_FMT + + Get a format string for :func:`strftime` to represent time in a + locale-specific era-based way. + + .. data:: ALT_DIGITS + + Get a representation of up to 100 values used to represent the values + 0 to 99. .. function:: getdefaultlocale([envvars]) @@ -340,8 +454,8 @@ .. data:: LC_NUMERIC - Locale category for formatting numbers. The functions :func:`format`, - :func:`atoi`, :func:`atof` and :func:`str` of the :mod:`locale` module are + Locale category for formatting numbers. The functions :func:`.format`, + :func:`atoi`, :func:`atof` and :func:`.str` of the :mod:`locale` module are affected by that category. All other numeric formatting operations are not affected. @@ -360,140 +474,13 @@ This is a symbolic constant used for different values returned by :func:`localeconv`. -The :func:`nl_langinfo` function accepts one of the following keys. Most -descriptions are taken from the corresponding description in the GNU C library. - - -.. data:: CODESET - - Return a string with the name of the character encoding used in the selected - locale. - - -.. data:: D_T_FMT - - Return a string that can be used as a format string for strftime(3) to represent - time and date in a locale-specific way. - - -.. data:: D_FMT - - Return a string that can be used as a format string for strftime(3) to represent - a date in a locale-specific way. - - -.. data:: T_FMT - - Return a string that can be used as a format string for strftime(3) to represent - a time in a locale-specific way. - - -.. data:: T_FMT_AMPM - - The return value can be used as a format string for 'strftime' to represent time - in the am/pm format. - - -.. data:: DAY_1 ... DAY_7 - - Return name of the n-th day of the week. - - .. note:: - - This follows the US convention of :const:`DAY_1` being Sunday, not the - international convention (ISO 8601) that Monday is the first day of the week. - - -.. data:: ABDAY_1 ... ABDAY_7 - - Return abbreviated name of the n-th day of the week. - - -.. data:: MON_1 ... MON_12 - - Return name of the n-th month. - - -.. data:: ABMON_1 ... ABMON_12 - - Return abbreviated name of the n-th month. - - -.. data:: RADIXCHAR - - Return radix character (decimal dot, decimal comma, etc.) - - -.. data:: THOUSEP - - Return separator character for thousands (groups of three digits). - - -.. data:: YESEXPR - - Return a regular expression that can be used with the regex function to - recognize a positive response to a yes/no question. - - .. note:: - - The expression is in the syntax suitable for the :cfunc:`regex` function from - the C library, which might differ from the syntax used in :mod:`re`. - - -.. data:: NOEXPR - - Return a regular expression that can be used with the regex(3) function to - recognize a negative response to a yes/no question. - - -.. data:: CRNCYSTR - - Return the currency symbol, preceded by "-" if the symbol should appear before - the value, "+" if the symbol should appear after the value, or "." if the symbol - should replace the radix character. - - -.. data:: ERA - - The return value represents the era used in the current locale. - - Most locales do not define this value. An example of a locale which does define - this value is the Japanese one. In Japan, the traditional representation of - dates includes the name of the era corresponding to the then-emperor's reign. - - Normally it should not be necessary to use this value directly. Specifying the - ``E`` modifier in their format strings causes the :func:`strftime` function to - use this information. The format of the returned string is not specified, and - therefore you should not assume knowledge of it on different systems. - - -.. data:: ERA_YEAR - - The return value gives the year in the relevant era of the locale. - - -.. data:: ERA_D_T_FMT - - This return value can be used as a format string for :func:`strftime` to - represent dates and times in a locale-specific era-based way. - - -.. data:: ERA_D_FMT - - This return value can be used as a format string for :func:`strftime` to - represent time in a locale-specific era-based way. - - -.. data:: ALT_DIGITS - - The return value is a representation of up to 100 values used to represent the - values 0 to 99. Example:: >>> import locale >>> loc = locale.getlocale() # get current locale - >>> locale.setlocale(locale.LC_ALL, 'de_DE') # use German locale; name might vary with platform + # use German locale; name might vary with platform + >>> locale.setlocale(locale.LC_ALL, 'de_DE') >>> locale.strcoll('f\xe4n', 'foo') # compare a string containing an umlaut >>> locale.setlocale(locale.LC_ALL, '') # use user's preferred locale >>> locale.setlocale(locale.LC_ALL, 'C') # use default (C) locale @@ -536,7 +523,7 @@ The only way to perform numeric operations according to the locale is to use the special functions defined by this module: :func:`atof`, :func:`atoi`, -:func:`format`, :func:`str`. +:func:`.format`, :func:`.str`. .. _embedding-locale: Modified: python/branches/tk_and_idle_maintenance/Doc/library/logging.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/logging.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/logging.rst Wed Aug 5 15:32:47 2009 @@ -1012,7 +1012,7 @@ Handles a record by passing it to all handlers associated with this logger and its ancestors (until a false value of *propagate* is found). This method is used for unpickled records received from a socket, as well as those created locally. - Logger-level filtering is applied using :meth:`filter`. + Logger-level filtering is applied using :meth:`~Logger.filter`. .. method:: Logger.makeRecord(name, lvl, fn, lno, msg, args, exc_info [, func, extra]) Modified: python/branches/tk_and_idle_maintenance/Doc/library/macostools.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/macostools.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/macostools.rst Wed Aug 5 15:32:47 2009 @@ -60,7 +60,7 @@ :mod:`findertools` --- The :program:`finder`'s Apple Events interface -===================================================================== +====================================================================== .. module:: findertools :platform: Mac Modified: python/branches/tk_and_idle_maintenance/Doc/library/mailbox.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/mailbox.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/mailbox.rst Wed Aug 5 15:32:47 2009 @@ -1530,7 +1530,7 @@ Most of the older mailbox classes have names that differ from the current mailbox class names, except for :class:`Maildir`. For this reason, the new -:class:`Maildir` class defines a :meth:`next` method and its constructor differs +:class:`Maildir` class defines a :meth:`!next` method and its constructor differs slightly from those of the other new mailbox classes. The older mailbox classes whose names are not the same as their newer @@ -1543,7 +1543,7 @@ single file and separated by ``From`` (a.k.a. ``From_``) lines. The file object *fp* points to the mailbox file. The optional *factory* parameter is a callable that should create new message objects. *factory* is called with one argument, - *fp* by the :meth:`next` method of the mailbox object. The default is the + *fp* by the :meth:`!next` method of the mailbox object. The default is the :class:`rfc822.Message` class (see the :mod:`rfc822` module -- and the note below). Modified: python/branches/tk_and_idle_maintenance/Doc/library/multifile.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/multifile.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/multifile.rst Wed Aug 5 15:32:47 2009 @@ -109,7 +109,7 @@ an input line, it will be interpreted as a section-divider or end-marker (depending on the decoration, see :rfc:`2045`). All subsequent reads will return the empty string to indicate end-of-file, until a call to :meth:`pop` - removes the boundary a or :meth:`next` call reenables it. + removes the boundary a or :meth:`.next` call reenables it. It is possible to push more than one boundary. Encountering the most-recently-pushed boundary will return EOF; encountering any other Modified: python/branches/tk_and_idle_maintenance/Doc/library/multiprocessing.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/multiprocessing.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/multiprocessing.rst Wed Aug 5 15:32:47 2009 @@ -374,7 +374,9 @@ Note that a daemonic process is not allowed to create child processes. Otherwise a daemonic process would leave its children orphaned if it gets - terminated when its parent process exits. + terminated when its parent process exits. Additionally, these are **not** + Unix daemons or services, they are normal processes that will be + terminated (and not joined) if non-dameonic processes have exited. In addition to the :class:`Threading.Thread` API, :class:`Process` objects also support the following attributes and methods: @@ -1553,8 +1555,8 @@ .. method:: apply(func[, args[, kwds]]) - Equivalent of the :func:`apply` builtin function. It blocks till the - result is ready. Given this blocks - :meth:`apply_async` is better suited + Equivalent of the :func:`apply` built-in function. It blocks till the + result is ready. Given this blocks, :meth:`apply_async` is better suited for performing work in parallel. Additionally, the passed in function is only executed in one of the workers of the pool. @@ -1569,7 +1571,7 @@ .. method:: map(func, iterable[, chunksize]) - A parallel equivalent of the :func:`map` builtin function (it supports only + A parallel equivalent of the :func:`map` built-in function (it supports only one *iterable* argument though). It blocks till the result is ready. This method chops the iterable into a number of chunks which it submits to @@ -1578,7 +1580,7 @@ .. method:: map_async(func, iterable[, chunksize[, callback]]) - A variant of the :meth:`map` method which returns a result object. + A variant of the :meth:`.map` method which returns a result object. If *callback* is specified then it should be a callable which accepts a single argument. When the result becomes ready *callback* is applied to @@ -1594,7 +1596,7 @@ make make the job complete **much** faster than using the default value of ``1``. - Also if *chunksize* is ``1`` then the :meth:`next` method of the iterator + Also if *chunksize* is ``1`` then the :meth:`!next` method of the iterator returned by the :meth:`imap` method has an optional *timeout* parameter: ``next(timeout)`` will raise :exc:`multiprocessing.TimeoutError` if the result cannot be returned within *timeout* seconds. @@ -1715,7 +1717,7 @@ generally be omitted since it can usually be inferred from the format of *address*. (See :ref:`multiprocessing-address-formats`) - If *authentication* is ``True`` or *authkey* is a string then digest + If *authenticate* is ``True`` or *authkey* is a string then digest authentication is used. The key used for authentication will be either *authkey* or ``current_process().authkey)`` if *authkey* is ``None``. If authentication fails then :exc:`AuthenticationError` is raised. See @@ -1757,7 +1759,7 @@ If *authkey* is ``None`` and *authenticate* is ``True`` then ``current_process().authkey`` is used as the authentication key. If - *authkey* is ``None`` and *authentication* is ``False`` then no + *authkey* is ``None`` and *authenticate* is ``False`` then no authentication is done. If authentication fails then :exc:`AuthenticationError` is raised. See :ref:`multiprocessing-auth-keys`. @@ -2099,6 +2101,38 @@ for i in range(10): Process(target=f, args=(lock,)).start() +Beware replacing sys.stdin with a "file like object" + + :mod:`multiprocessing` originally unconditionally called:: + + os.close(sys.stdin.fileno()) + + in the :meth:`multiprocessing.Process._bootstrap` method --- this resulted + in issues with processes-in-processes. This has been changed to:: + + sys.stdin.close() + sys.stdin = open(os.devnull) + + Which solves the fundamental issue of processes colliding with each other + resulting in a bad file descriptor error, but introduces a potential danger + to applications which replace :func:`sys.stdin` with a "file-like object" + with output buffering. This danger is that if multiple processes call + :func:`close()` on this file-like object, it could result in the same + data being flushed to the object multiple times, resulting in corruption. + + If you write a file-like object and implement your own caching, you can + make it fork-safe by storing the pid whenever you append to the cache, + and discarding the cache when the pid changes. For example:: + + @property + def cache(self): + pid = os.getpid() + if pid != self._pid: + self._pid = pid + self._cache = [] + return self._cache + + For more information, see :issue:`5155`, :issue:`5313` and :issue:`5331` Windows ~~~~~~~ Modified: python/branches/tk_and_idle_maintenance/Doc/library/numbers.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/numbers.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/numbers.rst Wed Aug 5 15:32:47 2009 @@ -24,7 +24,7 @@ .. class:: Complex Subclasses of this type describe complex numbers and include the operations - that work on the builtin :class:`complex` type. These are: conversions to + that work on the built-in :class:`complex` type. These are: conversions to :class:`complex` and :class:`bool`, :attr:`.real`, :attr:`.imag`, ``+``, ``-``, ``*``, ``/``, :func:`abs`, :meth:`conjugate`, ``==``, and ``!=``. All except ``-`` and ``!=`` are abstract. Modified: python/branches/tk_and_idle_maintenance/Doc/library/optparse.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/optparse.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/optparse.rst Wed Aug 5 15:32:47 2009 @@ -286,7 +286,7 @@ * ``args``, the list of positional arguments leftover after parsing options This tutorial section only covers the four most important option attributes: -:attr:`action`, :attr:`type`, :attr:`dest` (destination), and :attr:`help`. Of +:attr:`action`, :attr:`!type`, :attr:`dest` (destination), and :attr:`help`. Of these, :attr:`action` is the most fundamental. @@ -642,8 +642,8 @@ ``parser.error()`` from your application code. If :mod:`optparse`'s default error-handling behaviour does not suit your needs, -you'll need to subclass OptionParser and override its :meth:`exit` and/or -:meth:`error` methods. +you'll need to subclass OptionParser and override its :meth:`~OptionParser.exit` +and/or :meth:`~OptionParser.error` methods. .. _optparse-putting-it-all-together: @@ -834,7 +834,7 @@ print a usage message including all options and the documentation for them (If you don't supply an action, the default is ``store``. For this action, you -may also supply :attr:`type` and :attr:`dest` option attributes; see below.) +may also supply :attr:`!type` and :attr:`dest` option attributes; see below.) As you can see, most actions involve storing or updating a value somewhere. :mod:`optparse` always creates a special object for this, conventionally called @@ -865,7 +865,7 @@ options.filename = "foo" -The :attr:`type` and :attr:`dest` option attributes are almost as important as +The :attr:`!type` and :attr:`dest` option attributes are almost as important as :attr:`action`, but :attr:`action` is the only one that makes sense for *all* options. @@ -880,18 +880,18 @@ guide :mod:`optparse`'s behaviour; a few have required attributes, which you must specify for any option using that action. -* ``store`` [relevant: :attr:`type`, :attr:`dest`, ``nargs``, ``choices``] +* ``store`` [relevant: :attr:`!type`, :attr:`dest`, ``nargs``, ``choices``] The option must be followed by an argument, which is converted to a value - according to :attr:`type` and stored in :attr:`dest`. If ``nargs`` > 1, + according to :attr:`!type` and stored in :attr:`dest`. If ``nargs`` > 1, multiple arguments will be consumed from the command line; all will be converted - according to :attr:`type` and stored to :attr:`dest` as a tuple. See the + according to :attr:`!type` and stored to :attr:`dest` as a tuple. See the "Option types" section below. If ``choices`` is supplied (a list or tuple of strings), the type defaults to ``choice``. - If :attr:`type` is not supplied, it defaults to ``string``. + If :attr:`!type` is not supplied, it defaults to ``string``. If :attr:`dest` is not supplied, :mod:`optparse` derives a destination from the first long option string (e.g., ``"--foo-bar"`` implies ``foo_bar``). If there @@ -943,7 +943,7 @@ parser.add_option("--clobber", action="store_true", dest="clobber") parser.add_option("--no-clobber", action="store_false", dest="clobber") -* ``append`` [relevant: :attr:`type`, :attr:`dest`, ``nargs``, ``choices``] +* ``append`` [relevant: :attr:`!type`, :attr:`dest`, ``nargs``, ``choices``] The option must be followed by an argument, which is appended to the list in :attr:`dest`. If no default value for :attr:`dest` is supplied, an empty list @@ -951,7 +951,7 @@ the command-line. If ``nargs`` > 1, multiple arguments are consumed, and a tuple of length ``nargs`` is appended to :attr:`dest`. - The defaults for :attr:`type` and :attr:`dest` are the same as for the ``store`` + The defaults for :attr:`!type` and :attr:`dest` are the same as for the ``store`` action. Example:: @@ -993,7 +993,7 @@ options.verbosity += 1 -* ``callback`` [required: ``callback``; relevant: :attr:`type`, ``nargs``, +* ``callback`` [required: ``callback``; relevant: :attr:`!type`, ``nargs``, ``callback_args``, ``callback_kwargs``] Call the function specified by ``callback``, which is called as :: @@ -1066,7 +1066,7 @@ Determines :mod:`optparse`'s behaviour when this option is seen on the command line; the available options are documented above. -* :attr:`type` (default: ``"string"``) +* :attr:`!type` (default: ``"string"``) The argument type expected by this option (e.g., ``"string"`` or ``"int"``); the available option types are documented below. @@ -1084,7 +1084,7 @@ * ``nargs`` (default: 1) - How many arguments of type :attr:`type` should be consumed when this option is + How many arguments of type :attr:`!type` should be consumed when this option is seen. If > 1, :mod:`optparse` will store a tuple of values to :attr:`dest`. * ``const`` @@ -1415,15 +1415,15 @@ There are several other option attributes that you can supply when you define a callback option: -:attr:`type` +:attr:`!type` has its usual meaning: as with the ``store`` or ``append`` actions, it instructs - :mod:`optparse` to consume one argument and convert it to :attr:`type`. Rather + :mod:`optparse` to consume one argument and convert it to :attr:`!type`. Rather than storing the converted value(s) anywhere, though, :mod:`optparse` passes it to your callback function. ``nargs`` also has its usual meaning: if it is supplied and > 1, :mod:`optparse` will - consume ``nargs`` arguments, each of which must be convertible to :attr:`type`. + consume ``nargs`` arguments, each of which must be convertible to :attr:`!type`. It then passes a tuple of converted values to your callback. ``callback_args`` @@ -1455,8 +1455,8 @@ ``value`` is the argument to this option seen on the command-line. :mod:`optparse` will - only expect an argument if :attr:`type` is set; the type of ``value`` will be - the type implied by the option's type. If :attr:`type` for this option is + only expect an argument if :attr:`!type` is set; the type of ``value`` will be + the type implied by the option's type. If :attr:`!type` for this option is ``None`` (no argument expected), then ``value`` will be ``None``. If ``nargs`` > 1, ``value`` will be a tuple of values of the appropriate type. @@ -1583,7 +1583,7 @@ Things get slightly more interesting when you define callback options that take a fixed number of arguments. Specifying that a callback option takes arguments is similar to defining a ``store`` or ``append`` option: if you define -:attr:`type`, then the option takes one argument that must be convertible to +:attr:`!type`, then the option takes one argument that must be convertible to that type; if you further define ``nargs``, then the option takes ``nargs`` arguments. @@ -1762,7 +1762,7 @@ "typed" actions actions that take a value from the command line and expect it to be of a certain type; or rather, a string that can be converted to a certain type. These - options require a :attr:`type` attribute to the Option constructor. + options require a :attr:`!type` attribute to the Option constructor. These are overlapping sets: some default "store" actions are ``store``, ``store_const``, ``append``, and ``count``, while the default "typed" actions Modified: python/branches/tk_and_idle_maintenance/Doc/library/os.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/os.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/os.rst Wed Aug 5 15:32:47 2009 @@ -606,10 +606,10 @@ .. note:: - This function is intended for low-level I/O. For normal usage, use the built-in - function :func:`open`, which returns a "file object" with :meth:`~file.read` and - :meth:`~file.write` methods (and many more). To wrap a file descriptor in a "file - object", use :func:`fdopen`. + This function is intended for low-level I/O. For normal usage, use the + built-in function :func:`open`, which returns a "file object" with + :meth:`~file.read` and :meth:`~file.write` methods (and many more). To + wrap a file descriptor in a "file object", use :func:`fdopen`. .. function:: openpty() @@ -754,10 +754,10 @@ .. note:: - Using :func:`access` to check if a user is authorized to e.g. open a file before - actually doing so using :func:`open` creates a security hole, because the user - might exploit the short time interval between checking and opening the file to - manipulate it. + Using :func:`access` to check if a user is authorized to e.g. open a file + before actually doing so using :func:`open` creates a security hole, + because the user might exploit the short time interval between checking + and opening the file to manipulate it. .. note:: @@ -857,25 +857,25 @@ combinations of them: - * ``stat.S_ISUID`` - * ``stat.S_ISGID`` - * ``stat.S_ENFMT`` - * ``stat.S_ISVTX`` - * ``stat.S_IREAD`` - * ``stat.S_IWRITE`` - * ``stat.S_IEXEC`` - * ``stat.S_IRWXU`` - * ``stat.S_IRUSR`` - * ``stat.S_IWUSR`` - * ``stat.S_IXUSR`` - * ``stat.S_IRWXG`` - * ``stat.S_IRGRP`` - * ``stat.S_IWGRP`` - * ``stat.S_IXGRP`` - * ``stat.S_IRWXO`` - * ``stat.S_IROTH`` - * ``stat.S_IWOTH`` - * ``stat.S_IXOTH`` + * :data:`stat.S_ISUID` + * :data:`stat.S_ISGID` + * :data:`stat.S_ENFMT` + * :data:`stat.S_ISVTX` + * :data:`stat.S_IREAD` + * :data:`stat.S_IWRITE` + * :data:`stat.S_IEXEC` + * :data:`stat.S_IRWXU` + * :data:`stat.S_IRUSR` + * :data:`stat.S_IWUSR` + * :data:`stat.S_IXUSR` + * :data:`stat.S_IRWXG` + * :data:`stat.S_IRGRP` + * :data:`stat.S_IWGRP` + * :data:`stat.S_IXGRP` + * :data:`stat.S_IRWXO` + * :data:`stat.S_IROTH` + * :data:`stat.S_IWOTH` + * :data:`stat.S_IXOTH` Availability: Unix, Windows. Modified: python/branches/tk_and_idle_maintenance/Doc/library/ossaudiodev.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/ossaudiodev.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/ossaudiodev.rst Wed Aug 5 15:32:47 2009 @@ -120,7 +120,7 @@ parameters at once. This is more convenient, but may not be as flexible in all cases. -The audio device objects returned by :func:`open` define the following methods +The audio device objects returned by :func:`.open` define the following methods and (read-only) attributes: Modified: python/branches/tk_and_idle_maintenance/Doc/library/posixfile.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/posixfile.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/posixfile.rst Wed Aug 5 15:32:47 2009 @@ -24,9 +24,8 @@ methods and adds the methods described below. This module only works for certain flavors of Unix, since it uses :func:`fcntl.fcntl` for file locking. -To instantiate a posixfile object, use the :func:`open` function in the -:mod:`posixfile` module. The resulting object looks and feels roughly the same -as a standard file object. +To instantiate a posixfile object, use the :func:`posixfile.open` function. The +resulting object looks and feels roughly the same as a standard file object. The :mod:`posixfile` module defines the following constants: Modified: python/branches/tk_and_idle_maintenance/Doc/library/pprint.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/pprint.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/pprint.rst Wed Aug 5 15:32:47 2009 @@ -13,7 +13,7 @@ If the formatted structures include objects which are not fundamental Python types, the representation may not be loadable. This may be the case if objects such as files, sockets, classes, or instances are included, as well as many -other builtin objects which are not representable as Python constants. +other built-in objects which are not representable as Python constants. The formatted representation keeps objects on a single line if it can, and breaks them onto multiple lines if they don't fit within the allowed width. Modified: python/branches/tk_and_idle_maintenance/Doc/library/pyclbr.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/pyclbr.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/pyclbr.rst Wed Aug 5 15:32:47 2009 @@ -78,7 +78,7 @@ .. attribute:: Class.lineno The line number of the ``class`` statement within the file named by - :attr:`file`. + :attr:`~Class.file`. .. _pyclbr-function-objects: @@ -109,5 +109,5 @@ .. attribute:: Function.lineno The line number of the ``def`` statement within the file named by - :attr:`file`. + :attr:`~Function.file`. Modified: python/branches/tk_and_idle_maintenance/Doc/library/re.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/re.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/re.rst Wed Aug 5 15:32:47 2009 @@ -216,7 +216,7 @@ flags are described in :ref:`contents-of-module-re`.) This is useful if you wish to include the flags as part of the regular expression, instead of passing a *flag* argument to the - :func:`compile` function. + :func:`re.compile` function. Note that the ``(?x)`` flag changes how the expression is parsed. It should be used first in the expression string, or after one or more whitespace characters. @@ -332,7 +332,8 @@ ``\d`` When the :const:`UNICODE` flag is not specified, matches any decimal digit; this is equivalent to the set ``[0-9]``. With :const:`UNICODE`, it will match - whatever is classified as a digit in the Unicode character properties database. + whatever is classified as a decimal digit in the Unicode character properties + database. ``\D`` When the :const:`UNICODE` flag is not specified, matches any non-digit @@ -443,9 +444,9 @@ result = re.match(pattern, string) - but using :func:`compile` and saving the resulting regular expression object - for reuse is more efficient when the expression will be used several times - in a single program. + but using :func:`re.compile` and saving the resulting regular expression + object for reuse is more efficient when the expression will be used several + times in a single program. .. note:: @@ -532,7 +533,7 @@ .. note:: - If you want to locate a match anywhere in *string*, use :meth:`search` + If you want to locate a match anywhere in *string*, use :func:`search` instead. @@ -699,8 +700,8 @@ .. note:: - If you want to locate a match anywhere in *string*, use :meth:`search` - instead. + If you want to locate a match anywhere in *string*, use + :meth:`~RegexObject.search` instead. The optional second parameter *pos* gives an index in the string where the search is to start; it defaults to ``0``. This is not completely equivalent to @@ -729,7 +730,7 @@ is different from finding a zero-length match at some point in the string. The optional *pos* and *endpos* parameters have the same meaning as for the - :meth:`match` method. + :meth:`~RegexObject.match` method. .. method:: RegexObject.split(string[, maxsplit=0]) @@ -793,10 +794,10 @@ .. method:: MatchObject.expand(template) Return the string obtained by doing backslash substitution on the template - string *template*, as done by the :meth:`sub` method. Escapes such as ``\n`` are - converted to the appropriate characters, and numeric backreferences (``\1``, - ``\2``) and named backreferences (``\g<1>``, ``\g``) are replaced by the - contents of the corresponding group. + string *template*, as done by the :meth:`~RegexObject.sub` method. Escapes + such as ``\n`` are converted to the appropriate characters, and numeric + backreferences (``\1``, ``\2``) and named backreferences (``\g<1>``, + ``\g``) are replaced by the contents of the corresponding group. .. method:: MatchObject.group([group1, ...]) @@ -920,16 +921,16 @@ .. attribute:: MatchObject.pos - The value of *pos* which was passed to the :func:`search` or :func:`match` - method of the :class:`RegexObject`. This is the index into the string at which - the RE engine started looking for a match. + The value of *pos* which was passed to the :meth:`~RegexObject.search` or + :meth:`~RegexObject.match` method of the :class:`RegexObject`. This is the + index into the string at which the RE engine started looking for a match. .. attribute:: MatchObject.endpos - The value of *endpos* which was passed to the :func:`search` or :func:`match` - method of the :class:`RegexObject`. This is the index into the string beyond - which the RE engine will not go. + The value of *endpos* which was passed to the :meth:`~RegexObject.search` or + :meth:`~RegexObject.match` method of the :class:`RegexObject`. This is the + index into the string beyond which the RE engine will not go. .. attribute:: MatchObject.lastindex @@ -949,13 +950,15 @@ .. attribute:: MatchObject.re - The regular expression object whose :meth:`match` or :meth:`search` method - produced this :class:`MatchObject` instance. + The regular expression object whose :meth:`~RegexObject.match` or + :meth:`~RegexObject.search` method produced this :class:`MatchObject` + instance. .. attribute:: MatchObject.string - The string passed to :func:`match` or :func:`search`. + The string passed to :meth:`~RegexObject.match` or + :meth:`~RegexObject.search`. Examples @@ -1000,8 +1003,9 @@ >>> displaymatch(pair.match("354aa")) # Pair of aces. "" -To find out what card the pair consists of, one could use the :func:`group` -method of :class:`MatchObject` in the following manner: +To find out what card the pair consists of, one could use the +:meth:`~MatchObject.group` method of :class:`MatchObject` in the following +manner: .. doctest:: Modified: python/branches/tk_and_idle_maintenance/Doc/library/repr.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/repr.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/repr.rst Wed Aug 5 15:32:47 2009 @@ -27,16 +27,16 @@ .. data:: aRepr - This is an instance of :class:`Repr` which is used to provide the :func:`repr` + This is an instance of :class:`Repr` which is used to provide the :func:`.repr` function described below. Changing the attributes of this object will affect - the size limits used by :func:`repr` and the Python debugger. + the size limits used by :func:`.repr` and the Python debugger. .. function:: repr(obj) - This is the :meth:`repr` method of ``aRepr``. It returns a string similar to - that returned by the built-in function of the same name, but with limits on - most sizes. + This is the :meth:`~Repr.repr` method of ``aRepr``. It returns a string + similar to that returned by the built-in function of the same name, but with + limits on most sizes. .. _repr-objects: @@ -99,7 +99,7 @@ .. method:: Repr.repr1(obj, level) - Recursive implementation used by :meth:`repr`. This uses the type of *obj* to + Recursive implementation used by :meth:`.repr`. This uses the type of *obj* to determine which formatting method to call, passing it *obj* and *level*. The type-specific methods should call :meth:`repr1` to perform recursive formatting, with ``level - 1`` for the value of *level* in the recursive call. Modified: python/branches/tk_and_idle_maintenance/Doc/library/select.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/select.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/select.rst Wed Aug 5 15:32:47 2009 @@ -100,6 +100,15 @@ library, and does not handle file descriptors that don't originate from WinSock. +.. attribute:: select.PIPE_BUF + + Files reported as ready for writing by :func:`select`, :func:`poll` or + similar interfaces in this module are guaranteed to not block on a write + of up to :const:`PIPE_BUF` bytes. + This value is guaranteed by POSIX to be at least 512. Availability: Unix. + + .. versionadded:: 2.7 + .. _epoll-objects: Modified: python/branches/tk_and_idle_maintenance/Doc/library/sets.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/sets.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/sets.rst Wed Aug 5 15:32:47 2009 @@ -184,7 +184,7 @@ Also note, the module also includes a :meth:`union_update` method which is an alias for :meth:`update`. The method is included for backwards compatibility. Programmers should prefer the :meth:`update` method because it is supported by -the builtin :class:`set()` and :class:`frozenset()` types. +the built-in :class:`set()` and :class:`frozenset()` types. .. _set-example: Modified: python/branches/tk_and_idle_maintenance/Doc/library/shelve.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/shelve.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/shelve.rst Wed Aug 5 15:32:47 2009 @@ -108,7 +108,7 @@ .. class:: BsdDbShelf(dict[, protocol=None[, writeback=False]]) - A subclass of :class:`Shelf` which exposes :meth:`first`, :meth:`next`, + A subclass of :class:`Shelf` which exposes :meth:`first`, :meth:`!next`, :meth:`previous`, :meth:`last` and :meth:`set_location` which are available in the :mod:`bsddb` module but not in other database modules. The *dict* object passed to the constructor must support those methods. This is generally @@ -122,7 +122,7 @@ A subclass of :class:`Shelf` which accepts a *filename* instead of a dict-like object. The underlying file will be opened using :func:`anydbm.open`. By default, the file will be created and opened for both read and write. The - optional *flag* parameter has the same interpretation as for the :func:`open` + optional *flag* parameter has the same interpretation as for the :func:`.open` function. The optional *protocol* and *writeback* parameters have the same interpretation as for the :class:`Shelf` class. @@ -174,8 +174,8 @@ BSD ``db`` database interface. Module :mod:`dbhash` - Thin layer around the :mod:`bsddb` which provides an :func:`open` function like - the other database modules. + Thin layer around the :mod:`bsddb` which provides an :func:`~dbhash.open` + function like the other database modules. Module :mod:`dbm` Standard Unix database interface. Modified: python/branches/tk_and_idle_maintenance/Doc/library/simplexmlrpcserver.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/simplexmlrpcserver.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/simplexmlrpcserver.rst Wed Aug 5 15:32:47 2009 @@ -133,6 +133,15 @@ .. versionadded:: 2.5 +.. attribute:: SimpleXMLRPCRequestHandler.encode_threshold + + If this attribute is not ``None``, responses larger than this value + will be encoded using the *gzip* transfer encoding, if permitted by + the client. The default is ``1400`` which corresponds roughly + to a single TCP packet. + + .. versionadded:: 2.7 + .. _simplexmlrpcserver-example: SimpleXMLRPCServer Example Modified: python/branches/tk_and_idle_maintenance/Doc/library/socket.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/socket.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/socket.rst Wed Aug 5 15:32:47 2009 @@ -440,11 +440,6 @@ Availability: Unix (maybe not all platforms). - .. seealso:: - - :func:`ipaddr.BaseIP.packed` - Platform-independent conversion to a packed, binary format. - .. versionadded:: 2.3 @@ -604,6 +599,9 @@ The :meth:`ioctl` method is a limited interface to the WSAIoctl system interface. Please refer to the MSDN documentation for more information. + On other platforms, the generic :func:`fcntl.fcntl` and :func:`fcntl.ioctl` + functions may be used; they accept a socket object as their first argument. + .. versionadded:: 2.6 Modified: python/branches/tk_and_idle_maintenance/Doc/library/socketserver.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/socketserver.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/socketserver.rst Wed Aug 5 15:32:47 2009 @@ -223,16 +223,6 @@ desired. If :meth:`handle_request` receives no incoming requests within the timeout period, the :meth:`handle_timeout` method is called. -.. attribute:: TCPServer.disable_nagle_algorithm - - If set to True, it will set the TCP_NODELAY attribute of new requests - connections. This can help alleviate problems with latency in - request-response type applications. To avoid sending many small packets, - this option should be used only when bufferning output, such as when - setting :attr:`StreamRequestHandler.wbufsize` attribute to -1. - - .. versionadded:: 2.7 - There are various server methods that can be overridden by subclasses of base server classes like :class:`TCPServer`; these methods aren't useful to external users of the server object. Modified: python/branches/tk_and_idle_maintenance/Doc/library/sqlite3.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/sqlite3.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/sqlite3.rst Wed Aug 5 15:32:47 2009 @@ -840,7 +840,7 @@ Accessing columns by name instead of by index ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -One useful feature of the :mod:`sqlite3` module is the builtin +One useful feature of the :mod:`sqlite3` module is the built-in :class:`sqlite3.Row` class designed to be used as a row factory. Rows wrapped with this class can be accessed both by index (like tuples) and Modified: python/branches/tk_and_idle_maintenance/Doc/library/stat.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/stat.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/stat.rst Wed Aug 5 15:32:47 2009 @@ -137,6 +137,131 @@ of the size field for other character and block devices varies more, depending on the implementation of the underlying system call. +The variables below define the flags used in the :data:`ST_MODE` field. + +Use of the functions above is more portable than use of the first set of flags: + +.. data:: S_IFMT + + Bit mask for the file type bit fields. + +.. data:: S_IFSOCK + + Socket. + +.. data:: S_IFLNK + + Symbolic link. + +.. data:: S_IFREG + + Regular file. + +.. data:: S_IFBLK + + Block device. + +.. data:: S_IFDIR + + Directory. + +.. data:: S_IFCHR + + Character device. + +.. data:: S_IFIFO + + FIFO. + +The following flags can also be used in the *mode* argument of :func:`os.chmod`: + +.. data:: S_ISUID + + Set UID bit. + +.. data:: S_ISGID + + Set-group-ID bit. This bit has several special uses. For a directory + it indicates that BSD semantics is to be used for that directory: + files created there inherit their group ID from the directory, not + from the effective group ID of the creating process, and directories + created there will also get the :data:`S_ISGID` bit set. For a + file that does not have the group execution bit (:data:`S_IXGRP`) + set, the set-group-ID bit indicates mandatory file/record locking + (see also :data:`S_ENFMT`). + +.. data:: S_ISVTX + + Sticky bit. When this bit is set on a directory it means that a file + in that directory can be renamed or deleted only by the owner of the + file, by the owner of the directory, or by a privileged process. + +.. data:: S_IRWXU + + Mask for file owner permissions. + +.. data:: S_IRUSR + + Owner has read permission. + +.. data:: S_IWUSR + + Owner has write permission. + +.. data:: S_IXUSR + + Owner has execute permission. + +.. data:: S_IRWXG + + Mask for group permissions. + +.. data:: S_IRGRP + + Group has read permission. + +.. data:: S_IWGRP + + Group has write permission. + +.. data:: S_IXGRP + + Group has execute permission. + +.. data:: S_IRWXO + + Mask for permissions for others (not in group). + +.. data:: S_IROTH + + Others have read permission. + +.. data:: S_IWOTH + + Others have write permission. + +.. data:: S_IXOTH + + Others have execute permission. + +.. data:: S_ENFMT + + System V file locking enforcement. This flag is shared with :data:`S_ISGID`: + file/record locking is enforced on files that do not have the group + execution bit (:data:`S_IXGRP`) set. + +.. data:: S_IREAD + + Unix V7 synonym for :data:`S_IRUSR`. + +.. data:: S_IWRITE + + Unix V7 synonym for :data:`S_IWUSR`. + +.. data:: S_IEXEC + + Unix V7 synonym for :data:`S_IXUSR`. + Example:: import os, sys Modified: python/branches/tk_and_idle_maintenance/Doc/library/stdtypes.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/stdtypes.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/stdtypes.rst Wed Aug 5 15:32:47 2009 @@ -129,7 +129,17 @@ Comparisons =========== -.. index:: pair: chaining; comparisons +.. index:: + pair: chaining; comparisons + pair: operator; comparison + operator: == + operator: < + operator: <= + operator: > + operator: >= + operator: != + operator: is + operator: is not Comparison operations are supported by all objects. They all have the same priority (which is higher than that of the Boolean operations). Comparisons can @@ -159,17 +169,6 @@ | ``is not`` | negated object identity | | +------------+-------------------------+-------+ -.. index:: - pair: operator; comparison - operator: == - operator: < - operator: <= - operator: > - operator: >= - operator: != - operator: is - operator: is not - Notes: (1) @@ -262,6 +261,13 @@ builtin: long builtin: float builtin: complex + operator: + + operator: - + operator: * + operator: / + operator: // + operator: % + operator: ** Python fully supports mixed arithmetic: when a binary arithmetic operator has operands of different numeric types, the operand with the "narrower" type is @@ -271,7 +277,7 @@ :func:`long`, :func:`float`, and :func:`complex` can be used to produce numbers of a specific type. -All builtin numeric types support the following operations. See +All built-in numeric types support the following operations. See :ref:`power` and later sections for the operators' priorities. +--------------------+---------------------------------+--------+ @@ -394,7 +400,15 @@ Bit-string Operations on Integer Types -------------------------------------- -.. _bit-string-operations: +.. index:: + triple: operations on; integer; types + pair: bit-string; operations + pair: shifting; operations + pair: masking; operations + operator: ^ + operator: & + operator: << + operator: >> Plain and long integer types support additional operations that make sense only for bit-strings. Negative numbers are treated as their 2's complement value @@ -426,12 +440,6 @@ | ``~x`` | the bits of *x* inverted | | +------------+--------------------------------+----------+ -.. index:: - triple: operations on; integer; types - pair: bit-string; operations - pair: shifting; operations - pair: masking; operations - Notes: (1) @@ -619,10 +627,18 @@ constraint was added in Python 2.3; in Python 2.2, various iterators are broken according to this rule.) + +.. _generator-types: + +Generator Types +--------------- + Python's :term:`generator`\s provide a convenient way to implement the iterator protocol. If a container object's :meth:`__iter__` method is implemented as a generator, it will automatically return an iterator object (technically, a -generator object) supplying the :meth:`__iter__` and :meth:`next` methods. +generator object) supplying the :meth:`__iter__` and :meth:`next` methods. More +information about generators can be found in :ref:`the documentation for the +yield expression `. .. _typesseq: @@ -659,7 +675,7 @@ single item tuple must have a trailing comma, such as ``(d,)``. Buffer objects are not directly supported by Python syntax, but can be created -by calling the builtin function :func:`buffer`. They don't support +by calling the built-in function :func:`buffer`. They don't support concatenation or repetition. Objects of type xrange are similar to buffers in that there is no specific syntax to @@ -1616,7 +1632,7 @@ order of insertion. Accordingly, sets do not support indexing, slicing, or other sequence-like behavior. -There are currently two builtin set types, :class:`set` and :class:`frozenset`. +There are currently two built-in set types, :class:`set` and :class:`frozenset`. The :class:`set` type is mutable --- the contents can be changed using methods like :meth:`add` and :meth:`remove`. Since it is mutable, it has no hash value and cannot be used as either a dictionary key or as an element of another set. @@ -2163,12 +2179,12 @@ A file object is its own iterator, for example ``iter(f)`` returns *f* (unless *f* is closed). When a file is used as an iterator, typically in a :keyword:`for` loop (for example, ``for line in f: print line``), the - :meth:`next` method is called repeatedly. This method returns the next input + :meth:`.next` method is called repeatedly. This method returns the next input line, or raises :exc:`StopIteration` when EOF is hit when the file is open for reading (behavior is undefined when the file is open for writing). In order to make a :keyword:`for` loop the most efficient way of looping over the lines of a file (a very common operation), the :meth:`next` method uses a hidden read-ahead - buffer. As a consequence of using a read-ahead buffer, combining :meth:`next` + buffer. As a consequence of using a read-ahead buffer, combining :meth:`.next` with other file methods (like :meth:`readline`) does not work right. However, using :meth:`seek` to reposition the file to an absolute position will flush the read-ahead buffer. Modified: python/branches/tk_and_idle_maintenance/Doc/library/string.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/string.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/string.rst Wed Aug 5 15:32:47 2009 @@ -312,7 +312,7 @@ "Format specifications" are used within replacement fields contained within a format string to define how individual values are presented (see -:ref:`formatstrings`.) They can also be passed directly to the builtin +:ref:`formatstrings`.) They can also be passed directly to the built-in :func:`format` function. Each formattable type may define how the format specification is to be interpreted. Modified: python/branches/tk_and_idle_maintenance/Doc/library/stringio.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/stringio.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/stringio.rst Wed Aug 5 15:32:47 2009 @@ -72,8 +72,9 @@ instead. Since this module provides a factory function which returns objects of built-in -types, there's no way to build your own version using subclassing. Use the -original :mod:`StringIO` module in that case. +types, there's no way to build your own version using subclassing. It's not +possible to set attributes on it. Use the original :mod:`StringIO` module in +those cases. Unlike the memory files implemented by the :mod:`StringIO` module, those provided by this module are not able to accept Unicode strings that cannot be Modified: python/branches/tk_and_idle_maintenance/Doc/library/subprocess.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/subprocess.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/subprocess.rst Wed Aug 5 15:32:47 2009 @@ -73,7 +73,11 @@ needed: Usually, the program to execute is defined by the *args* argument. If ``shell=True``, the *executable* argument specifies which shell to use. On Unix, the default shell is :file:`/bin/sh`. On Windows, the default shell is - specified by the :envvar:`COMSPEC` environment variable. + specified by the :envvar:`COMSPEC` environment variable. The only reason you + would need to specify ``shell=True`` on Windows is where the command you + wish to execute is actually built in to the shell, eg ``dir``, ``copy``. + You don't need ``shell=True`` to run a batch file, nor to run a console-based + executable. *stdin*, *stdout* and *stderr* specify the executed programs' standard input, standard output and standard error file handles, respectively. Valid values @@ -400,7 +404,7 @@ sts = os.system("mycmd" + " myarg") ==> p = Popen("mycmd" + " myarg", shell=True) - sts = os.waitpid(p.pid, 0) + sts = os.waitpid(p.pid, 0)[1] Notes: Modified: python/branches/tk_and_idle_maintenance/Doc/library/sunau.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/sunau.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/sunau.rst Wed Aug 5 15:32:47 2009 @@ -58,18 +58,18 @@ .. function:: openfp(file, mode) - A synonym for :func:`open`, maintained for backwards compatibility. + A synonym for :func:`.open`, maintained for backwards compatibility. -The :mod:`sunau` module defines the following exception: +The :mod:`sunau` module defines the following exception: .. exception:: Error An error raised when something is impossible because of Sun AU specs or implementation deficiency. -The :mod:`sunau` module defines the following data items: +The :mod:`sunau` module defines the following data items: .. data:: AUDIO_FILE_MAGIC @@ -104,7 +104,7 @@ AU_read Objects --------------- -AU_read objects, as returned by :func:`open` above, have the following methods: +AU_read objects, as returned by :func:`.open` above, have the following methods: .. method:: AU_read.close() @@ -197,7 +197,7 @@ AU_write Objects ---------------- -AU_write objects, as returned by :func:`open` above, have the following methods: +AU_write objects, as returned by :func:`.open` above, have the following methods: .. method:: AU_write.setnchannels(n) Modified: python/branches/tk_and_idle_maintenance/Doc/library/sunaudio.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/sunaudio.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/sunaudio.rst Wed Aug 5 15:32:47 2009 @@ -54,7 +54,7 @@ Audio Device Objects -------------------- -The audio device objects are returned by :func:`open` define the following +The audio device objects are returned by :func:`.open` define the following methods (except ``control`` objects which only provide :meth:`getinfo`, :meth:`setinfo`, :meth:`fileno`, and :meth:`drain`): Modified: python/branches/tk_and_idle_maintenance/Doc/library/symtable.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/symtable.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/symtable.rst Wed Aug 5 15:32:47 2009 @@ -144,6 +144,10 @@ Return ``True`` if the symbol is global. + .. method:: is_declared_global() + + Return ``True`` if the symbol is declared global with a global statement. + .. method:: is_local() Return ``True`` if the symbol is local to its block. Modified: python/branches/tk_and_idle_maintenance/Doc/library/sys.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/sys.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/sys.rst Wed Aug 5 15:32:47 2009 @@ -816,7 +816,7 @@ ``'c_call'`` A C function is about to be called. This may be an extension function or - a builtin. *arg* is the C function object. + a built-in. *arg* is the C function object. ``'c_return'`` A C function has returned. *arg* is ``None``. Modified: python/branches/tk_and_idle_maintenance/Doc/library/tempfile.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/tempfile.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/tempfile.rst Wed Aug 5 15:32:47 2009 @@ -51,7 +51,7 @@ The *dir*, *prefix* and *suffix* parameters are passed to :func:`mkstemp`. The returned object is a true file object on POSIX platforms. On other - platforms, it is a file-like object whose :attr:`file` attribute is the + platforms, it is a file-like object whose :attr:`!file` attribute is the underlying true file object. This file-like object can be used in a :keyword:`with` statement, just like a normal file. @@ -67,7 +67,7 @@ on Windows NT or later). If *delete* is true (the default), the file is deleted as soon as it is closed. - The returned object is always a file-like object whose :attr:`file` + The returned object is always a file-like object whose :attr:`!file` attribute is the underlying true file object. This file-like object can be used in a :keyword:`with` statement, just like a normal file. Modified: python/branches/tk_and_idle_maintenance/Doc/library/threading.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/threading.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/threading.rst Wed Aug 5 15:32:47 2009 @@ -65,8 +65,9 @@ :noindex: A factory function that returns a new event object. An event manages a flag - that can be set to true with the :meth:`set` method and reset to false with the - :meth:`clear` method. The :meth:`wait` method blocks until the flag is true. + that can be set to true with the :meth:`~Event.set` method and reset to false + with the :meth:`clear` method. The :meth:`wait` method blocks until the flag + is true. .. class:: local @@ -230,7 +231,8 @@ .. class:: Thread(group=None, target=None, name=None, args=(), kwargs={}) - This constructor should always be called with keyword arguments. Arguments are: + This constructor should always be called with keyword arguments. Arguments + are: *group* should be ``None``; reserved for future extension when a :class:`ThreadGroup` class is implemented. @@ -238,112 +240,104 @@ *target* is the callable object to be invoked by the :meth:`run` method. Defaults to ``None``, meaning nothing is called. - *name* is the thread name. By default, a unique name is constructed of the form - "Thread-*N*" where *N* is a small decimal number. + *name* is the thread name. By default, a unique name is constructed of the + form "Thread-*N*" where *N* is a small decimal number. *args* is the argument tuple for the target invocation. Defaults to ``()``. *kwargs* is a dictionary of keyword arguments for the target invocation. Defaults to ``{}``. - If the subclass overrides the constructor, it must make sure to invoke the base - class constructor (``Thread.__init__()``) before doing anything else to the - thread. + If the subclass overrides the constructor, it must make sure to invoke the + base class constructor (``Thread.__init__()``) before doing anything else to + the thread. + .. method:: start() -.. method:: Thread.start() + Start the thread's activity. - Start the thread's activity. + It must be called at most once per thread object. It arranges for the + object's :meth:`run` method to be invoked in a separate thread of control. - It must be called at most once per thread object. It arranges for the object's - :meth:`run` method to be invoked in a separate thread of control. + This method will raise a :exc:`RuntimeException` if called more than once + on the same thread object. - This method will raise a :exc:`RuntimeException` if called more than once on the - same thread object. + .. method:: run() + Method representing the thread's activity. -.. method:: Thread.run() + You may override this method in a subclass. The standard :meth:`run` + method invokes the callable object passed to the object's constructor as + the *target* argument, if any, with sequential and keyword arguments taken + from the *args* and *kwargs* arguments, respectively. - Method representing the thread's activity. + .. method:: join([timeout]) - You may override this method in a subclass. The standard :meth:`run` method - invokes the callable object passed to the object's constructor as the *target* - argument, if any, with sequential and keyword arguments taken from the *args* - and *kwargs* arguments, respectively. + Wait until the thread terminates. This blocks the calling thread until the + thread whose :meth:`join` method is called terminates -- either normally + or through an unhandled exception -- or until the optional timeout occurs. + When the *timeout* argument is present and not ``None``, it should be a + floating point number specifying a timeout for the operation in seconds + (or fractions thereof). As :meth:`join` always returns ``None``, you must + call :meth:`isAlive` after :meth:`join` to decide whether a timeout + happened -- if the thread is still alive, the :meth:`join` call timed out. -.. method:: Thread.join([timeout]) + When the *timeout* argument is not present or ``None``, the operation will + block until the thread terminates. - Wait until the thread terminates. This blocks the calling thread until the - thread whose :meth:`join` method is called terminates -- either normally or - through an unhandled exception -- or until the optional timeout occurs. + A thread can be :meth:`join`\ ed many times. - When the *timeout* argument is present and not ``None``, it should be a floating - point number specifying a timeout for the operation in seconds (or fractions - thereof). As :meth:`join` always returns ``None``, you must call :meth:`isAlive` - after :meth:`join` to decide whether a timeout happened -- if the thread is - still alive, the :meth:`join` call timed out. + :meth:`join` raises a :exc:`RuntimeError` if an attempt is made to join + the current thread as that would cause a deadlock. It is also an error to + :meth:`join` a thread before it has been started and attempts to do so + raises the same exception. - When the *timeout* argument is not present or ``None``, the operation will block - until the thread terminates. + .. method:: getName() + setName() - A thread can be :meth:`join`\ ed many times. + Old API for :attr:`~Thread.name`. - :meth:`join` raises a :exc:`RuntimeError` if an attempt is made to join - the current thread as that would cause a deadlock. It is also an error to - :meth:`join` a thread before it has been started and attempts to do so - raises the same exception. + .. attribute:: name + A string used for identification purposes only. It has no semantics. + Multiple threads may be given the same name. The initial name is set by + the constructor. -.. method:: Thread.getName() - Thread.setName() + .. attribute:: ident - Old API for :attr:`~Thread.name`. + The 'thread identifier' of this thread or ``None`` if the thread has not + been started. This is a nonzero integer. See the + :func:`thread.get_ident()` function. Thread identifiers may be recycled + when a thread exits and another thread is created. The identifier is + available even after the thread has exited. + .. versionadded:: 2.6 -.. attribute:: Thread.name + .. method:: is_alive() + isAlive() - A string used for identification purposes only. It has no semantics. - Multiple threads may be given the same name. The initial name is set by the - constructor. + Return whether the thread is alive. + Roughly, a thread is alive from the moment the :meth:`start` method + returns until its :meth:`run` method terminates. The module function + :func:`enumerate` returns a list of all alive threads. -.. attribute:: Thread.ident + .. method:: isDaemon() + setDaemon() - The 'thread identifier' of this thread or ``None`` if the thread has not been - started. This is a nonzero integer. See the :func:`thread.get_ident()` - function. Thread identifiers may be recycled when a thread exits and another - thread is created. The identifier is available even after the thread has - exited. + Old API for :attr:`~Thread.daemon`. - .. versionadded:: 2.6 + .. attribute:: daemon + A boolean value indicating whether this thread is a daemon thread (True) + or not (False). This must be set before :meth:`start` is called, + otherwise :exc:`RuntimeError` is raised. Its initial value is inherited + from the creating thread; the main thread is not a daemon thread and + therefore all threads created in the main thread default to :attr:`daemon` + = ``False``. -.. method:: Thread.is_alive() - Thread.isAlive() - - Return whether the thread is alive. - - Roughly, a thread is alive from the moment the :meth:`start` method returns - until its :meth:`run` method terminates. The module function :func:`enumerate` - returns a list of all alive threads. - - -.. method:: Thread.isDaemon() - Thread.setDaemon() - - Old API for :attr:`~Thread.daemon`. - - -.. attribute:: Thread.daemon - - A boolean value indicating whether this thread is a daemon thread (True) or - not (False). This must be set before :meth:`start` is called, otherwise - :exc:`RuntimeError` is raised. Its initial value is inherited from the - creating thread; the main thread is not a daemon thread and therefore all - threads created in the main thread default to :attr:`daemon` = ``False``. - - The entire Python program exits when no alive non-daemon threads are left. + The entire Python program exits when no alive non-daemon threads are left. .. _lock-objects: @@ -514,70 +508,66 @@ .. class:: Condition([lock]) - If the *lock* argument is given and not ``None``, it must be a :class:`Lock` or - :class:`RLock` object, and it is used as the underlying lock. Otherwise, a new - :class:`RLock` object is created and used as the underlying lock. - - -.. method:: Condition.acquire(*args) - - Acquire the underlying lock. This method calls the corresponding method on the - underlying lock; the return value is whatever that method returns. - + If the *lock* argument is given and not ``None``, it must be a :class:`Lock` + or :class:`RLock` object, and it is used as the underlying lock. Otherwise, + a new :class:`RLock` object is created and used as the underlying lock. -.. method:: Condition.release() + .. method:: acquire(*args) - Release the underlying lock. This method calls the corresponding method on the - underlying lock; there is no return value. + Acquire the underlying lock. This method calls the corresponding method on + the underlying lock; the return value is whatever that method returns. + .. method:: release() -.. method:: Condition.wait([timeout]) + Release the underlying lock. This method calls the corresponding method on + the underlying lock; there is no return value. - Wait until notified or until a timeout occurs. If the calling thread has not - acquired the lock when this method is called, a :exc:`RuntimeError` is raised. + .. method:: wait([timeout]) - This method releases the underlying lock, and then blocks until it is awakened - by a :meth:`notify` or :meth:`notifyAll` call for the same condition variable in - another thread, or until the optional timeout occurs. Once awakened or timed - out, it re-acquires the lock and returns. + Wait until notified or until a timeout occurs. If the calling thread has not + acquired the lock when this method is called, a :exc:`RuntimeError` is raised. - When the *timeout* argument is present and not ``None``, it should be a floating - point number specifying a timeout for the operation in seconds (or fractions - thereof). + This method releases the underlying lock, and then blocks until it is + awakened by a :meth:`notify` or :meth:`notifyAll` call for the same + condition variable in another thread, or until the optional timeout + occurs. Once awakened or timed out, it re-acquires the lock and returns. - When the underlying lock is an :class:`RLock`, it is not released using its - :meth:`release` method, since this may not actually unlock the lock when it was - acquired multiple times recursively. Instead, an internal interface of the - :class:`RLock` class is used, which really unlocks it even when it has been - recursively acquired several times. Another internal interface is then used to - restore the recursion level when the lock is reacquired. + When the *timeout* argument is present and not ``None``, it should be a + floating point number specifying a timeout for the operation in seconds + (or fractions thereof). + When the underlying lock is an :class:`RLock`, it is not released using + its :meth:`release` method, since this may not actually unlock the lock + when it was acquired multiple times recursively. Instead, an internal + interface of the :class:`RLock` class is used, which really unlocks it + even when it has been recursively acquired several times. Another internal + interface is then used to restore the recursion level when the lock is + reacquired. -.. method:: Condition.notify() + .. method:: notify() - Wake up a thread waiting on this condition, if any. If the calling thread - has not acquired the lock when this method is called, a :exc:`RuntimeError` - is raised. + Wake up a thread waiting on this condition, if any. If the calling thread + has not acquired the lock when this method is called, a + :exc:`RuntimeError` is raised. - This method wakes up one of the threads waiting for the condition variable, - if any are waiting; it is a no-op if no threads are waiting. + This method wakes up one of the threads waiting for the condition + variable, if any are waiting; it is a no-op if no threads are waiting. - The current implementation wakes up exactly one thread, if any are waiting. - However, it's not safe to rely on this behavior. A future, optimized - implementation may occasionally wake up more than one thread. + The current implementation wakes up exactly one thread, if any are + waiting. However, it's not safe to rely on this behavior. A future, + optimized implementation may occasionally wake up more than one thread. - Note: the awakened thread does not actually return from its :meth:`wait` call - until it can reacquire the lock. Since :meth:`notify` does not release the - lock, its caller should. + Note: the awakened thread does not actually return from its :meth:`wait` + call until it can reacquire the lock. Since :meth:`notify` does not + release the lock, its caller should. + .. method:: notify_all() + notifyAll() -.. method:: Condition.notify_all() - Condition.notifyAll() - - Wake up all threads waiting on this condition. This method acts like - :meth:`notify`, but wakes up all waiting threads instead of one. If the calling - thread has not acquired the lock when this method is called, a - :exc:`RuntimeError` is raised. + Wake up all threads waiting on this condition. This method acts like + :meth:`notify`, but wakes up all waiting threads instead of one. If the + calling thread has not acquired the lock when this method is called, a + :exc:`RuntimeError` is raised. .. _semaphore-objects: @@ -601,33 +591,31 @@ defaults to ``1``. If the *value* given is less than 0, :exc:`ValueError` is raised. + .. method:: acquire([blocking]) -.. method:: Semaphore.acquire([blocking]) - - Acquire a semaphore. - - When invoked without arguments: if the internal counter is larger than zero on - entry, decrement it by one and return immediately. If it is zero on entry, - block, waiting until some other thread has called :meth:`release` to make it - larger than zero. This is done with proper interlocking so that if multiple - :meth:`acquire` calls are blocked, :meth:`release` will wake exactly one of them - up. The implementation may pick one at random, so the order in which blocked - threads are awakened should not be relied on. There is no return value in this - case. - - When invoked with *blocking* set to true, do the same thing as when called - without arguments, and return true. - - When invoked with *blocking* set to false, do not block. If a call without an - argument would block, return false immediately; otherwise, do the same thing as - when called without arguments, and return true. - + Acquire a semaphore. -.. method:: Semaphore.release() - - Release a semaphore, incrementing the internal counter by one. When it was zero - on entry and another thread is waiting for it to become larger than zero again, - wake up that thread. + When invoked without arguments: if the internal counter is larger than + zero on entry, decrement it by one and return immediately. If it is zero + on entry, block, waiting until some other thread has called + :meth:`release` to make it larger than zero. This is done with proper + interlocking so that if multiple :meth:`acquire` calls are blocked, + :meth:`release` will wake exactly one of them up. The implementation may + pick one at random, so the order in which blocked threads are awakened + should not be relied on. There is no return value in this case. + + When invoked with *blocking* set to true, do the same thing as when called + without arguments, and return true. + + When invoked with *blocking* set to false, do not block. If a call + without an argument would block, return false immediately; otherwise, do + the same thing as when called without arguments, and return true. + + .. method:: release() + + Release a semaphore, incrementing the internal counter by one. When it + was zero on entry and another thread is waiting for it to become larger + than zero again, wake up that thread. .. _semaphore-examples: @@ -666,7 +654,7 @@ thread signals an event and other threads wait for it. An event object manages an internal flag that can be set to true with the -:meth:`set` method and reset to false with the :meth:`clear` method. The +:meth:`~Event.set` method and reset to false with the :meth:`clear` method. The :meth:`wait` method blocks until the flag is true. @@ -674,41 +662,39 @@ The internal flag is initially false. + .. method:: is_set() + isSet() -.. method:: Event.is_set() - Event.isSet() - - Return true if and only if the internal flag is true. - + Return true if and only if the internal flag is true. -.. method:: Event.set() + .. method:: set() - Set the internal flag to true. All threads waiting for it to become true are - awakened. Threads that call :meth:`wait` once the flag is true will not block at - all. + Set the internal flag to true. All threads waiting for it to become true + are awakened. Threads that call :meth:`wait` once the flag is true will + not block at all. + .. method:: clear() -.. method:: Event.clear() + Reset the internal flag to false. Subsequently, threads calling + :meth:`wait` will block until :meth:`.set` is called to set the internal + flag to true again. - Reset the internal flag to false. Subsequently, threads calling :meth:`wait` - will block until :meth:`set` is called to set the internal flag to true again. + .. method:: wait([timeout]) + Block until the internal flag is true. If the internal flag is true on + entry, return immediately. Otherwise, block until another thread calls + :meth:`.set` to set the flag to true, or until the optional timeout + occurs. -.. method:: Event.wait([timeout]) + When the timeout argument is present and not ``None``, it should be a + floating point number specifying a timeout for the operation in seconds + (or fractions thereof). - Block until the internal flag is true. If the internal flag is true on entry, - return immediately. Otherwise, block until another thread calls :meth:`set` - to set the flag to true, or until the optional timeout occurs. + This method returns the internal flag on exit, so it will always return + ``True`` except if a timeout is given and the operation times out. - When the timeout argument is present and not ``None``, it should be a floating - point number specifying a timeout for the operation in seconds (or fractions - thereof). - - This method returns the internal flag on exit, so it will always return - ``True`` except if a timeout is given and the operation times out. - - .. versionchanged:: 2.7 - Previously, the method always returned ``None``. + .. versionchanged:: 2.7 + Previously, the method always returned ``None``. .. _timer-objects: @@ -739,11 +725,10 @@ Create a timer that will run *function* with arguments *args* and keyword arguments *kwargs*, after *interval* seconds have passed. + .. method:: cancel() -.. method:: Timer.cancel() - - Stop the timer, and cancel the execution of the timer's action. This will only - work if the timer is still in its waiting stage. + Stop the timer, and cancel the execution of the timer's action. This will + only work if the timer is still in its waiting stage. .. _with-locks: Modified: python/branches/tk_and_idle_maintenance/Doc/library/timeit.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/timeit.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/timeit.rst Wed Aug 5 15:32:47 2009 @@ -26,8 +26,9 @@ The constructor takes a statement to be timed, an additional statement used for setup, and a timer function. Both statements default to ``'pass'``; the timer - function is platform-dependent (see the module doc string). The statements may - contain newlines, as long as they don't contain multi-line string literals. + function is platform-dependent (see the module doc string). *stmt* and *setup* + may also contain multiple statements separated by ``;`` or newlines, as long as + they don't contain multi-line string literals. To measure the execution time of the first statement, use the :meth:`timeit` method. The :meth:`repeat` method is a convenience to call :meth:`timeit` Modified: python/branches/tk_and_idle_maintenance/Doc/library/tkinter.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/tkinter.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/tkinter.rst Wed Aug 5 15:32:47 2009 @@ -524,7 +524,7 @@ There are many useful subclasses of Variable already defined: :class:`StringVar`, :class:`IntVar`, :class:`DoubleVar`, and :class:`BooleanVar`. To read the current value of such a variable, call the -:meth:`get` method on it, and to change its value you call the :meth:`set` +:meth:`get` method on it, and to change its value you call the :meth:`!set` method. If you follow this protocol, the widget will always track the value of the variable, with no further intervention on your part. @@ -665,7 +665,7 @@ ``"raised"``, ``"sunken"``, ``"flat"``, ``"groove"``, and ``"ridge"``. scrollcommand - This is almost always the :meth:`set` method of some scrollbar widget, but can + This is almost always the :meth:`!set` method of some scrollbar widget, but can be any widget method that takes a single argument. Refer to the file :file:`Demo/tkinter/matt/canvas-with-scrollbars.py` in the Python source distribution for an example. Modified: python/branches/tk_and_idle_maintenance/Doc/library/turtle.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/turtle.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/turtle.rst Wed Aug 5 15:32:47 2009 @@ -1140,6 +1140,7 @@ .. function:: shapesize(stretch_wid=None, stretch_len=None, outline=None) + turtlesize(stretch_wid=None, stretch_len=None, outline=None) :param stretch_wid: positive number :param stretch_len: positive number @@ -1332,6 +1333,7 @@ .. function:: getturtle() + getpen() Return the Turtle object itself. Only reasonable use: as a function to return the "anonymous turtle": Modified: python/branches/tk_and_idle_maintenance/Doc/library/undoc.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/undoc.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/undoc.rst Wed Aug 5 15:32:47 2009 @@ -113,7 +113,7 @@ :deprecated: -Importing :mod:`icopen` will replace the builtin :meth:`open` with a version +Importing :mod:`icopen` will replace the built-in :meth:`open` with a version that uses Internet Config to set file type and creator for new files. .. deprecated:: 2.6 Modified: python/branches/tk_and_idle_maintenance/Doc/library/unittest.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/unittest.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/unittest.rst Wed Aug 5 15:32:47 2009 @@ -651,8 +651,8 @@ Run the test, collecting the result into the test result object passed as *result*. If *result* is omitted or :const:`None`, a temporary result - object is created (by calling the :meth:`defaultTestCase` method) and - used; this result object is not returned to :meth:`run`'s caller. + object is created (by calling the :meth:`defaultTestResult` method) and + used. The result object is not returned to :meth:`run`'s caller. The same effect may be had by simply calling the :class:`TestCase` instance. Modified: python/branches/tk_and_idle_maintenance/Doc/library/urllib.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/urllib.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/urllib.rst Wed Aug 5 15:32:47 2009 @@ -213,8 +213,9 @@ .. function:: quote_plus(string[, safe]) Like :func:`quote`, but also replaces spaces by plus signs, as required for - quoting HTML form values. Plus signs in the original string are escaped unless - they are included in *safe*. It also does not have *safe* default to ``'/'``. + quoting HTML form values when building up a query string to go into a URL. + Plus signs in the original string are escaped unless they are included in + *safe*. It also does not have *safe* default to ``'/'``. .. function:: unquote(string) Modified: python/branches/tk_and_idle_maintenance/Doc/library/warnings.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/warnings.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/warnings.rst Wed Aug 5 15:32:47 2009 @@ -204,7 +204,7 @@ fxn() # Verify some things assert len(w) == 1 - assert isinstance(w[-1].category, DeprecationWarning) + assert issubclass(w[-1].category, DeprecationWarning) assert "deprecated" in str(w[-1].message) One can also cause all warnings to be exceptions by using ``error`` instead of @@ -279,6 +279,8 @@ be a string and *category* a subclass of :exc:`Warning`. :func:`warnpy3k` is using :exc:`DeprecationWarning` as default warning class. + .. versionadded:: 2.6 + .. function:: showwarning(message, category, filename, lineno[, file[, line]]) Modified: python/branches/tk_and_idle_maintenance/Doc/library/wave.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/wave.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/wave.rst Wed Aug 5 15:32:47 2009 @@ -33,7 +33,7 @@ .. function:: openfp(file, mode) - A synonym for :func:`open`, maintained for backwards compatibility. + A synonym for :func:`.open`, maintained for backwards compatibility. .. exception:: Error @@ -47,7 +47,7 @@ Wave_read Objects ----------------- -Wave_read objects, as returned by :func:`open`, have the following methods: +Wave_read objects, as returned by :func:`.open`, have the following methods: .. method:: Wave_read.close() @@ -134,7 +134,7 @@ Wave_write Objects ------------------ -Wave_write objects, as returned by :func:`open`, have the following methods: +Wave_write objects, as returned by :func:`.open`, have the following methods: .. method:: Wave_write.close() Modified: python/branches/tk_and_idle_maintenance/Doc/library/weakref.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/weakref.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/weakref.rst Wed Aug 5 15:32:47 2009 @@ -65,7 +65,7 @@ .. versionchanged:: 2.4 Added support for files, sockets, arrays, and patterns. -Several builtin types such as :class:`list` and :class:`dict` do not directly +Several built-in types such as :class:`list` and :class:`dict` do not directly support weak references but can add support through subclassing:: class Dict(dict): Modified: python/branches/tk_and_idle_maintenance/Doc/library/webbrowser.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/webbrowser.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/webbrowser.rst Wed Aug 5 15:32:47 2009 @@ -10,7 +10,7 @@ The :mod:`webbrowser` module provides a high-level interface to allow displaying Web-based documents to users. Under most circumstances, simply calling the -:func:`open` function from this module will do the right thing. +:func:`.open` function from this module will do the right thing. Under Unix, graphical browsers are preferred under X11, but text-mode browsers will be used if graphical browsers are not available or an X11 display isn't @@ -46,14 +46,14 @@ The following functions are defined: -.. function:: open(url[, new=0[, autoraise=1]]) +.. function:: open(url[, new=0[, autoraise=True]]) - Display *url* using the default browser. If *new* is 0, the *url* is opened in - the same browser window if possible. If *new* is 1, a new browser window is - opened if possible. If *new* is 2, a new browser page ("tab") is opened if - possible. If *autoraise* is true, the window is raised if possible (note that - under many window managers this will occur regardless of the setting of this - variable). + Display *url* using the default browser. If *new* is 0, the *url* is opened + in the same browser window if possible. If *new* is 1, a new browser window + is opened if possible. If *new* is 2, a new browser page ("tab") is opened + if possible. If *autoraise* is ``True``, the window is raised if possible + (note that under many window managers this will occur regardless of the + setting of this variable). Note that on some platforms, trying to open a filename using this function, may work and start the operating system's associated program. However, this @@ -180,7 +180,7 @@ module-level convenience functions: -.. method:: controller.open(url[, new[, autoraise=1]]) +.. method:: controller.open(url[, new[, autoraise=True]]) Display *url* using the browser handled by this controller. If *new* is 1, a new browser window is opened if possible. If *new* is 2, a new browser page ("tab") Modified: python/branches/tk_and_idle_maintenance/Doc/library/xml.etree.elementtree.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/xml.etree.elementtree.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/xml.etree.elementtree.rst Wed Aug 5 15:32:47 2009 @@ -262,9 +262,9 @@ .. method:: Element.getiterator([tag=None]) Creates a tree iterator with the current element as the root. The iterator - iterates over this element and all elements below it that match the given tag. - If tag is ``None`` or ``'*'`` then all elements are iterated over. Returns an - iterable that provides element objects in document (depth first) order. + iterates over this element and all elements below it, in document (depth first) + order. If *tag* is not ``None`` or ``'*'``, only elements whose tag equals + *tag* are returned from the iterator. .. method:: Element.insert(index, element) Modified: python/branches/tk_and_idle_maintenance/Doc/library/xmlrpclib.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/xmlrpclib.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/xmlrpclib.rst Wed Aug 5 15:32:47 2009 @@ -94,7 +94,7 @@ :exc:`ProtocolError` used to signal an error in the HTTP/HTTPS transport layer. Both :exc:`Fault` and :exc:`ProtocolError` derive from a base class called :exc:`Error`. Note that even though starting with Python 2.2 you can subclass - builtin types, the xmlrpclib module currently does not marshal instances of such + built-in types, the xmlrpclib module currently does not marshal instances of such subclasses. When passing strings, characters special to XML such as ``<``, ``>``, and ``&`` Modified: python/branches/tk_and_idle_maintenance/Doc/library/zipimport.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/library/zipimport.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/library/zipimport.rst Wed Aug 5 15:32:47 2009 @@ -12,7 +12,7 @@ This module adds the ability to import Python modules (:file:`\*.py`, :file:`\*.py[co]`) and packages from ZIP-format archives. It is usually not needed to use the :mod:`zipimport` module explicitly; it is automatically used -by the builtin :keyword:`import` mechanism for ``sys.path`` items that are paths +by the built-in :keyword:`import` mechanism for ``sys.path`` items that are paths to ZIP archives. Typically, ``sys.path`` is a list of directory names as strings. This module Modified: python/branches/tk_and_idle_maintenance/Doc/make.bat ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/make.bat (original) +++ python/branches/tk_and_idle_maintenance/Doc/make.bat Wed Aug 5 15:32:47 2009 @@ -34,7 +34,7 @@ goto end :checkout -svn co %SVNROOT%/external/Sphinx-0.6.1/sphinx tools/sphinx +svn co %SVNROOT%/external/Sphinx-0.6.2/sphinx tools/sphinx svn co %SVNROOT%/external/docutils-0.5/docutils tools/docutils svn co %SVNROOT%/external/Jinja-2.1.1/jinja2 tools/jinja2 svn co %SVNROOT%/external/Pygments-0.11.1/pygments tools/pygments Modified: python/branches/tk_and_idle_maintenance/Doc/reference/datamodel.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/reference/datamodel.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/reference/datamodel.rst Wed Aug 5 15:32:47 2009 @@ -1437,7 +1437,7 @@ .. index:: builtin: unicode - Called to implement :func:`unicode` builtin; should return a Unicode object. + Called to implement :func:`unicode` built-in; should return a Unicode object. When this method is not defined, string conversion is attempted, and the result of string conversion is converted to Unicode using the system default encoding. @@ -1516,7 +1516,7 @@ .. note:: This method may still be bypassed when looking up special methods as the - result of implicit invocation via language syntax or builtin functions. + result of implicit invocation via language syntax or built-in functions. See :ref:`new-style-special-lookup`. @@ -1865,12 +1865,12 @@ .. method:: object.__reversed__(self) - Called (if present) by the :func:`reversed` builtin to implement + Called (if present) by the :func:`reversed` built-in to implement reverse iteration. It should return a new iterator object that iterates over all the objects in the container in reverse order. If the :meth:`__reversed__` method is not provided, the :func:`reversed` - builtin will fall back to using the sequence protocol (:meth:`__len__` and + built-in will fall back to using the sequence protocol (:meth:`__len__` and :meth:`__getitem__`). Objects that support the sequence protocol should only provide :meth:`__reversed__` if they can provide an implementation that is more efficient than the one provided by :func:`reversed`. Modified: python/branches/tk_and_idle_maintenance/Doc/reference/executionmodel.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/reference/executionmodel.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/reference/executionmodel.rst Wed Aug 5 15:32:47 2009 @@ -112,9 +112,9 @@ If the global statement occurs within a block, all uses of the name specified in the statement refer to the binding of that name in the top-level namespace. Names are resolved in the top-level namespace by searching the global namespace, -i.e. the namespace of the module containing the code block, and the builtin +i.e. the namespace of the module containing the code block, and the builtins namespace, the namespace of the module :mod:`__builtin__`. The global namespace -is searched first. If the name is not found there, the builtin namespace is +is searched first. If the name is not found there, the builtins namespace is searched. The global statement must precede all uses of the name. .. index:: pair: restricted; execution Modified: python/branches/tk_and_idle_maintenance/Doc/reference/expressions.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/reference/expressions.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/reference/expressions.rst Wed Aug 5 15:32:47 2009 @@ -665,7 +665,7 @@ .. note:: - An implementation may provide builtin functions whose positional parameters do + An implementation may provide built-in functions whose positional parameters do not have names, even if they are 'named' for the purpose of documentation, and which therefore cannot be supplied by keyword. In CPython, this is the case for functions implemented in C that use :cfunc:`PyArg_ParseTuple` to parse their @@ -1032,7 +1032,7 @@ values of two objects. The objects need not have the same type. If both are numbers, they are converted to a common type. Otherwise, objects of different types *always* compare unequal, and are ordered consistently but arbitrarily. -You can control comparison behavior of objects of non-builtin types by defining +You can control comparison behavior of objects of non-built-in types by defining a ``__cmp__`` method or rich comparison methods like ``__gt__``, described in section :ref:`specialnames`. @@ -1063,7 +1063,7 @@ lists compare equal. [#]_ Outcomes other than equality are resolved consistently, but are not otherwise defined. [#]_ -* Most other objects of builtin types compare unequal unless they are the same +* Most other objects of built-in types compare unequal unless they are the same object; the choice whether one object is considered smaller or larger than another one is made arbitrarily but consistently within one execution of a program. Modified: python/branches/tk_and_idle_maintenance/Doc/reference/simple_stmts.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/reference/simple_stmts.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/reference/simple_stmts.rst Wed Aug 5 15:32:47 2009 @@ -891,7 +891,7 @@ That is not a future statement; it's an ordinary import statement with no special semantics or syntax restrictions. -Code compiled by an :keyword:`exec` statement or calls to the builtin functions +Code compiled by an :keyword:`exec` statement or calls to the built-in functions :func:`compile` and :func:`execfile` that occur in a module :mod:`M` containing a future statement will, by default, use the new syntax or semantics associated with the future statement. This can, starting with Python 2.2 be controlled by Modified: python/branches/tk_and_idle_maintenance/Doc/tools/sphinxext/indexsidebar.html ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/tools/sphinxext/indexsidebar.html (original) +++ python/branches/tk_and_idle_maintenance/Doc/tools/sphinxext/indexsidebar.html Wed Aug 5 15:32:47 2009 @@ -3,8 +3,8 @@

Docs for other versions

Modified: python/branches/tk_and_idle_maintenance/Doc/tools/sphinxext/layout.html ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/tools/sphinxext/layout.html (original) +++ python/branches/tk_and_idle_maintenance/Doc/tools/sphinxext/layout.html Wed Aug 5 15:32:47 2009 @@ -8,3 +8,14 @@ {{ super() }} {% endblock %} +{% block footer %} +
+ © Copyright {{ copyright|e }}. +
+ The Python Software Foundation is a non-profit corporation. + Please donate. +
+ Last updated on {{ last_updated|e }}. + Created using Sphinx {{ sphinx_version|e }}. +
+{% endblock %} Modified: python/branches/tk_and_idle_maintenance/Doc/tutorial/classes.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/tutorial/classes.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/tutorial/classes.rst Wed Aug 5 15:32:47 2009 @@ -12,43 +12,40 @@ are retained with full power, however: the class inheritance mechanism allows multiple base classes, a derived class can override any methods of its base class or classes, and a method can call the method of a base class with the same -name. Objects can contain an arbitrary amount of private data. +name. Objects can contain an arbitrary amount of data. In C++ terminology, all class members (including the data members) are *public*, -and all member functions are *virtual*. There are no special constructors or -destructors. As in Modula-3, there are no shorthands for referencing the -object's members from its methods: the method function is declared with an -explicit first argument representing the object, which is provided implicitly by -the call. As in Smalltalk, classes themselves are objects, albeit in the wider -sense of the word: in Python, all data types are objects. This provides -semantics for importing and renaming. Unlike C++ and Modula-3, built-in types -can be used as base classes for extension by the user. Also, like in C++ but -unlike in Modula-3, most built-in operators with special syntax (arithmetic +and all member functions are *virtual*. As in Modula-3, there are no shorthands +for referencing the object's members from its methods: the method function is +declared with an explicit first argument representing the object, which is +provided implicitly by the call. As in Smalltalk, classes themselves are +objects. This provides semantics for importing and renaming. Unlike C++ and +Modula-3, built-in types can be used as base classes for extension by the user. +Also, like in C++, most built-in operators with special syntax (arithmetic operators, subscripting etc.) can be redefined for class instances. +(Lacking universally accepted terminology to talk about classes, I will make +occasional use of Smalltalk and C++ terms. I would use Modula-3 terms, since +its object-oriented semantics are closer to those of Python than C++, but I +expect that few readers have heard of it.) -.. _tut-terminology: -A Word About Terminology -======================== +.. _tut-object: -Lacking universally accepted terminology to talk about classes, I will make -occasional use of Smalltalk and C++ terms. (I would use Modula-3 terms, since -its object-oriented semantics are closer to those of Python than C++, but I -expect that few readers have heard of it.) +A Word About Names and Objects +============================== Objects have individuality, and multiple names (in multiple scopes) can be bound to the same object. This is known as aliasing in other languages. This is usually not appreciated on a first glance at Python, and can be safely ignored when dealing with immutable basic types (numbers, strings, tuples). However, -aliasing has an (intended!) effect on the semantics of Python code involving -mutable objects such as lists, dictionaries, and most types representing -entities outside the program (files, windows, etc.). This is usually used to -the benefit of the program, since aliases behave like pointers in some respects. -For example, passing an object is cheap since only a pointer is passed by the -implementation; and if a function modifies an object passed as an argument, the -caller will see the change --- this eliminates the need for two different -argument passing mechanisms as in Pascal. +aliasing has a possibly surprising effect on the semantics of Python code +involving mutable objects such as lists, dictionaries, and most other types. +This is usually used to the benefit of the program, since aliases behave like +pointers in some respects. For example, passing an object is cheap since only a +pointer is passed by the implementation; and if a function modifies an object +passed as an argument, the caller will see the change --- this eliminates the +need for two different argument passing mechanisms as in Pascal. .. _tut-scopes: @@ -72,7 +69,7 @@ a function invocation. In a sense the set of attributes of an object also form a namespace. The important thing to know about namespaces is that there is absolutely no relation between names in different namespaces; for instance, two -different modules may both define a function "maximize" without confusion --- +different modules may both define a function ``maximize`` without confusion --- users of the modules must prefix it with the module name. By the way, I use the word *attribute* for any name following a dot --- for @@ -111,11 +108,13 @@ Although scopes are determined statically, they are used dynamically. At any time during execution, there are at least three nested scopes whose namespaces -are directly accessible: the innermost scope, which is searched first, contains -the local names; the namespaces of any enclosing functions, which are searched -starting with the nearest enclosing scope; the middle scope, searched next, -contains the current module's global names; and the outermost scope (searched -last) is the namespace containing built-in names. +are directly accessible: + +* the innermost scope, which is searched first, contains the local names +* the scopes of any enclosing functions, which are searched starting with the + nearest enclosing scope, contains non-local, but also non-global names +* the next-to-last scope contains the current module's global names +* the outermost scope (searched last) is the namespace containing built-in names If a name is declared global, then all references and assignments go directly to the middle scope containing the module's global names. Otherwise, all variables @@ -136,15 +135,15 @@ time, so don't rely on dynamic name resolution! (In fact, local variables are already determined statically.) -A special quirk of Python is that -- if no :keyword:`global` -statement is in effect -- assignments to names always go -into the innermost scope. Assignments do not copy data --- they just bind names -to objects. The same is true for deletions: the statement ``del x`` removes the -binding of ``x`` from the namespace referenced by the local scope. In fact, all -operations that introduce new names use the local scope: in particular, import -statements and function definitions bind the module or function name in the -local scope. (The :keyword:`global` statement can be used to indicate that -particular variables live in the global scope.) +A special quirk of Python is that -- if no :keyword:`global` statement is in +effect -- assignments to names always go into the innermost scope. Assignments +do not copy data --- they just bind names to objects. The same is true for +deletions: the statement ``del x`` removes the binding of ``x`` from the +namespace referenced by the local scope. In fact, all operations that introduce +new names use the local scope: in particular, :keyword:`import` statements and +function definitions bind the module or function name in the local scope. (The +:keyword:`global` statement can be used to indicate that particular variables +live in the global scope.) .. _tut-firstclasses: @@ -372,9 +371,9 @@ Often, the first argument of a method is called ``self``. This is nothing more than a convention: the name ``self`` has absolutely no special meaning to -Python. (Note, however, that by not following the convention your code may be +Python. Note, however, that by not following the convention your code may be less readable to other Python programmers, and it is also conceivable that a -*class browser* program might be written that relies upon such a convention.) +*class browser* program might be written that relies upon such a convention. Any function object that is a class attribute defines a method for instances of that class. It is not necessary that the function definition is textually @@ -410,13 +409,13 @@ Methods may reference global names in the same way as ordinary functions. The global scope associated with a method is the module containing the class -definition. (The class itself is never used as a global scope!) While one +definition. (The class itself is never used as a global scope.) While one rarely encounters a good reason for using global data in a method, there are many legitimate uses of the global scope: for one thing, functions and modules imported into the global scope can be used by methods, as well as functions and classes defined in it. Usually, the class containing the method is itself defined in this global scope, and in the next section we'll find some good -reasons why a method would want to reference its own class! +reasons why a method would want to reference its own class. Each value is an object, and therefore has a *class* (also called its *type*). It is stored as ``object.__class__``. @@ -467,12 +466,12 @@ simply replace the base class method of the same name. There is a simple way to call the base class method directly: just call ``BaseClassName.methodname(self, arguments)``. This is occasionally useful to clients as well. (Note that this -only works if the base class is defined or imported directly in the global +only works if the base class is accessible as ``BaseClassName`` in the global scope.) Python has two built-in functions that work with inheritance: -* Use :func:`isinstance` to check an object's type: ``isinstance(obj, int)`` +* Use :func:`isinstance` to check an instance's type: ``isinstance(obj, int)`` will be ``True`` only if ``obj.__class__`` is :class:`int` or some class derived from :class:`int`. @@ -537,26 +536,28 @@ Private Variables ================= -There is limited support for class-private identifiers. Any identifier of the -form ``__spam`` (at least two leading underscores, at most one trailing -underscore) is textually replaced with ``_classname__spam``, where ``classname`` -is the current class name with leading underscore(s) stripped. This mangling is -done without regard to the syntactic position of the identifier, so it can be -used to define class-private instance and class variables, methods, variables -stored in globals, and even variables stored in instances. private to this class -on instances of *other* classes. Truncation may occur when the mangled name -would be longer than 255 characters. Outside classes, or when the class name -consists of only underscores, no mangling occurs. - -Name mangling is intended to give classes an easy way to define "private" -instance variables and methods, without having to worry about instance variables -defined by derived classes, or mucking with instance variables by code outside -the class. Note that the mangling rules are designed mostly to avoid accidents; -it still is possible for a determined soul to access or modify a variable that -is considered private. This can even be useful in special circumstances, such -as in the debugger, and that's one reason why this loophole is not closed. -(Buglet: derivation of a class with the same name as the base class makes use of -private variables of the base class possible.) +"Private" instance variables that cannot be accessed except from inside an +object, don't exist in Python. However, there is a convention that is followed +by most Python code: a name prefixed with an underscore (e.g. ``_spam``) should +be treated as a non-public part of the API (whether it is a function, a method +or a data member). It should be considered an implementation detail and subject +to change without notice. + +Since there is a valid use-case for class-private members (namely to avoid name +clashes of names with names defined by subclasses), there is limited support for +such a mechanism, called :dfn:`name mangling`. Any identifier of the form +``__spam`` (at least two leading underscores, at most one trailing underscore) +is textually replaced with ``_classname__spam``, where ``classname`` is the +current class name with leading underscore(s) stripped. This mangling is done +without regard to the syntactic position of the identifier, so it can be used to +define class-private instance and class variables, methods, variables stored in +globals, and even variables stored in instances. Truncation may occur when the +mangled name would be longer than 255 characters. Outside classes, or when the +class name consists of only underscores, no mangling occurs. + +Note that the mangling rules are designed mostly to avoid accidents; it still is +possible to access or modify a variable that is considered private. This can +even be useful in special circumstances, such as in the debugger. Notice that code passed to ``exec``, ``eval()`` or ``execfile()`` does not consider the classname of the invoking class to be the current class; this is @@ -609,7 +610,7 @@ User-defined exceptions are identified by classes as well. Using this mechanism it is possible to create extensible hierarchies of exceptions. -There are two new valid (semantic) forms for the raise statement:: +There are two new valid (semantic) forms for the :keyword:`raise` statement:: raise Class, instance @@ -620,10 +621,10 @@ raise instance.__class__, instance -A class in an except clause is compatible with an exception if it is the same -class or a base class thereof (but not the other way around --- an except clause -listing a derived class is not compatible with a base class). For example, the -following code will print B, C, D in that order:: +A class in an :keyword:`except` clause is compatible with an exception if it is +the same class or a base class thereof (but not the other way around --- an +except clause listing a derived class is not compatible with a base class). For +example, the following code will print B, C, D in that order:: class B: pass Modified: python/branches/tk_and_idle_maintenance/Doc/tutorial/errors.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/tutorial/errors.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/tutorial/errors.rst Wed Aug 5 15:32:47 2009 @@ -221,10 +221,11 @@ File "", line 1, in ? NameError: HiThere -The first argument to :keyword:`raise` names the exception to be raised. The -optional second argument specifies the exception's argument. Alternatively, the -above could be written as ``raise NameError('HiThere')``. Either form works -fine, but there seems to be a growing stylistic preference for the latter. +The argument to :keyword:`raise` is an exception class or instance to be +raised. There is a deprecated alternate syntax that separates class and +constructor arguments; the above could be written as ``raise NameError, +'HiThere'``. Since it once was the only one available, the latter form is +prevalent in older code. If you need to determine whether an exception was raised but don't intend to handle it, a simpler form of the :keyword:`raise` statement allows you to Modified: python/branches/tk_and_idle_maintenance/Doc/tutorial/inputoutput.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/tutorial/inputoutput.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/tutorial/inputoutput.rst Wed Aug 5 15:32:47 2009 @@ -127,16 +127,17 @@ We are the knights who say "Ni!" The brackets and characters within them (called format fields) are replaced with -the objects passed into the format method. The number in the brackets refers to -the position of the object passed into the format method. :: +the objects passed into the :meth:`~str.format` method. The number in the +brackets refers to the position of the object passed into the +:meth:`~str.format` method. :: >>> print '{0} and {1}'.format('spam', 'eggs') spam and eggs >>> print '{1} and {0}'.format('spam', 'eggs') eggs and spam -If keyword arguments are used in the format method, their values are referred to -by using the name of the argument. :: +If keyword arguments are used in the :meth:`~str.format` method, their values +are referred to by using the name of the argument. :: >>> print 'This {food} is {adjective}.'.format( ... food='spam', adjective='absolutely horrible') @@ -148,16 +149,16 @@ ... other='Georg') The story of Bill, Manfred, and Georg. -An optional ``':'`` and format specifier can follow the field name. This also +An optional ``':'`` and format specifier can follow the field name. This allows greater control over how the value is formatted. The following example -truncates the Pi to three places after the decimal. +truncates Pi to three places after the decimal. >>> import math >>> print 'The value of PI is approximately {0:.3f}.'.format(math.pi) The value of PI is approximately 3.142. Passing an integer after the ``':'`` will cause that field to be a minimum -number of characters wide. This is useful for making tables pretty.:: +number of characters wide. This is useful for making tables pretty. :: >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 7678} >>> for name, phone in table.items(): @@ -178,7 +179,7 @@ Jack: 4098; Sjoerd: 4127; Dcab: 8637678 This could also be done by passing the table as keyword arguments with the '**' -notation.:: +notation. :: >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678} >>> print 'Jack: {Jack:d}; Sjoerd: {Sjoerd:d}; Dcab: {Dcab:d}'.format(**table) @@ -204,8 +205,8 @@ The value of PI is approximately 3.142. Since :meth:`str.format` is quite new, a lot of Python code still uses the ``%`` -operator. However, because this old style of formatting will eventually removed -from the language :meth:`str.format` should generally be used. +operator. However, because this old style of formatting will eventually be +removed from the language, :meth:`str.format` should generally be used. More information can be found in the :ref:`string-formatting` section. @@ -356,9 +357,9 @@ >>> f.closed True -File objects have some additional methods, such as :meth:`isatty` and -:meth:`truncate` which are less frequently used; consult the Library Reference -for a complete guide to file objects. +File objects have some additional methods, such as :meth:`~file.isatty` and +:meth:`~file.truncate` which are less frequently used; consult the Library +Reference for a complete guide to file objects. .. _tut-pickle: Modified: python/branches/tk_and_idle_maintenance/Doc/tutorial/interactive.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/tutorial/interactive.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/tutorial/interactive.rst Wed Aug 5 15:32:47 2009 @@ -6,8 +6,8 @@ Some versions of the Python interpreter support editing of the current input line and history substitution, similar to facilities found in the Korn shell and -the GNU Bash shell. This is implemented using the *GNU Readline* library, which -supports Emacs-style and vi-style editing. This library has its own +the GNU Bash shell. This is implemented using the `GNU Readline`_ library, +which supports Emacs-style and vi-style editing. This library has its own documentation which I won't duplicate here; however, the basics are easily explained. The interactive editing and history described here are optionally available in the Unix and Cygwin versions of the interpreter. @@ -148,8 +148,8 @@ .. _tut-commentary: -Commentary -========== +Alternatives to the Interactive Interpreter +=========================================== This facility is an enormous step forward compared to earlier versions of the interpreter; however, some wishes are left: It would be nice if the proper @@ -158,6 +158,12 @@ symbol table. A command to check (or even suggest) matching parentheses, quotes, etc., would also be useful. +One alternative enhanced interactive interpreter that has been around for quite +some time is `IPython`_, which features tab completion, object exploration and +advanced history management. It can also be thoroughly customized and embedded +into other applications. Another similar enhanced interactive environment is +`bpython`_. + .. rubric:: Footnotes @@ -165,3 +171,7 @@ :envvar:`PYTHONSTARTUP` environment variable when you start an interactive interpreter. + +.. _GNU Readline: http://tiswww.case.edu/php/chet/readline/rltop.html +.. _IPython: http://ipython.scipy.org/ +.. _bpython: http://www.bpython-interpreter.org/ Modified: python/branches/tk_and_idle_maintenance/Doc/tutorial/modules.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/tutorial/modules.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/tutorial/modules.rst Wed Aug 5 15:32:47 2009 @@ -446,14 +446,14 @@ submodules are present in the package, and imports them all. Unfortunately, this operation does not work very well on Windows platforms, where the filesystem does not always have accurate information about the case of a -filename! On these platforms, there is no guaranteed way to know whether a file +filename. On these platforms, there is no guaranteed way to know whether a file :file:`ECHO.PY` should be imported as a module :mod:`echo`, :mod:`Echo` or :mod:`ECHO`. (For example, Windows 95 has the annoying practice of showing all file names with a capitalized first letter.) The DOS 8+3 filename restriction adds another interesting problem for long module names. The only solution is for the package author to provide an explicit index of the -package. The import statement uses the following convention: if a package's +package. The :keyword:`import` statement uses the following convention: if a package's :file:`__init__.py` code defines a list named ``__all__``, it is taken to be the list of module names that should be imported when ``from package import *`` is encountered. It is up to the package author to keep this list up-to-date when a @@ -474,16 +474,16 @@ and then imports whatever names are defined in the package. This includes any names defined (and submodules explicitly loaded) by :file:`__init__.py`. It also includes any submodules of the package that were explicitly loaded by -previous import statements. Consider this code:: +previous :keyword:`import` statements. Consider this code:: import sound.effects.echo import sound.effects.surround from sound.effects import * -In this example, the echo and surround modules are imported in the current -namespace because they are defined in the :mod:`sound.effects` package when the -``from...import`` statement is executed. (This also works when ``__all__`` is -defined.) +In this example, the :mod:`echo` and :mod:`surround` modules are imported in the +current namespace because they are defined in the :mod:`sound.effects` package +when the ``from...import`` statement is executed. (This also works when +``__all__`` is defined.) Note that in general the practice of importing ``*`` from a module or package is frowned upon, since it often causes poorly readable code. However, it is okay to @@ -546,5 +546,6 @@ .. rubric:: Footnotes .. [#] In fact function definitions are also 'statements' that are 'executed'; the - execution enters the function name in the module's global symbol table. + execution of a module-level function enters the function name in the module's + global symbol table. Modified: python/branches/tk_and_idle_maintenance/Doc/tutorial/stdlib2.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/tutorial/stdlib2.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/tutorial/stdlib2.rst Wed Aug 5 15:32:47 2009 @@ -347,12 +347,15 @@ The :mod:`decimal` module offers a :class:`Decimal` datatype for decimal floating point arithmetic. Compared to the built-in :class:`float` -implementation of binary floating point, the new class is especially helpful for -financial applications and other uses which require exact decimal -representation, control over precision, control over rounding to meet legal or -regulatory requirements, tracking of significant decimal places, or for -applications where the user expects the results to match calculations done by -hand. +implementation of binary floating point, the class is especially helpful for + +* financial applications and other uses which require exact decimal + representation, +* control over precision, +* control over rounding to meet legal or regulatory requirements, +* tracking of significant decimal places, or +* applications where the user expects the results to match calculations done by + hand. For example, calculating a 5% tax on a 70 cent phone charge gives different results in decimal floating point and binary floating point. The difference @@ -360,7 +363,7 @@ >>> from decimal import * >>> Decimal('0.70') * Decimal('1.05') - Decimal("0.7350") + Decimal('0.7350') >>> .70 * 1.05 0.73499999999999999 @@ -373,7 +376,7 @@ calculations and equality tests that are unsuitable for binary floating point:: >>> Decimal('1.00') % Decimal('.10') - Decimal("0.00") + Decimal('0.00') >>> 1.00 % 0.10 0.09999999999999995 @@ -386,6 +389,6 @@ >>> getcontext().prec = 36 >>> Decimal(1) / Decimal(7) - Decimal("0.142857142857142857142857142857142857") + Decimal('0.142857142857142857142857142857142857') Modified: python/branches/tk_and_idle_maintenance/Doc/using/cmdline.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/using/cmdline.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/using/cmdline.rst Wed Aug 5 15:32:47 2009 @@ -86,7 +86,7 @@ .. note:: - This option cannot be used with builtin modules and extension modules + This option cannot be used with built-in modules and extension modules written in C, since they do not have Python module files. However, it can still be used for precompiled modules, even if the original source file is not available. @@ -328,7 +328,7 @@ warning is triggered repeatedly for the same source line, such as inside a loop). ``module`` - Print each warning only only the first time it occurs in each module. + Print each warning only the first time it occurs in each module. ``once`` Print each warning only the first time it occurs in the program. ``error`` Modified: python/branches/tk_and_idle_maintenance/Doc/whatsnew/2.2.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/whatsnew/2.2.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/whatsnew/2.2.rst Wed Aug 5 15:32:47 2009 @@ -1173,7 +1173,7 @@ can uncomment them. Gestalt and Internet Config modules are enabled by default. -* Keyword arguments passed to builtin functions that don't take them now cause a +* Keyword arguments passed to built-in functions that don't take them now cause a :exc:`TypeError` exception to be raised, with the message "*function* takes no keyword arguments". Modified: python/branches/tk_and_idle_maintenance/Doc/whatsnew/2.6.rst ============================================================================== --- python/branches/tk_and_idle_maintenance/Doc/whatsnew/2.6.rst (original) +++ python/branches/tk_and_idle_maintenance/Doc/whatsnew/2.6.rst Wed Aug 5 15:32:47 2009 @@ -2819,7 +2819,7 @@ often used in web applications. For more information about JSON, see http://www.json.org. -:mod:`json` comes with support for decoding and encoding most builtin Python +:mod:`json` comes with support for decoding and encoding most built-in Python types. The following example encodes and decodes a dictionary:: >>> import json Modified: python/branches/tk_and_idle_maintenance/Include/longintrepr.h ============================================================================== --- python/branches/tk_and_idle_maintenance/Include/longintrepr.h (original) +++ python/branches/tk_and_idle_maintenance/Include/longintrepr.h Wed Aug 5 15:32:47 2009 @@ -37,10 +37,6 @@ platform. */ -#if HAVE_STDINT_H -#include -#endif - #if PYLONG_BITS_IN_DIGIT == 30 #if !(defined HAVE_UINT64_T && defined HAVE_UINT32_T && \ defined HAVE_INT64_T && defined HAVE_INT32_T) Modified: python/branches/tk_and_idle_maintenance/Include/pymath.h ============================================================================== --- python/branches/tk_and_idle_maintenance/Include/pymath.h (original) +++ python/branches/tk_and_idle_maintenance/Include/pymath.h Wed Aug 5 15:32:47 2009 @@ -3,10 +3,6 @@ #include "pyconfig.h" /* include for defines */ -#ifdef HAVE_STDINT_H -#include -#endif - /************************************************************************** Symbols and macros to supply platform-independent interfaces to mathematical functions and constants Modified: python/branches/tk_and_idle_maintenance/Include/pyport.h ============================================================================== --- python/branches/tk_and_idle_maintenance/Include/pyport.h (original) +++ python/branches/tk_and_idle_maintenance/Include/pyport.h Wed Aug 5 15:32:47 2009 @@ -3,6 +3,12 @@ #include "pyconfig.h" /* include for defines */ +/* Some versions of HP-UX & Solaris need inttypes.h for int32_t, + INT32_MAX, etc. */ +#ifdef HAVE_INTTYPES_H +#include +#endif + #ifdef HAVE_STDINT_H #include #endif Modified: python/branches/tk_and_idle_maintenance/Include/symtable.h ============================================================================== --- python/branches/tk_and_idle_maintenance/Include/symtable.h (original) +++ python/branches/tk_and_idle_maintenance/Include/symtable.h Wed Aug 5 15:32:47 2009 @@ -19,7 +19,6 @@ PyObject *st_global; /* borrowed ref to MODULE in st_symbols */ int st_nblocks; /* number of blocks */ PyObject *st_private; /* name of current class or NULL */ - int st_tmpname; /* temporary name counter */ PyFutureFeatures *st_future; /* module's future features */ }; @@ -43,7 +42,6 @@ an argument */ int ste_lineno; /* first line of block */ int ste_opt_lineno; /* lineno of last exec or import * */ - int ste_tmpname; /* counter for listcomp temp vars */ struct symtable *ste_table; } PySTEntryObject; @@ -65,13 +63,9 @@ #define DEF_LOCAL 2 /* assignment in code block */ #define DEF_PARAM 2<<1 /* formal parameter */ #define USE 2<<2 /* name is used */ -#define DEF_STAR 2<<3 /* parameter is star arg */ -#define DEF_DOUBLESTAR 2<<4 /* parameter is star-star arg */ -#define DEF_INTUPLE 2<<5 /* name defined in tuple in parameters */ -#define DEF_FREE 2<<6 /* name used but not defined in nested block */ -#define DEF_FREE_GLOBAL 2<<7 /* free variable is actually implicit global */ -#define DEF_FREE_CLASS 2<<8 /* free variable from class's method */ -#define DEF_IMPORT 2<<9 /* assignment occurred via import */ +#define DEF_FREE 2<<3 /* name used but not defined in nested block */ +#define DEF_FREE_CLASS 2<<4 /* free variable from class's method */ +#define DEF_IMPORT 2<<5 /* assignment occurred via import */ #define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT) Modified: python/branches/tk_and_idle_maintenance/Lib/BaseHTTPServer.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/BaseHTTPServer.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/BaseHTTPServer.py Wed Aug 5 15:32:47 2009 @@ -309,18 +309,26 @@ commands such as GET and POST. """ - self.raw_requestline = self.rfile.readline() - if not self.raw_requestline: + try: + self.raw_requestline = self.rfile.readline() + if not self.raw_requestline: + self.close_connection = 1 + return + if not self.parse_request(): + # An error code has been sent, just exit + return + mname = 'do_' + self.command + if not hasattr(self, mname): + self.send_error(501, "Unsupported method (%r)" % self.command) + return + method = getattr(self, mname) + method() + self.wfile.flush() #actually send the response if not already done. + except socket.timeout, e: + #a read or a write timed out. Discard this connection + self.log_error("Request timed out: %r", e) self.close_connection = 1 return - if not self.parse_request(): # An error code has been sent, just exit - return - mname = 'do_' + self.command - if not hasattr(self, mname): - self.send_error(501, "Unsupported method (%r)" % self.command) - return - method = getattr(self, mname) - method() def handle(self): """Handle multiple requests if necessary.""" Modified: python/branches/tk_and_idle_maintenance/Lib/DocXMLRPCServer.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/DocXMLRPCServer.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/DocXMLRPCServer.py Wed Aug 5 15:32:47 2009 @@ -240,10 +240,6 @@ self.end_headers() self.wfile.write(response) - # shut down the connection - self.wfile.flush() - self.connection.shutdown(1) - class DocXMLRPCServer( SimpleXMLRPCServer, XMLRPCDocGenerator): """XML-RPC and HTML documentation server. Modified: python/branches/tk_and_idle_maintenance/Lib/SimpleXMLRPCServer.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/SimpleXMLRPCServer.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/SimpleXMLRPCServer.py Wed Aug 5 15:32:47 2009 @@ -106,6 +106,7 @@ import sys import os import traceback +import re try: import fcntl except ImportError: @@ -430,6 +431,31 @@ # paths not on this list will result in a 404 error. rpc_paths = ('/', '/RPC2') + #if not None, encode responses larger than this, if possible + encode_threshold = 1400 #a common MTU + + #Override form StreamRequestHandler: full buffering of output + #and no Nagle. + wbufsize = -1 + disable_nagle_algorithm = True + + # a re to match a gzip Accept-Encoding + aepattern = re.compile(r""" + \s* ([^\s;]+) \s* #content-coding + (;\s* q \s*=\s* ([0-9\.]+))? #q + """, re.VERBOSE | re.IGNORECASE) + + def accept_encodings(self): + r = {} + ae = self.headers.get("Accept-Encoding", "") + for e in ae.split(","): + match = self.aepattern.match(e) + if match: + v = match.group(3) + v = float(v) if v else 1.0 + r[match.group(1)] = v + return r + def is_rpc_path_valid(self): if self.rpc_paths: return self.path in self.rpc_paths @@ -463,6 +489,10 @@ size_remaining -= len(L[-1]) data = ''.join(L) + data = self.decode_request_content(data) + if data is None: + return #response has been sent + # In previous versions of SimpleXMLRPCServer, _dispatch # could be overridden in this class, instead of in # SimpleXMLRPCDispatcher. To maintain backwards compatibility, @@ -481,18 +511,41 @@ self.send_header("X-exception", str(e)) self.send_header("X-traceback", traceback.format_exc()) + self.send_header("Content-length", "0") self.end_headers() else: # got a valid XML RPC response self.send_response(200) self.send_header("Content-type", "text/xml") + if self.encode_threshold is not None: + if len(response) > self.encode_threshold: + q = self.accept_encodings().get("gzip", 0) + if q: + try: + response = xmlrpclib.gzip_encode(response) + self.send_header("Content-Encoding", "gzip") + except NotImplementedError: + pass self.send_header("Content-length", str(len(response))) self.end_headers() self.wfile.write(response) - # shut down the connection - self.wfile.flush() - self.connection.shutdown(1) + def decode_request_content(self, data): + #support gzip encoding of request + encoding = self.headers.get("content-encoding", "identity").lower() + if encoding == "identity": + return data + if encoding == "gzip": + try: + return xmlrpclib.gzip_decode(data) + except NotImplementedError: + self.send_response(501, "encoding %r not supported" % encoding) + except ValueError: + self.send_response(400, "error decoding gzip content") + else: + self.send_response(501, "encoding %r not supported" % encoding) + self.send_header("Content-length", "0") + self.end_headers() def report_404 (self): # Report a 404 error @@ -502,9 +555,6 @@ self.send_header("Content-length", str(len(response))) self.end_headers() self.wfile.write(response) - # shut down the connection - self.wfile.flush() - self.connection.shutdown(1) def log_request(self, code='-', size='-'): """Selectively log an accepted request.""" Modified: python/branches/tk_and_idle_maintenance/Lib/SocketServer.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/SocketServer.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/SocketServer.py Wed Aug 5 15:32:47 2009 @@ -168,6 +168,7 @@ - verify_request(request, client_address) - server_close() - process_request(request, client_address) + - shutdown_request(request) - close_request(request) - handle_error() @@ -281,7 +282,7 @@ self.process_request(request, client_address) except: self.handle_error(request, client_address) - self.close_request(request) + self.shutdown_request(request) def handle_timeout(self): """Called if no new request arrives within self.timeout. @@ -305,7 +306,7 @@ """ self.finish_request(request, client_address) - self.close_request(request) + self.shutdown_request(request) def server_close(self): """Called to clean-up the server. @@ -319,6 +320,10 @@ """Finish one request by instantiating RequestHandlerClass.""" self.RequestHandlerClass(request, client_address, self) + def shutdown_request(self, request): + """Called to shutdown and close an individual request.""" + self.close_request(request) + def close_request(self, request): """Called to clean up an individual request.""" pass @@ -359,6 +364,7 @@ - handle_timeout() - verify_request(request, client_address) - process_request(request, client_address) + - shutdown_request(request) - close_request(request) - handle_error() @@ -374,7 +380,6 @@ - socket_type - request_queue_size (only for stream sockets) - allow_reuse_address - - disable_nagle_algorithm Instance variables: @@ -392,8 +397,6 @@ allow_reuse_address = False - disable_nagle_algorithm = False - def __init__(self, server_address, RequestHandlerClass, bind_and_activate=True): """Constructor. May be extended, do not override.""" BaseServer.__init__(self, server_address, RequestHandlerClass) @@ -444,10 +447,17 @@ May be overridden. """ - request = self.socket.accept() - if self.disable_nagle_algorithm: - request[0].setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, True) - return request + return self.socket.accept() + + def shutdown_request(self, request): + """Called to shutdown and close an individual request.""" + try: + #explicitly shutdown. socket.close() merely releases + #the socket and waits for GC to perform the actual close. + request.shutdown(socket.SHUT_WR) + except socket.error: + pass #some platforms may raise ENOTCONN here + self.close_request(request) def close_request(self, request): """Called to clean up an individual request.""" @@ -472,6 +482,10 @@ # No need to call listen() for UDP. pass + def shutdown_request(self, request): + # No need to shutdown anything. + self.close_request(request) + def close_request(self, request): # No need to close anything. pass @@ -532,17 +546,19 @@ if self.active_children is None: self.active_children = [] self.active_children.append(pid) - self.close_request(request) + self.close_request(request) #close handle in parent process return else: # Child process. # This must never return, hence os._exit()! try: self.finish_request(request, client_address) + self.shutdown_request(request) os._exit(0) except: try: self.handle_error(request, client_address) + self.shutdown_request(request) finally: os._exit(1) @@ -562,10 +578,10 @@ """ try: self.finish_request(request, client_address) - self.close_request(request) + self.shutdown_request(request) except: self.handle_error(request, client_address) - self.close_request(request) + self.shutdown_request(request) def process_request(self, request, client_address): """Start a new thread to process the request.""" @@ -616,12 +632,11 @@ self.request = request self.client_address = client_address self.server = server + self.setup() try: - self.setup() self.handle() - self.finish() finally: - sys.exc_traceback = None # Help garbage collection + self.finish() def setup(self): pass @@ -655,8 +670,20 @@ rbufsize = -1 wbufsize = 0 + # A timeout to apply to the request socket, if not None. + timeout = None + + # Disable nagle algoritm for this socket, if True. + # Use only when wbufsize != 0, to avoid small packets. + disable_nagle_algorithm = False + def setup(self): self.connection = self.request + if self.timeout is not None: + self.connection.settimeout(self.timeout) + if self.disable_nagle_algorithm: + self.connection.setsockopt(socket.IPPROTO_TCP, + socket.TCP_NODELAY, True) self.rfile = self.connection.makefile('rb', self.rbufsize) self.wfile = self.connection.makefile('wb', self.wbufsize) Modified: python/branches/tk_and_idle_maintenance/Lib/collections.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/collections.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/collections.py Wed Aug 5 15:32:47 2009 @@ -418,13 +418,15 @@ if iterable is not None: if isinstance(iterable, Mapping): if self: + self_get = self.get for elem, count in iterable.iteritems(): - self[elem] += count + self[elem] = self_get(elem, 0) + count else: dict.update(self, iterable) # fast path when counter is empty else: + self_get = self.get for elem in iterable: - self[elem] += 1 + self[elem] = self_get(elem, 0) + 1 if kwds: self.update(kwds) Modified: python/branches/tk_and_idle_maintenance/Lib/contextlib.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/contextlib.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/contextlib.py Wed Aug 5 15:32:47 2009 @@ -87,19 +87,17 @@ @contextmanager def nested(*managers): - """Support multiple context managers in a single with-statement. + """Combine multiple context managers into a single nested context manager. - Code like this: - - with nested(A, B, C) as (X, Y, Z): - + This function has been deprecated in favour of the multiple manager form + of the with statement. - is equivalent to this: + The one advantage of this function over the multiple manager form of the + with statement is that argument unpacking allows it to be + used with a variable number of context managers as follows: - with A as X: - with B as Y: - with C as Z: - + with nested(*managers): + do_something() """ warn("With-statements now directly support multiple context managers", Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_anon.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_anon.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_anon.py Wed Aug 5 15:32:47 2009 @@ -14,22 +14,22 @@ ("y", c_int)] _anonymous_ = ["_"] - self.failUnlessEqual(Y.a.offset, sizeof(c_int)) - self.failUnlessEqual(Y.b.offset, sizeof(c_int)) + self.assertEqual(Y.a.offset, sizeof(c_int)) + self.assertEqual(Y.b.offset, sizeof(c_int)) - self.failUnlessEqual(ANON.a.offset, 0) - self.failUnlessEqual(ANON.b.offset, 0) + self.assertEqual(ANON.a.offset, 0) + self.assertEqual(ANON.b.offset, 0) def test_anon_nonseq(self): # TypeError: _anonymous_ must be a sequence - self.failUnlessRaises(TypeError, + self.assertRaises(TypeError, lambda: type(Structure)("Name", (Structure,), {"_fields_": [], "_anonymous_": 42})) def test_anon_nonmember(self): # AttributeError: type object 'Name' has no attribute 'x' - self.failUnlessRaises(AttributeError, + self.assertRaises(AttributeError, lambda: type(Structure)("Name", (Structure,), {"_fields_": [], @@ -50,11 +50,11 @@ ("y", c_int)] _anonymous_ = ["_"] - self.failUnlessEqual(Y.x.offset, 0) - self.failUnlessEqual(Y.a.offset, sizeof(c_int)) - self.failUnlessEqual(Y.b.offset, sizeof(c_int)) - self.failUnlessEqual(Y._.offset, sizeof(c_int)) - self.failUnlessEqual(Y.y.offset, sizeof(c_int) * 2) + self.assertEqual(Y.x.offset, 0) + self.assertEqual(Y.a.offset, sizeof(c_int)) + self.assertEqual(Y.b.offset, sizeof(c_int)) + self.assertEqual(Y._.offset, sizeof(c_int)) + self.assertEqual(Y.y.offset, sizeof(c_int) * 2) if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_array_in_pointer.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_array_in_pointer.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_array_in_pointer.py Wed Aug 5 15:32:47 2009 @@ -26,7 +26,7 @@ c.pvalues = val_array # memory contains 4 NUL bytes now, that's correct - self.failUnlessEqual("00-00-00-00", dump(val_array)) + self.assertEqual("00-00-00-00", dump(val_array)) # set the values of the array through the pointer: for i in range(4): @@ -35,7 +35,7 @@ values = [c.pvalues[i].val for i in range(4)] # These are the expected results: here s the bug! - self.failUnlessEqual( + self.assertEqual( (values, dump(val_array)), ([1, 2, 3, 4], "01-02-03-04") ) @@ -45,7 +45,7 @@ val_array = (Value * 4)() # memory contains 4 NUL bytes now, that's correct - self.failUnlessEqual("00-00-00-00", dump(val_array)) + self.assertEqual("00-00-00-00", dump(val_array)) ptr = cast(val_array, POINTER(Value)) # set the values of the array through the pointer: @@ -55,7 +55,7 @@ values = [ptr[i].val for i in range(4)] # These are the expected results: here s the bug! - self.failUnlessEqual( + self.assertEqual( (values, dump(val_array)), ([1, 2, 3, 4], "01-02-03-04") ) Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_arrays.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_arrays.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_arrays.py Wed Aug 5 15:32:47 2009 @@ -19,23 +19,23 @@ ia = int_array(*init) # length of instance ok? - self.failUnlessEqual(len(ia), alen) + self.assertEqual(len(ia), alen) # slot values ok? values = [ia[i] for i in range(len(init))] - self.failUnlessEqual(values, init) + self.assertEqual(values, init) # change the items from operator import setitem new_values = range(42, 42+alen) [setitem(ia, n, new_values[n]) for n in range(alen)] values = [ia[i] for i in range(len(init))] - self.failUnlessEqual(values, new_values) + self.assertEqual(values, new_values) # are the items initialized to 0? ia = int_array() values = [ia[i] for i in range(len(init))] - self.failUnlessEqual(values, [0] * len(init)) + self.assertEqual(values, [0] * len(init)) # Too many in itializers should be caught self.assertRaises(IndexError, int_array, *range(alen*2)) @@ -48,14 +48,14 @@ # CharArray("abc") self.assertRaises(TypeError, CharArray, "abc") - self.failUnlessEqual(ca[0], "a") - self.failUnlessEqual(ca[1], "b") - self.failUnlessEqual(ca[2], "c") - self.failUnlessEqual(ca[-3], "a") - self.failUnlessEqual(ca[-2], "b") - self.failUnlessEqual(ca[-1], "c") + self.assertEqual(ca[0], "a") + self.assertEqual(ca[1], "b") + self.assertEqual(ca[2], "c") + self.assertEqual(ca[-3], "a") + self.assertEqual(ca[-2], "b") + self.assertEqual(ca[-1], "c") - self.failUnlessEqual(len(ca), 3) + self.assertEqual(len(ca), 3) # slicing is now supported, but not extended slicing (3-argument)! from operator import getslice, delitem @@ -72,34 +72,34 @@ na = numarray() values = [na[i] for i in range(alen)] - self.failUnlessEqual(values, [0] * alen) + self.assertEqual(values, [0] * alen) na = numarray(*[c_int()] * alen) values = [na[i] for i in range(alen)] - self.failUnlessEqual(values, [0]*alen) + self.assertEqual(values, [0]*alen) na = numarray(1, 2, 3, 4, 5) values = [i for i in na] - self.failUnlessEqual(values, [1, 2, 3, 4, 5]) + self.assertEqual(values, [1, 2, 3, 4, 5]) na = numarray(*map(c_int, (1, 2, 3, 4, 5))) values = [i for i in na] - self.failUnlessEqual(values, [1, 2, 3, 4, 5]) + self.assertEqual(values, [1, 2, 3, 4, 5]) def test_classcache(self): - self.failUnless(not ARRAY(c_int, 3) is ARRAY(c_int, 4)) - self.failUnless(ARRAY(c_int, 3) is ARRAY(c_int, 3)) + self.assertTrue(not ARRAY(c_int, 3) is ARRAY(c_int, 4)) + self.assertTrue(ARRAY(c_int, 3) is ARRAY(c_int, 3)) def test_from_address(self): # Failed with 0.9.8, reported by JUrner p = create_string_buffer("foo") sz = (c_char * 3).from_address(addressof(p)) - self.failUnlessEqual(sz[:], "foo") - self.failUnlessEqual(sz[::], "foo") - self.failUnlessEqual(sz[::-1], "oof") - self.failUnlessEqual(sz[::3], "f") - self.failUnlessEqual(sz[1:4:2], "o") - self.failUnlessEqual(sz.value, "foo") + self.assertEqual(sz[:], "foo") + self.assertEqual(sz[::], "foo") + self.assertEqual(sz[::-1], "oof") + self.assertEqual(sz[::3], "f") + self.assertEqual(sz[1:4:2], "o") + self.assertEqual(sz.value, "foo") try: create_unicode_buffer @@ -109,12 +109,12 @@ def test_from_addressW(self): p = create_unicode_buffer("foo") sz = (c_wchar * 3).from_address(addressof(p)) - self.failUnlessEqual(sz[:], "foo") - self.failUnlessEqual(sz[::], "foo") - self.failUnlessEqual(sz[::-1], "oof") - self.failUnlessEqual(sz[::3], "f") - self.failUnlessEqual(sz[1:4:2], "o") - self.failUnlessEqual(sz.value, "foo") + self.assertEqual(sz[:], "foo") + self.assertEqual(sz[::], "foo") + self.assertEqual(sz[::-1], "oof") + self.assertEqual(sz[::3], "f") + self.assertEqual(sz[1:4:2], "o") + self.assertEqual(sz.value, "foo") def test_cache(self): # Array types are cached internally in the _ctypes extension, @@ -128,7 +128,7 @@ # Create a new array type based on it: t1 = my_int * 1 t2 = my_int * 1 - self.failUnless(t1 is t2) + self.assertTrue(t1 is t2) if __name__ == '__main__': unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_as_parameter.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_as_parameter.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_as_parameter.py Wed Aug 5 15:32:47 2009 @@ -25,8 +25,8 @@ f = dll._testfunc_i_bhilfd f.argtypes = [c_byte, c_wchar, c_int, c_long, c_float, c_double] result = f(self.wrap(1), self.wrap(u"x"), self.wrap(3), self.wrap(4), self.wrap(5.0), self.wrap(6.0)) - self.failUnlessEqual(result, 139) - self.failUnless(type(result), int) + self.assertEqual(result, 139) + self.assertTrue(type(result), int) def test_pointers(self): f = dll._testfunc_p_p @@ -39,18 +39,18 @@ v = c_int(42) - self.failUnlessEqual(pointer(v).contents.value, 42) + self.assertEqual(pointer(v).contents.value, 42) result = f(self.wrap(pointer(v))) - self.failUnlessEqual(type(result), POINTER(c_int)) - self.failUnlessEqual(result.contents.value, 42) + self.assertEqual(type(result), POINTER(c_int)) + self.assertEqual(result.contents.value, 42) # This on works... result = f(self.wrap(pointer(v))) - self.failUnlessEqual(result.contents.value, v.value) + self.assertEqual(result.contents.value, v.value) p = pointer(c_int(99)) result = f(self.wrap(p)) - self.failUnlessEqual(result.contents.value, 99) + self.assertEqual(result.contents.value, 99) def test_shorts(self): f = dll._testfunc_callback_i_if @@ -67,7 +67,7 @@ cb = CallBack(callback) f(self.wrap(2**18), self.wrap(cb)) - self.failUnlessEqual(args, expected) + self.assertEqual(args, expected) ################################################################ @@ -84,17 +84,17 @@ cb = MyCallback(callback) result = f(self.wrap(-10), self.wrap(cb)) - self.failUnlessEqual(result, -18) + self.assertEqual(result, -18) # test with prototype f.argtypes = [c_int, MyCallback] cb = MyCallback(callback) result = f(self.wrap(-10), self.wrap(cb)) - self.failUnlessEqual(result, -18) + self.assertEqual(result, -18) result = f(self.wrap(-10), self.wrap(cb)) - self.failUnlessEqual(result, -18) + self.assertEqual(result, -18) AnotherCallback = CALLBACK_FUNCTYPE(c_int, c_int, c_int, c_int, c_int) @@ -116,12 +116,12 @@ def callback(value): #print "called back with", value - self.failUnlessEqual(type(value), int) + self.assertEqual(type(value), int) return value cb = MyCallback(callback) result = f(self.wrap(-10), self.wrap(cb)) - self.failUnlessEqual(result, -18) + self.assertEqual(result, -18) def test_longlong_callbacks(self): @@ -133,12 +133,12 @@ f.argtypes = [c_longlong, MyCallback] def callback(value): - self.failUnless(isinstance(value, (int, long))) + self.assertTrue(isinstance(value, (int, long))) return value & 0x7FFFFFFF cb = MyCallback(callback) - self.failUnlessEqual(13577625587, int(f(self.wrap(1000000000000), self.wrap(cb)))) + self.assertEqual(13577625587, int(f(self.wrap(1000000000000), self.wrap(cb)))) def test_byval(self): # without prototype @@ -148,7 +148,7 @@ result = dll._testfunc_byval(ptin, byref(ptout)) got = result, ptout.x, ptout.y expected = 3, 1, 2 - self.failUnlessEqual(got, expected) + self.assertEqual(got, expected) # with prototype ptin = POINT(101, 102) @@ -158,7 +158,7 @@ result = dll._testfunc_byval(self.wrap(ptin), byref(ptout)) got = result, ptout.x, ptout.y expected = 203, 101, 102 - self.failUnlessEqual(got, expected) + self.assertEqual(got, expected) def test_struct_return_2H(self): class S2H(Structure): @@ -168,7 +168,7 @@ dll.ret_2h_func.argtypes = [S2H] inp = S2H(99, 88) s2h = dll.ret_2h_func(self.wrap(inp)) - self.failUnlessEqual((s2h.x, s2h.y), (99*2, 88*3)) + self.assertEqual((s2h.x, s2h.y), (99*2, 88*3)) def test_struct_return_8H(self): class S8I(Structure): @@ -184,7 +184,7 @@ dll.ret_8i_func.argtypes = [S8I] inp = S8I(9, 8, 7, 6, 5, 4, 3, 2) s8i = dll.ret_8i_func(self.wrap(inp)) - self.failUnlessEqual((s8i.a, s8i.b, s8i.c, s8i.d, s8i.e, s8i.f, s8i.g, s8i.h), + self.assertEqual((s8i.a, s8i.b, s8i.c, s8i.d, s8i.e, s8i.f, s8i.g, s8i.h), (9*2, 8*3, 7*4, 6*5, 5*6, 4*7, 3*8, 2*9)) #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_bitfields.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_bitfields.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_bitfields.py Wed Aug 5 15:32:47 2009 @@ -37,14 +37,14 @@ for name in "ABCDEFGHI": b = BITS() setattr(b, name, i) - self.failUnlessEqual((name, i, getattr(b, name)), (name, i, func(byref(b), name))) + self.assertEqual((name, i, getattr(b, name)), (name, i, func(byref(b), name))) def test_shorts(self): for i in range(256): for name in "MNOPQRS": b = BITS() setattr(b, name, i) - self.failUnlessEqual((name, i, getattr(b, name)), (name, i, func(byref(b), name))) + self.assertEqual((name, i, getattr(b, name)), (name, i, func(byref(b), name))) signed_int_types = (c_byte, c_short, c_int, c_long, c_longlong) unsigned_int_types = (c_ubyte, c_ushort, c_uint, c_ulong, c_ulonglong) @@ -58,10 +58,10 @@ ("b", c_longlong, 62), ("c", c_longlong, 1)] - self.failUnlessEqual(sizeof(X), sizeof(c_longlong)) + self.assertEqual(sizeof(X), sizeof(c_longlong)) x = X() x.a, x.b, x.c = -1, 7, -1 - self.failUnlessEqual((x.a, x.b, x.c), (-1, 7, -1)) + self.assertEqual((x.a, x.b, x.c), (-1, 7, -1)) def test_ulonglong(self): class X(Structure): @@ -69,11 +69,11 @@ ("b", c_ulonglong, 62), ("c", c_ulonglong, 1)] - self.failUnlessEqual(sizeof(X), sizeof(c_longlong)) + self.assertEqual(sizeof(X), sizeof(c_longlong)) x = X() - self.failUnlessEqual((x.a, x.b, x.c), (0, 0, 0)) + self.assertEqual((x.a, x.b, x.c), (0, 0, 0)) x.a, x.b, x.c = 7, 7, 7 - self.failUnlessEqual((x.a, x.b, x.c), (1, 7, 1)) + self.assertEqual((x.a, x.b, x.c), (1, 7, 1)) def test_signed(self): for c_typ in signed_int_types: @@ -82,14 +82,14 @@ ("a", c_typ, 3), ("b", c_typ, 3), ("c", c_typ, 1)] - self.failUnlessEqual(sizeof(X), sizeof(c_typ)*2) + self.assertEqual(sizeof(X), sizeof(c_typ)*2) x = X() - self.failUnlessEqual((c_typ, x.a, x.b, x.c), (c_typ, 0, 0, 0)) + self.assertEqual((c_typ, x.a, x.b, x.c), (c_typ, 0, 0, 0)) x.a = -1 - self.failUnlessEqual((c_typ, x.a, x.b, x.c), (c_typ, -1, 0, 0)) + self.assertEqual((c_typ, x.a, x.b, x.c), (c_typ, -1, 0, 0)) x.a, x.b = 0, -1 - self.failUnlessEqual((c_typ, x.a, x.b, x.c), (c_typ, 0, -1, 0)) + self.assertEqual((c_typ, x.a, x.b, x.c), (c_typ, 0, -1, 0)) def test_unsigned(self): @@ -98,14 +98,14 @@ _fields_ = [("a", c_typ, 3), ("b", c_typ, 3), ("c", c_typ, 1)] - self.failUnlessEqual(sizeof(X), sizeof(c_typ)) + self.assertEqual(sizeof(X), sizeof(c_typ)) x = X() - self.failUnlessEqual((c_typ, x.a, x.b, x.c), (c_typ, 0, 0, 0)) + self.assertEqual((c_typ, x.a, x.b, x.c), (c_typ, 0, 0, 0)) x.a = -1 - self.failUnlessEqual((c_typ, x.a, x.b, x.c), (c_typ, 7, 0, 0)) + self.assertEqual((c_typ, x.a, x.b, x.c), (c_typ, 7, 0, 0)) x.a, x.b = 0, -1 - self.failUnlessEqual((c_typ, x.a, x.b, x.c), (c_typ, 0, 7, 0)) + self.assertEqual((c_typ, x.a, x.b, x.c), (c_typ, 0, 7, 0)) def fail_fields(self, *fields): @@ -115,17 +115,17 @@ def test_nonint_types(self): # bit fields are not allowed on non-integer types. result = self.fail_fields(("a", c_char_p, 1)) - self.failUnlessEqual(result, (TypeError, 'bit fields not allowed for type c_char_p')) + self.assertEqual(result, (TypeError, 'bit fields not allowed for type c_char_p')) result = self.fail_fields(("a", c_void_p, 1)) - self.failUnlessEqual(result, (TypeError, 'bit fields not allowed for type c_void_p')) + self.assertEqual(result, (TypeError, 'bit fields not allowed for type c_void_p')) if c_int != c_long: result = self.fail_fields(("a", POINTER(c_int), 1)) - self.failUnlessEqual(result, (TypeError, 'bit fields not allowed for type LP_c_int')) + self.assertEqual(result, (TypeError, 'bit fields not allowed for type LP_c_int')) result = self.fail_fields(("a", c_char, 1)) - self.failUnlessEqual(result, (TypeError, 'bit fields not allowed for type c_char')) + self.assertEqual(result, (TypeError, 'bit fields not allowed for type c_char')) try: c_wchar @@ -133,59 +133,59 @@ pass else: result = self.fail_fields(("a", c_wchar, 1)) - self.failUnlessEqual(result, (TypeError, 'bit fields not allowed for type c_wchar')) + self.assertEqual(result, (TypeError, 'bit fields not allowed for type c_wchar')) class Dummy(Structure): _fields_ = [] result = self.fail_fields(("a", Dummy, 1)) - self.failUnlessEqual(result, (TypeError, 'bit fields not allowed for type Dummy')) + self.assertEqual(result, (TypeError, 'bit fields not allowed for type Dummy')) def test_single_bitfield_size(self): for c_typ in int_types: result = self.fail_fields(("a", c_typ, -1)) - self.failUnlessEqual(result, (ValueError, 'number of bits invalid for bit field')) + self.assertEqual(result, (ValueError, 'number of bits invalid for bit field')) result = self.fail_fields(("a", c_typ, 0)) - self.failUnlessEqual(result, (ValueError, 'number of bits invalid for bit field')) + self.assertEqual(result, (ValueError, 'number of bits invalid for bit field')) class X(Structure): _fields_ = [("a", c_typ, 1)] - self.failUnlessEqual(sizeof(X), sizeof(c_typ)) + self.assertEqual(sizeof(X), sizeof(c_typ)) class X(Structure): _fields_ = [("a", c_typ, sizeof(c_typ)*8)] - self.failUnlessEqual(sizeof(X), sizeof(c_typ)) + self.assertEqual(sizeof(X), sizeof(c_typ)) result = self.fail_fields(("a", c_typ, sizeof(c_typ)*8 + 1)) - self.failUnlessEqual(result, (ValueError, 'number of bits invalid for bit field')) + self.assertEqual(result, (ValueError, 'number of bits invalid for bit field')) def test_multi_bitfields_size(self): class X(Structure): _fields_ = [("a", c_short, 1), ("b", c_short, 14), ("c", c_short, 1)] - self.failUnlessEqual(sizeof(X), sizeof(c_short)) + self.assertEqual(sizeof(X), sizeof(c_short)) class X(Structure): _fields_ = [("a", c_short, 1), ("a1", c_short), ("b", c_short, 14), ("c", c_short, 1)] - self.failUnlessEqual(sizeof(X), sizeof(c_short)*3) - self.failUnlessEqual(X.a.offset, 0) - self.failUnlessEqual(X.a1.offset, sizeof(c_short)) - self.failUnlessEqual(X.b.offset, sizeof(c_short)*2) - self.failUnlessEqual(X.c.offset, sizeof(c_short)*2) + self.assertEqual(sizeof(X), sizeof(c_short)*3) + self.assertEqual(X.a.offset, 0) + self.assertEqual(X.a1.offset, sizeof(c_short)) + self.assertEqual(X.b.offset, sizeof(c_short)*2) + self.assertEqual(X.c.offset, sizeof(c_short)*2) class X(Structure): _fields_ = [("a", c_short, 3), ("b", c_short, 14), ("c", c_short, 14)] - self.failUnlessEqual(sizeof(X), sizeof(c_short)*3) - self.failUnlessEqual(X.a.offset, sizeof(c_short)*0) - self.failUnlessEqual(X.b.offset, sizeof(c_short)*1) - self.failUnlessEqual(X.c.offset, sizeof(c_short)*2) + self.assertEqual(sizeof(X), sizeof(c_short)*3) + self.assertEqual(X.a.offset, sizeof(c_short)*0) + self.assertEqual(X.b.offset, sizeof(c_short)*1) + self.assertEqual(X.c.offset, sizeof(c_short)*2) def get_except(self, func, *args, **kw): @@ -199,21 +199,21 @@ _fields_ = [("a", c_byte, 4), ("b", c_int, 4)] if os.name in ("nt", "ce"): - self.failUnlessEqual(sizeof(X), sizeof(c_int)*2) + self.assertEqual(sizeof(X), sizeof(c_int)*2) else: - self.failUnlessEqual(sizeof(X), sizeof(c_int)) + self.assertEqual(sizeof(X), sizeof(c_int)) def test_mixed_2(self): class X(Structure): _fields_ = [("a", c_byte, 4), ("b", c_int, 32)] - self.failUnlessEqual(sizeof(X), sizeof(c_int)*2) + self.assertEqual(sizeof(X), sizeof(c_int)*2) def test_mixed_3(self): class X(Structure): _fields_ = [("a", c_byte, 4), ("b", c_ubyte, 4)] - self.failUnlessEqual(sizeof(X), sizeof(c_byte)) + self.assertEqual(sizeof(X), sizeof(c_byte)) def test_mixed_4(self): class X(Structure): @@ -227,9 +227,9 @@ # does (unless GCC is run with '-mms-bitfields' which # produces code compatible with MSVC). if os.name in ("nt", "ce"): - self.failUnlessEqual(sizeof(X), sizeof(c_int) * 4) + self.assertEqual(sizeof(X), sizeof(c_int) * 4) else: - self.failUnlessEqual(sizeof(X), sizeof(c_int) * 2) + self.assertEqual(sizeof(X), sizeof(c_int) * 2) def test_anon_bitfields(self): # anonymous bit-fields gave a strange error message Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_buffers.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_buffers.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_buffers.py Wed Aug 5 15:32:47 2009 @@ -5,32 +5,32 @@ def test_buffer(self): b = create_string_buffer(32) - self.failUnlessEqual(len(b), 32) - self.failUnlessEqual(sizeof(b), 32 * sizeof(c_char)) - self.failUnless(type(b[0]) is str) + self.assertEqual(len(b), 32) + self.assertEqual(sizeof(b), 32 * sizeof(c_char)) + self.assertTrue(type(b[0]) is str) b = create_string_buffer("abc") - self.failUnlessEqual(len(b), 4) # trailing nul char - self.failUnlessEqual(sizeof(b), 4 * sizeof(c_char)) - self.failUnless(type(b[0]) is str) - self.failUnlessEqual(b[0], "a") - self.failUnlessEqual(b[:], "abc\0") - self.failUnlessEqual(b[::], "abc\0") - self.failUnlessEqual(b[::-1], "\0cba") - self.failUnlessEqual(b[::2], "ac") - self.failUnlessEqual(b[::5], "a") + self.assertEqual(len(b), 4) # trailing nul char + self.assertEqual(sizeof(b), 4 * sizeof(c_char)) + self.assertTrue(type(b[0]) is str) + self.assertEqual(b[0], "a") + self.assertEqual(b[:], "abc\0") + self.assertEqual(b[::], "abc\0") + self.assertEqual(b[::-1], "\0cba") + self.assertEqual(b[::2], "ac") + self.assertEqual(b[::5], "a") def test_string_conversion(self): b = create_string_buffer(u"abc") - self.failUnlessEqual(len(b), 4) # trailing nul char - self.failUnlessEqual(sizeof(b), 4 * sizeof(c_char)) - self.failUnless(type(b[0]) is str) - self.failUnlessEqual(b[0], "a") - self.failUnlessEqual(b[:], "abc\0") - self.failUnlessEqual(b[::], "abc\0") - self.failUnlessEqual(b[::-1], "\0cba") - self.failUnlessEqual(b[::2], "ac") - self.failUnlessEqual(b[::5], "a") + self.assertEqual(len(b), 4) # trailing nul char + self.assertEqual(sizeof(b), 4 * sizeof(c_char)) + self.assertTrue(type(b[0]) is str) + self.assertEqual(b[0], "a") + self.assertEqual(b[:], "abc\0") + self.assertEqual(b[::], "abc\0") + self.assertEqual(b[::-1], "\0cba") + self.assertEqual(b[::2], "ac") + self.assertEqual(b[::5], "a") try: c_wchar @@ -39,32 +39,32 @@ else: def test_unicode_buffer(self): b = create_unicode_buffer(32) - self.failUnlessEqual(len(b), 32) - self.failUnlessEqual(sizeof(b), 32 * sizeof(c_wchar)) - self.failUnless(type(b[0]) is unicode) + self.assertEqual(len(b), 32) + self.assertEqual(sizeof(b), 32 * sizeof(c_wchar)) + self.assertTrue(type(b[0]) is unicode) b = create_unicode_buffer(u"abc") - self.failUnlessEqual(len(b), 4) # trailing nul char - self.failUnlessEqual(sizeof(b), 4 * sizeof(c_wchar)) - self.failUnless(type(b[0]) is unicode) - self.failUnlessEqual(b[0], u"a") - self.failUnlessEqual(b[:], "abc\0") - self.failUnlessEqual(b[::], "abc\0") - self.failUnlessEqual(b[::-1], "\0cba") - self.failUnlessEqual(b[::2], "ac") - self.failUnlessEqual(b[::5], "a") + self.assertEqual(len(b), 4) # trailing nul char + self.assertEqual(sizeof(b), 4 * sizeof(c_wchar)) + self.assertTrue(type(b[0]) is unicode) + self.assertEqual(b[0], u"a") + self.assertEqual(b[:], "abc\0") + self.assertEqual(b[::], "abc\0") + self.assertEqual(b[::-1], "\0cba") + self.assertEqual(b[::2], "ac") + self.assertEqual(b[::5], "a") def test_unicode_conversion(self): b = create_unicode_buffer("abc") - self.failUnlessEqual(len(b), 4) # trailing nul char - self.failUnlessEqual(sizeof(b), 4 * sizeof(c_wchar)) - self.failUnless(type(b[0]) is unicode) - self.failUnlessEqual(b[0], u"a") - self.failUnlessEqual(b[:], "abc\0") - self.failUnlessEqual(b[::], "abc\0") - self.failUnlessEqual(b[::-1], "\0cba") - self.failUnlessEqual(b[::2], "ac") - self.failUnlessEqual(b[::5], "a") + self.assertEqual(len(b), 4) # trailing nul char + self.assertEqual(sizeof(b), 4 * sizeof(c_wchar)) + self.assertTrue(type(b[0]) is unicode) + self.assertEqual(b[0], u"a") + self.assertEqual(b[:], "abc\0") + self.assertEqual(b[::], "abc\0") + self.assertEqual(b[::-1], "\0cba") + self.assertEqual(b[::2], "ac") + self.assertEqual(b[::5], "a") if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_byteswap.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_byteswap.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_byteswap.py Wed Aug 5 15:32:47 2009 @@ -23,131 +23,131 @@ def test_endian_short(self): if sys.byteorder == "little": - self.failUnless(c_short.__ctype_le__ is c_short) - self.failUnless(c_short.__ctype_be__.__ctype_le__ is c_short) + self.assertTrue(c_short.__ctype_le__ is c_short) + self.assertTrue(c_short.__ctype_be__.__ctype_le__ is c_short) else: - self.failUnless(c_short.__ctype_be__ is c_short) - self.failUnless(c_short.__ctype_le__.__ctype_be__ is c_short) + self.assertTrue(c_short.__ctype_be__ is c_short) + self.assertTrue(c_short.__ctype_le__.__ctype_be__ is c_short) s = c_short.__ctype_be__(0x1234) - self.failUnlessEqual(bin(struct.pack(">h", 0x1234)), "1234") - self.failUnlessEqual(bin(s), "1234") - self.failUnlessEqual(s.value, 0x1234) + self.assertEqual(bin(struct.pack(">h", 0x1234)), "1234") + self.assertEqual(bin(s), "1234") + self.assertEqual(s.value, 0x1234) s = c_short.__ctype_le__(0x1234) - self.failUnlessEqual(bin(struct.pack("h", 0x1234)), "1234") - self.failUnlessEqual(bin(s), "1234") - self.failUnlessEqual(s.value, 0x1234) + self.assertEqual(bin(struct.pack(">h", 0x1234)), "1234") + self.assertEqual(bin(s), "1234") + self.assertEqual(s.value, 0x1234) s = c_ushort.__ctype_le__(0x1234) - self.failUnlessEqual(bin(struct.pack("i", 0x12345678)), "12345678") - self.failUnlessEqual(bin(s), "12345678") - self.failUnlessEqual(s.value, 0x12345678) + self.assertEqual(bin(struct.pack(">i", 0x12345678)), "12345678") + self.assertEqual(bin(s), "12345678") + self.assertEqual(s.value, 0x12345678) s = c_int.__ctype_le__(0x12345678) - self.failUnlessEqual(bin(struct.pack("I", 0x12345678)), "12345678") - self.failUnlessEqual(bin(s), "12345678") - self.failUnlessEqual(s.value, 0x12345678) + self.assertEqual(bin(struct.pack(">I", 0x12345678)), "12345678") + self.assertEqual(bin(s), "12345678") + self.assertEqual(s.value, 0x12345678) s = c_uint.__ctype_le__(0x12345678) - self.failUnlessEqual(bin(struct.pack("q", 0x1234567890ABCDEF)), "1234567890ABCDEF") - self.failUnlessEqual(bin(s), "1234567890ABCDEF") - self.failUnlessEqual(s.value, 0x1234567890ABCDEF) + self.assertEqual(bin(struct.pack(">q", 0x1234567890ABCDEF)), "1234567890ABCDEF") + self.assertEqual(bin(s), "1234567890ABCDEF") + self.assertEqual(s.value, 0x1234567890ABCDEF) s = c_longlong.__ctype_le__(0x1234567890ABCDEF) - self.failUnlessEqual(bin(struct.pack("Q", 0x1234567890ABCDEF)), "1234567890ABCDEF") - self.failUnlessEqual(bin(s), "1234567890ABCDEF") - self.failUnlessEqual(s.value, 0x1234567890ABCDEF) + self.assertEqual(bin(struct.pack(">Q", 0x1234567890ABCDEF)), "1234567890ABCDEF") + self.assertEqual(bin(s), "1234567890ABCDEF") + self.assertEqual(s.value, 0x1234567890ABCDEF) s = c_ulonglong.__ctype_le__(0x1234567890ABCDEF) - self.failUnlessEqual(bin(struct.pack("f", math.pi)), bin(s)) + self.assertAlmostEqual(s.value, math.pi, 6) + self.assertEqual(bin(struct.pack(">f", math.pi)), bin(s)) def test_endian_double(self): if sys.byteorder == "little": - self.failUnless(c_double.__ctype_le__ is c_double) - self.failUnless(c_double.__ctype_be__.__ctype_le__ is c_double) + self.assertTrue(c_double.__ctype_le__ is c_double) + self.assertTrue(c_double.__ctype_be__.__ctype_le__ is c_double) else: - self.failUnless(c_double.__ctype_be__ is c_double) - self.failUnless(c_double.__ctype_le__.__ctype_be__ is c_double) + self.assertTrue(c_double.__ctype_be__ is c_double) + self.assertTrue(c_double.__ctype_le__.__ctype_be__ is c_double) s = c_double(math.pi) - self.failUnlessEqual(s.value, math.pi) - self.failUnlessEqual(bin(struct.pack("d", math.pi)), bin(s)) + self.assertEqual(s.value, math.pi) + self.assertEqual(bin(struct.pack("d", math.pi)), bin(s)) s = c_double.__ctype_le__(math.pi) - self.failUnlessEqual(s.value, math.pi) - self.failUnlessEqual(bin(struct.pack("d", math.pi)), bin(s)) + self.assertEqual(s.value, math.pi) + self.assertEqual(bin(struct.pack(">d", math.pi)), bin(s)) def test_endian_other(self): - self.failUnless(c_byte.__ctype_le__ is c_byte) - self.failUnless(c_byte.__ctype_be__ is c_byte) + self.assertTrue(c_byte.__ctype_le__ is c_byte) + self.assertTrue(c_byte.__ctype_be__ is c_byte) - self.failUnless(c_ubyte.__ctype_le__ is c_ubyte) - self.failUnless(c_ubyte.__ctype_be__ is c_ubyte) + self.assertTrue(c_ubyte.__ctype_le__ is c_ubyte) + self.assertTrue(c_ubyte.__ctype_be__ is c_ubyte) - self.failUnless(c_char.__ctype_le__ is c_char) - self.failUnless(c_char.__ctype_be__ is c_char) + self.assertTrue(c_char.__ctype_le__ is c_char) + self.assertTrue(c_char.__ctype_be__ is c_char) def test_struct_fields_1(self): if sys.byteorder == "little": @@ -219,7 +219,7 @@ s1 = S(0x12, 0x1234, 0x12345678, 3.14) s2 = struct.pack(fmt, 0x12, 0x1234, 0x12345678, 3.14) - self.failUnlessEqual(bin(s1), bin(s2)) + self.assertEqual(bin(s1), bin(s2)) def test_unaligned_nonnative_struct_fields(self): if sys.byteorder == "little": @@ -247,7 +247,7 @@ s1.i = 0x12345678 s1.d = 3.14 s2 = struct.pack(fmt, 0x12, 0x1234, 0x12345678, 3.14) - self.failUnlessEqual(bin(s1), bin(s2)) + self.assertEqual(bin(s1), bin(s2)) def test_unaligned_native_struct_fields(self): if sys.byteorder == "little": @@ -274,7 +274,7 @@ s1.i = 0x12345678 s1.d = 3.14 s2 = struct.pack(fmt, 0x12, 0x1234, 0x12345678, 3.14) - self.failUnlessEqual(bin(s1), bin(s2)) + self.assertEqual(bin(s1), bin(s2)) if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_callbacks.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_callbacks.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_callbacks.py Wed Aug 5 15:32:47 2009 @@ -17,18 +17,18 @@ PROTO = self.functype.im_func(typ, typ) result = PROTO(self.callback)(arg) if typ == c_float: - self.failUnlessAlmostEqual(result, arg, places=5) + self.assertAlmostEqual(result, arg, places=5) else: - self.failUnlessEqual(self.got_args, (arg,)) - self.failUnlessEqual(result, arg) + self.assertEqual(self.got_args, (arg,)) + self.assertEqual(result, arg) PROTO = self.functype.im_func(typ, c_byte, typ) result = PROTO(self.callback)(-3, arg) if typ == c_float: - self.failUnlessAlmostEqual(result, arg, places=5) + self.assertAlmostEqual(result, arg, places=5) else: - self.failUnlessEqual(self.got_args, (-3, arg)) - self.failUnlessEqual(result, arg) + self.assertEqual(self.got_args, (-3, arg)) + self.assertEqual(result, arg) ################ @@ -103,7 +103,7 @@ # ...but this call doesn't leak any more. Where is the refcount? self.check_type(py_object, o) after = grc(o) - self.failUnlessEqual((after, o), (before, o)) + self.assertEqual((after, o), (before, o)) def test_unsupported_restype_1(self): # Only "fundamental" result types are supported for callback @@ -148,7 +148,7 @@ result = integrate(0.0, 1.0, CALLBACK(func), 10) diff = abs(result - 1./3.) - self.failUnless(diff < 0.01, "%s not less than 0.01" % diff) + self.assertTrue(diff < 0.01, "%s not less than 0.01" % diff) ################################################################ Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_cast.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_cast.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_cast.py Wed Aug 5 15:32:47 2009 @@ -9,15 +9,15 @@ # casting an array to a pointer works. ptr = cast(array, POINTER(c_int)) - self.failUnlessEqual([ptr[i] for i in range(3)], [42, 17, 2]) + self.assertEqual([ptr[i] for i in range(3)], [42, 17, 2]) if 2*sizeof(c_short) == sizeof(c_int): ptr = cast(array, POINTER(c_short)) if sys.byteorder == "little": - self.failUnlessEqual([ptr[i] for i in range(6)], + self.assertEqual([ptr[i] for i in range(6)], [42, 0, 17, 0, 2, 0]) else: - self.failUnlessEqual([ptr[i] for i in range(6)], + self.assertEqual([ptr[i] for i in range(6)], [0, 42, 0, 17, 0, 2]) def test_address2pointer(self): @@ -25,54 +25,54 @@ address = addressof(array) ptr = cast(c_void_p(address), POINTER(c_int)) - self.failUnlessEqual([ptr[i] for i in range(3)], [42, 17, 2]) + self.assertEqual([ptr[i] for i in range(3)], [42, 17, 2]) ptr = cast(address, POINTER(c_int)) - self.failUnlessEqual([ptr[i] for i in range(3)], [42, 17, 2]) + self.assertEqual([ptr[i] for i in range(3)], [42, 17, 2]) def test_p2a_objects(self): array = (c_char_p * 5)() - self.failUnlessEqual(array._objects, None) + self.assertEqual(array._objects, None) array[0] = "foo bar" - self.failUnlessEqual(array._objects, {'0': "foo bar"}) + self.assertEqual(array._objects, {'0': "foo bar"}) p = cast(array, POINTER(c_char_p)) # array and p share a common _objects attribute - self.failUnless(p._objects is array._objects) - self.failUnlessEqual(array._objects, {'0': "foo bar", id(array): array}) + self.assertTrue(p._objects is array._objects) + self.assertEqual(array._objects, {'0': "foo bar", id(array): array}) p[0] = "spam spam" - self.failUnlessEqual(p._objects, {'0': "spam spam", id(array): array}) - self.failUnless(array._objects is p._objects) + self.assertEqual(p._objects, {'0': "spam spam", id(array): array}) + self.assertTrue(array._objects is p._objects) p[1] = "foo bar" - self.failUnlessEqual(p._objects, {'1': 'foo bar', '0': "spam spam", id(array): array}) - self.failUnless(array._objects is p._objects) + self.assertEqual(p._objects, {'1': 'foo bar', '0': "spam spam", id(array): array}) + self.assertTrue(array._objects is p._objects) def test_other(self): p = cast((c_int * 4)(1, 2, 3, 4), POINTER(c_int)) - self.failUnlessEqual(p[:4], [1,2, 3, 4]) - self.failUnlessEqual(p[:4:], [1, 2, 3, 4]) - self.failUnlessEqual(p[3:-1:-1], [4, 3, 2, 1]) - self.failUnlessEqual(p[:4:3], [1, 4]) + self.assertEqual(p[:4], [1,2, 3, 4]) + self.assertEqual(p[:4:], [1, 2, 3, 4]) + self.assertEqual(p[3:-1:-1], [4, 3, 2, 1]) + self.assertEqual(p[:4:3], [1, 4]) c_int() - self.failUnlessEqual(p[:4], [1, 2, 3, 4]) - self.failUnlessEqual(p[:4:], [1, 2, 3, 4]) - self.failUnlessEqual(p[3:-1:-1], [4, 3, 2, 1]) - self.failUnlessEqual(p[:4:3], [1, 4]) + self.assertEqual(p[:4], [1, 2, 3, 4]) + self.assertEqual(p[:4:], [1, 2, 3, 4]) + self.assertEqual(p[3:-1:-1], [4, 3, 2, 1]) + self.assertEqual(p[:4:3], [1, 4]) p[2] = 96 - self.failUnlessEqual(p[:4], [1, 2, 96, 4]) - self.failUnlessEqual(p[:4:], [1, 2, 96, 4]) - self.failUnlessEqual(p[3:-1:-1], [4, 96, 2, 1]) - self.failUnlessEqual(p[:4:3], [1, 4]) + self.assertEqual(p[:4], [1, 2, 96, 4]) + self.assertEqual(p[:4:], [1, 2, 96, 4]) + self.assertEqual(p[3:-1:-1], [4, 96, 2, 1]) + self.assertEqual(p[:4:3], [1, 4]) c_int() - self.failUnlessEqual(p[:4], [1, 2, 96, 4]) - self.failUnlessEqual(p[:4:], [1, 2, 96, 4]) - self.failUnlessEqual(p[3:-1:-1], [4, 96, 2, 1]) - self.failUnlessEqual(p[:4:3], [1, 4]) + self.assertEqual(p[:4], [1, 2, 96, 4]) + self.assertEqual(p[:4:], [1, 2, 96, 4]) + self.assertEqual(p[3:-1:-1], [4, 96, 2, 1]) + self.assertEqual(p[:4:3], [1, 4]) def test_char_p(self): # This didn't work: bad argument to internal function s = c_char_p("hiho") - self.failUnlessEqual(cast(cast(s, c_void_p), c_char_p).value, + self.assertEqual(cast(cast(s, c_void_p), c_char_p).value, "hiho") try: @@ -82,7 +82,7 @@ else: def test_wchar_p(self): s = c_wchar_p("hiho") - self.failUnlessEqual(cast(cast(s, c_void_p), c_wchar_p).value, + self.assertEqual(cast(cast(s, c_void_p), c_wchar_p).value, "hiho") if __name__ == "__main__": Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_cfuncs.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_cfuncs.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_cfuncs.py Wed Aug 5 15:32:47 2009 @@ -17,176 +17,176 @@ def test_byte(self): self._dll.tf_b.restype = c_byte self._dll.tf_b.argtypes = (c_byte,) - self.failUnlessEqual(self._dll.tf_b(-126), -42) - self.failUnlessEqual(self.S(), -126) + self.assertEqual(self._dll.tf_b(-126), -42) + self.assertEqual(self.S(), -126) def test_byte_plus(self): self._dll.tf_bb.restype = c_byte self._dll.tf_bb.argtypes = (c_byte, c_byte) - self.failUnlessEqual(self._dll.tf_bb(0, -126), -42) - self.failUnlessEqual(self.S(), -126) + self.assertEqual(self._dll.tf_bb(0, -126), -42) + self.assertEqual(self.S(), -126) def test_ubyte(self): self._dll.tf_B.restype = c_ubyte self._dll.tf_B.argtypes = (c_ubyte,) - self.failUnlessEqual(self._dll.tf_B(255), 85) - self.failUnlessEqual(self.U(), 255) + self.assertEqual(self._dll.tf_B(255), 85) + self.assertEqual(self.U(), 255) def test_ubyte_plus(self): self._dll.tf_bB.restype = c_ubyte self._dll.tf_bB.argtypes = (c_byte, c_ubyte) - self.failUnlessEqual(self._dll.tf_bB(0, 255), 85) - self.failUnlessEqual(self.U(), 255) + self.assertEqual(self._dll.tf_bB(0, 255), 85) + self.assertEqual(self.U(), 255) def test_short(self): self._dll.tf_h.restype = c_short self._dll.tf_h.argtypes = (c_short,) - self.failUnlessEqual(self._dll.tf_h(-32766), -10922) - self.failUnlessEqual(self.S(), -32766) + self.assertEqual(self._dll.tf_h(-32766), -10922) + self.assertEqual(self.S(), -32766) def test_short_plus(self): self._dll.tf_bh.restype = c_short self._dll.tf_bh.argtypes = (c_byte, c_short) - self.failUnlessEqual(self._dll.tf_bh(0, -32766), -10922) - self.failUnlessEqual(self.S(), -32766) + self.assertEqual(self._dll.tf_bh(0, -32766), -10922) + self.assertEqual(self.S(), -32766) def test_ushort(self): self._dll.tf_H.restype = c_ushort self._dll.tf_H.argtypes = (c_ushort,) - self.failUnlessEqual(self._dll.tf_H(65535), 21845) - self.failUnlessEqual(self.U(), 65535) + self.assertEqual(self._dll.tf_H(65535), 21845) + self.assertEqual(self.U(), 65535) def test_ushort_plus(self): self._dll.tf_bH.restype = c_ushort self._dll.tf_bH.argtypes = (c_byte, c_ushort) - self.failUnlessEqual(self._dll.tf_bH(0, 65535), 21845) - self.failUnlessEqual(self.U(), 65535) + self.assertEqual(self._dll.tf_bH(0, 65535), 21845) + self.assertEqual(self.U(), 65535) def test_int(self): self._dll.tf_i.restype = c_int self._dll.tf_i.argtypes = (c_int,) - self.failUnlessEqual(self._dll.tf_i(-2147483646), -715827882) - self.failUnlessEqual(self.S(), -2147483646) + self.assertEqual(self._dll.tf_i(-2147483646), -715827882) + self.assertEqual(self.S(), -2147483646) def test_int_plus(self): self._dll.tf_bi.restype = c_int self._dll.tf_bi.argtypes = (c_byte, c_int) - self.failUnlessEqual(self._dll.tf_bi(0, -2147483646), -715827882) - self.failUnlessEqual(self.S(), -2147483646) + self.assertEqual(self._dll.tf_bi(0, -2147483646), -715827882) + self.assertEqual(self.S(), -2147483646) def test_uint(self): self._dll.tf_I.restype = c_uint self._dll.tf_I.argtypes = (c_uint,) - self.failUnlessEqual(self._dll.tf_I(4294967295), 1431655765) - self.failUnlessEqual(self.U(), 4294967295) + self.assertEqual(self._dll.tf_I(4294967295), 1431655765) + self.assertEqual(self.U(), 4294967295) def test_uint_plus(self): self._dll.tf_bI.restype = c_uint self._dll.tf_bI.argtypes = (c_byte, c_uint) - self.failUnlessEqual(self._dll.tf_bI(0, 4294967295), 1431655765) - self.failUnlessEqual(self.U(), 4294967295) + self.assertEqual(self._dll.tf_bI(0, 4294967295), 1431655765) + self.assertEqual(self.U(), 4294967295) def test_long(self): self._dll.tf_l.restype = c_long self._dll.tf_l.argtypes = (c_long,) - self.failUnlessEqual(self._dll.tf_l(-2147483646), -715827882) - self.failUnlessEqual(self.S(), -2147483646) + self.assertEqual(self._dll.tf_l(-2147483646), -715827882) + self.assertEqual(self.S(), -2147483646) def test_long_plus(self): self._dll.tf_bl.restype = c_long self._dll.tf_bl.argtypes = (c_byte, c_long) - self.failUnlessEqual(self._dll.tf_bl(0, -2147483646), -715827882) - self.failUnlessEqual(self.S(), -2147483646) + self.assertEqual(self._dll.tf_bl(0, -2147483646), -715827882) + self.assertEqual(self.S(), -2147483646) def test_ulong(self): self._dll.tf_L.restype = c_ulong self._dll.tf_L.argtypes = (c_ulong,) - self.failUnlessEqual(self._dll.tf_L(4294967295), 1431655765) - self.failUnlessEqual(self.U(), 4294967295) + self.assertEqual(self._dll.tf_L(4294967295), 1431655765) + self.assertEqual(self.U(), 4294967295) def test_ulong_plus(self): self._dll.tf_bL.restype = c_ulong self._dll.tf_bL.argtypes = (c_char, c_ulong) - self.failUnlessEqual(self._dll.tf_bL(' ', 4294967295), 1431655765) - self.failUnlessEqual(self.U(), 4294967295) + self.assertEqual(self._dll.tf_bL(' ', 4294967295), 1431655765) + self.assertEqual(self.U(), 4294967295) def test_longlong(self): self._dll.tf_q.restype = c_longlong self._dll.tf_q.argtypes = (c_longlong, ) - self.failUnlessEqual(self._dll.tf_q(-9223372036854775806), -3074457345618258602) - self.failUnlessEqual(self.S(), -9223372036854775806) + self.assertEqual(self._dll.tf_q(-9223372036854775806), -3074457345618258602) + self.assertEqual(self.S(), -9223372036854775806) def test_longlong_plus(self): self._dll.tf_bq.restype = c_longlong self._dll.tf_bq.argtypes = (c_byte, c_longlong) - self.failUnlessEqual(self._dll.tf_bq(0, -9223372036854775806), -3074457345618258602) - self.failUnlessEqual(self.S(), -9223372036854775806) + self.assertEqual(self._dll.tf_bq(0, -9223372036854775806), -3074457345618258602) + self.assertEqual(self.S(), -9223372036854775806) def test_ulonglong(self): self._dll.tf_Q.restype = c_ulonglong self._dll.tf_Q.argtypes = (c_ulonglong, ) - self.failUnlessEqual(self._dll.tf_Q(18446744073709551615), 6148914691236517205) - self.failUnlessEqual(self.U(), 18446744073709551615) + self.assertEqual(self._dll.tf_Q(18446744073709551615), 6148914691236517205) + self.assertEqual(self.U(), 18446744073709551615) def test_ulonglong_plus(self): self._dll.tf_bQ.restype = c_ulonglong self._dll.tf_bQ.argtypes = (c_byte, c_ulonglong) - self.failUnlessEqual(self._dll.tf_bQ(0, 18446744073709551615), 6148914691236517205) - self.failUnlessEqual(self.U(), 18446744073709551615) + self.assertEqual(self._dll.tf_bQ(0, 18446744073709551615), 6148914691236517205) + self.assertEqual(self.U(), 18446744073709551615) def test_float(self): self._dll.tf_f.restype = c_float self._dll.tf_f.argtypes = (c_float,) - self.failUnlessEqual(self._dll.tf_f(-42.), -14.) - self.failUnlessEqual(self.S(), -42) + self.assertEqual(self._dll.tf_f(-42.), -14.) + self.assertEqual(self.S(), -42) def test_float_plus(self): self._dll.tf_bf.restype = c_float self._dll.tf_bf.argtypes = (c_byte, c_float) - self.failUnlessEqual(self._dll.tf_bf(0, -42.), -14.) - self.failUnlessEqual(self.S(), -42) + self.assertEqual(self._dll.tf_bf(0, -42.), -14.) + self.assertEqual(self.S(), -42) def test_double(self): self._dll.tf_d.restype = c_double self._dll.tf_d.argtypes = (c_double,) - self.failUnlessEqual(self._dll.tf_d(42.), 14.) - self.failUnlessEqual(self.S(), 42) + self.assertEqual(self._dll.tf_d(42.), 14.) + self.assertEqual(self.S(), 42) def test_double_plus(self): self._dll.tf_bd.restype = c_double self._dll.tf_bd.argtypes = (c_byte, c_double) - self.failUnlessEqual(self._dll.tf_bd(0, 42.), 14.) - self.failUnlessEqual(self.S(), 42) + self.assertEqual(self._dll.tf_bd(0, 42.), 14.) + self.assertEqual(self.S(), 42) def test_longdouble(self): self._dll.tf_D.restype = c_longdouble self._dll.tf_D.argtypes = (c_longdouble,) - self.failUnlessEqual(self._dll.tf_D(42.), 14.) - self.failUnlessEqual(self.S(), 42) + self.assertEqual(self._dll.tf_D(42.), 14.) + self.assertEqual(self.S(), 42) def test_longdouble_plus(self): self._dll.tf_bD.restype = c_longdouble self._dll.tf_bD.argtypes = (c_byte, c_longdouble) - self.failUnlessEqual(self._dll.tf_bD(0, 42.), 14.) - self.failUnlessEqual(self.S(), 42) + self.assertEqual(self._dll.tf_bD(0, 42.), 14.) + self.assertEqual(self.S(), 42) def test_callwithresult(self): def process_result(result): return result * 2 self._dll.tf_i.restype = process_result self._dll.tf_i.argtypes = (c_int,) - self.failUnlessEqual(self._dll.tf_i(42), 28) - self.failUnlessEqual(self.S(), 42) - self.failUnlessEqual(self._dll.tf_i(-42), -28) - self.failUnlessEqual(self.S(), -42) + self.assertEqual(self._dll.tf_i(42), 28) + self.assertEqual(self.S(), 42) + self.assertEqual(self._dll.tf_i(-42), -28) + self.assertEqual(self.S(), -42) def test_void(self): self._dll.tv_i.restype = None self._dll.tv_i.argtypes = (c_int,) - self.failUnlessEqual(self._dll.tv_i(42), None) - self.failUnlessEqual(self.S(), 42) - self.failUnlessEqual(self._dll.tv_i(-42), None) - self.failUnlessEqual(self.S(), -42) + self.assertEqual(self._dll.tv_i(42), None) + self.assertEqual(self.S(), 42) + self.assertEqual(self._dll.tv_i(-42), None) + self.assertEqual(self.S(), -42) # The following repeates the above tests with stdcall functions (where # they are available) Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_checkretval.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_checkretval.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_checkretval.py Wed Aug 5 15:32:47 2009 @@ -14,16 +14,16 @@ import _ctypes_test dll = CDLL(_ctypes_test.__file__) - self.failUnlessEqual(42, dll._testfunc_p_p(42)) + self.assertEqual(42, dll._testfunc_p_p(42)) dll._testfunc_p_p.restype = CHECKED - self.failUnlessEqual("42", dll._testfunc_p_p(42)) + self.assertEqual("42", dll._testfunc_p_p(42)) dll._testfunc_p_p.restype = None - self.failUnlessEqual(None, dll._testfunc_p_p(42)) + self.assertEqual(None, dll._testfunc_p_p(42)) del dll._testfunc_p_p.restype - self.failUnlessEqual(42, dll._testfunc_p_p(42)) + self.assertEqual(42, dll._testfunc_p_p(42)) try: oledll @@ -31,7 +31,7 @@ pass else: def test_oledll(self): - self.failUnlessRaises(WindowsError, + self.assertRaises(WindowsError, oledll.oleaut32.CreateTypeLib2, 0, None, None) Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_errno.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_errno.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_errno.py Wed Aug 5 15:32:47 2009 @@ -15,11 +15,11 @@ libc_open.argtypes = c_char_p, c_int - self.failUnlessEqual(libc_open("", 0), -1) - self.failUnlessEqual(get_errno(), errno.ENOENT) + self.assertEqual(libc_open("", 0), -1) + self.assertEqual(get_errno(), errno.ENOENT) - self.failUnlessEqual(set_errno(32), errno.ENOENT) - self.failUnlessEqual(get_errno(), 32) + self.assertEqual(set_errno(32), errno.ENOENT) + self.assertEqual(get_errno(), 32) def _worker(): @@ -31,14 +31,14 @@ else: libc_open = libc.open libc_open.argtypes = c_char_p, c_int - self.failUnlessEqual(libc_open("", 0), -1) - self.failUnlessEqual(get_errno(), 0) + self.assertEqual(libc_open("", 0), -1) + self.assertEqual(get_errno(), 0) t = threading.Thread(target=_worker) t.start() t.join() - self.failUnlessEqual(get_errno(), 32) + self.assertEqual(get_errno(), 32) set_errno(0) if os.name == "nt": @@ -48,11 +48,11 @@ GetModuleHandle = dll.GetModuleHandleA GetModuleHandle.argtypes = [c_wchar_p] - self.failUnlessEqual(0, GetModuleHandle("foo")) - self.failUnlessEqual(get_last_error(), 126) + self.assertEqual(0, GetModuleHandle("foo")) + self.assertEqual(get_last_error(), 126) - self.failUnlessEqual(set_last_error(32), 126) - self.failUnlessEqual(get_last_error(), 32) + self.assertEqual(set_last_error(32), 126) + self.assertEqual(get_last_error(), 32) def _worker(): set_last_error(0) @@ -62,13 +62,13 @@ GetModuleHandle.argtypes = [c_wchar_p] GetModuleHandle("bar") - self.failUnlessEqual(get_last_error(), 0) + self.assertEqual(get_last_error(), 0) t = threading.Thread(target=_worker) t.start() t.join() - self.failUnlessEqual(get_last_error(), 32) + self.assertEqual(get_last_error(), 32) set_last_error(0) Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_find.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_find.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_find.py Wed Aug 5 15:32:47 2009 @@ -76,7 +76,7 @@ ## sqrt = libm.sqrt ## sqrt.argtypes = (c_double,) ## sqrt.restype = c_double -## self.failUnlessEqual(sqrt(2), math.sqrt(2)) +## self.assertEqual(sqrt(2), math.sqrt(2)) if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_frombuffer.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_frombuffer.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_frombuffer.py Wed Aug 5 15:32:47 2009 @@ -16,14 +16,14 @@ y = X.from_buffer(a) self.assertEqual(y.c_int, a[0]) - self.failIf(y.init_called) + self.assertFalse(y.init_called) self.assertEqual(x[:], a.tolist()) a[0], a[-1] = 200, -200 self.assertEqual(x[:], a.tolist()) - self.assert_(a in x._objects.values()) + self.assertTrue(a in x._objects.values()) self.assertRaises(ValueError, c_int.from_buffer, a, -1) @@ -49,7 +49,7 @@ y = X.from_buffer_copy(a) self.assertEqual(y.c_int, a[0]) - self.failIf(y.init_called) + self.assertFalse(y.init_called) self.assertEqual(x[:], range(16)) Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_funcptr.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_funcptr.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_funcptr.py Wed Aug 5 15:32:47 2009 @@ -18,10 +18,10 @@ return len(args) x = X(func) - self.failUnlessEqual(x.restype, c_int) - self.failUnlessEqual(x.argtypes, (c_int, c_int)) - self.failUnlessEqual(sizeof(x), sizeof(c_voidp)) - self.failUnlessEqual(sizeof(X), sizeof(c_voidp)) + self.assertEqual(x.restype, c_int) + self.assertEqual(x.argtypes, (c_int, c_int)) + self.assertEqual(sizeof(x), sizeof(c_voidp)) + self.assertEqual(sizeof(X), sizeof(c_voidp)) def test_first(self): StdCallback = WINFUNCTYPE(c_int, c_int, c_int) @@ -33,12 +33,12 @@ s = StdCallback(func) c = CdeclCallback(func) - self.failUnlessEqual(s(1, 2), 3) - self.failUnlessEqual(c(1, 2), 3) + self.assertEqual(s(1, 2), 3) + self.assertEqual(c(1, 2), 3) # The following no longer raises a TypeError - it is now # possible, as in C, to call cdecl functions with more parameters. #self.assertRaises(TypeError, c, 1, 2, 3) - self.failUnlessEqual(c(1, 2, 3, 4, 5, 6), 3) + self.assertEqual(c(1, 2, 3, 4, 5, 6), 3) if not WINFUNCTYPE is CFUNCTYPE and os.name != "ce": self.assertRaises(TypeError, s, 1, 2, 3) @@ -75,9 +75,9 @@ ## "lpfnWndProc", WNDPROC_2(wndproc)) # instead: - self.failUnless(WNDPROC is WNDPROC_2) + self.assertTrue(WNDPROC is WNDPROC_2) # 'wndclass.lpfnWndProc' leaks 94 references. Why? - self.failUnlessEqual(wndclass.lpfnWndProc(1, 2, 3, 4), 10) + self.assertEqual(wndclass.lpfnWndProc(1, 2, 3, 4), 10) f = wndclass.lpfnWndProc @@ -85,7 +85,7 @@ del wndclass del wndproc - self.failUnlessEqual(f(10, 11, 12, 13), 46) + self.assertEqual(f(10, 11, 12, 13), 46) def test_dllfunctions(self): @@ -97,8 +97,8 @@ strchr = lib.my_strchr strchr.restype = c_char_p strchr.argtypes = (c_char_p, c_char) - self.failUnlessEqual(strchr("abcdefghi", "b"), "bcdefghi") - self.failUnlessEqual(strchr("abcdefghi", "x"), None) + self.assertEqual(strchr("abcdefghi", "b"), "bcdefghi") + self.assertEqual(strchr("abcdefghi", "x"), None) strtok = lib.my_strtok @@ -118,10 +118,10 @@ ## b.value = s ## b = c_string(s) - self.failUnlessEqual(strtok(b, "\n"), "a") - self.failUnlessEqual(strtok(None, "\n"), "b") - self.failUnlessEqual(strtok(None, "\n"), "c") - self.failUnlessEqual(strtok(None, "\n"), None) + self.assertEqual(strtok(b, "\n"), "a") + self.assertEqual(strtok(None, "\n"), "b") + self.assertEqual(strtok(None, "\n"), "c") + self.assertEqual(strtok(None, "\n"), None) if __name__ == '__main__': unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_functions.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_functions.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_functions.py Wed Aug 5 15:32:47 2009 @@ -71,8 +71,8 @@ f = dll._testfunc_i_bhilfd f.argtypes = [c_byte, c_wchar, c_int, c_long, c_float, c_double] result = f(1, u"x", 3, 4, 5.0, 6.0) - self.failUnlessEqual(result, 139) - self.failUnlessEqual(type(result), int) + self.assertEqual(result, 139) + self.assertEqual(type(result), int) def test_wchar_result(self): try: @@ -83,38 +83,38 @@ f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_double] f.restype = c_wchar result = f(0, 0, 0, 0, 0, 0) - self.failUnlessEqual(result, u'\x00') + self.assertEqual(result, u'\x00') def test_voidresult(self): f = dll._testfunc_v f.restype = None f.argtypes = [c_int, c_int, POINTER(c_int)] result = c_int() - self.failUnlessEqual(None, f(1, 2, byref(result))) - self.failUnlessEqual(result.value, 3) + self.assertEqual(None, f(1, 2, byref(result))) + self.assertEqual(result.value, 3) def test_intresult(self): f = dll._testfunc_i_bhilfd f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_double] f.restype = c_int result = f(1, 2, 3, 4, 5.0, 6.0) - self.failUnlessEqual(result, 21) - self.failUnlessEqual(type(result), int) + self.assertEqual(result, 21) + self.assertEqual(type(result), int) result = f(-1, -2, -3, -4, -5.0, -6.0) - self.failUnlessEqual(result, -21) - self.failUnlessEqual(type(result), int) + self.assertEqual(result, -21) + self.assertEqual(type(result), int) # If we declare the function to return a short, # is the high part split off? f.restype = c_short result = f(1, 2, 3, 4, 5.0, 6.0) - self.failUnlessEqual(result, 21) - self.failUnlessEqual(type(result), int) + self.assertEqual(result, 21) + self.assertEqual(type(result), int) result = f(1, 2, 3, 0x10004, 5.0, 6.0) - self.failUnlessEqual(result, 21) - self.failUnlessEqual(type(result), int) + self.assertEqual(result, 21) + self.assertEqual(type(result), int) # You cannot assing character format codes as restype any longer self.assertRaises(TypeError, setattr, f, "restype", "i") @@ -124,36 +124,36 @@ f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_double] f.restype = c_float result = f(1, 2, 3, 4, 5.0, 6.0) - self.failUnlessEqual(result, 21) - self.failUnlessEqual(type(result), float) + self.assertEqual(result, 21) + self.assertEqual(type(result), float) result = f(-1, -2, -3, -4, -5.0, -6.0) - self.failUnlessEqual(result, -21) - self.failUnlessEqual(type(result), float) + self.assertEqual(result, -21) + self.assertEqual(type(result), float) def test_doubleresult(self): f = dll._testfunc_d_bhilfd f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_double] f.restype = c_double result = f(1, 2, 3, 4, 5.0, 6.0) - self.failUnlessEqual(result, 21) - self.failUnlessEqual(type(result), float) + self.assertEqual(result, 21) + self.assertEqual(type(result), float) result = f(-1, -2, -3, -4, -5.0, -6.0) - self.failUnlessEqual(result, -21) - self.failUnlessEqual(type(result), float) + self.assertEqual(result, -21) + self.assertEqual(type(result), float) def test_longdoubleresult(self): f = dll._testfunc_D_bhilfD f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_longdouble] f.restype = c_longdouble result = f(1, 2, 3, 4, 5.0, 6.0) - self.failUnlessEqual(result, 21) - self.failUnlessEqual(type(result), float) + self.assertEqual(result, 21) + self.assertEqual(type(result), float) result = f(-1, -2, -3, -4, -5.0, -6.0) - self.failUnlessEqual(result, -21) - self.failUnlessEqual(type(result), float) + self.assertEqual(result, -21) + self.assertEqual(type(result), float) def test_longlongresult(self): try: @@ -164,23 +164,23 @@ f.restype = c_longlong f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_double] result = f(1, 2, 3, 4, 5.0, 6.0) - self.failUnlessEqual(result, 21) + self.assertEqual(result, 21) f = dll._testfunc_q_bhilfdq f.restype = c_longlong f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_double, c_longlong] result = f(1, 2, 3, 4, 5.0, 6.0, 21) - self.failUnlessEqual(result, 42) + self.assertEqual(result, 42) def test_stringresult(self): f = dll._testfunc_p_p f.argtypes = None f.restype = c_char_p result = f("123") - self.failUnlessEqual(result, "123") + self.assertEqual(result, "123") result = f(None) - self.failUnlessEqual(result, None) + self.assertEqual(result, None) def test_pointers(self): f = dll._testfunc_p_p @@ -193,29 +193,29 @@ v = c_int(42) - self.failUnlessEqual(pointer(v).contents.value, 42) + self.assertEqual(pointer(v).contents.value, 42) result = f(pointer(v)) - self.failUnlessEqual(type(result), POINTER(c_int)) - self.failUnlessEqual(result.contents.value, 42) + self.assertEqual(type(result), POINTER(c_int)) + self.assertEqual(result.contents.value, 42) # This on works... result = f(pointer(v)) - self.failUnlessEqual(result.contents.value, v.value) + self.assertEqual(result.contents.value, v.value) p = pointer(c_int(99)) result = f(p) - self.failUnlessEqual(result.contents.value, 99) + self.assertEqual(result.contents.value, 99) arg = byref(v) result = f(arg) - self.failIfEqual(result.contents, v.value) + self.assertNotEqual(result.contents, v.value) self.assertRaises(ArgumentError, f, byref(c_short(22))) # It is dangerous, however, because you don't control the lifetime # of the pointer: result = f(byref(c_int(99))) - self.failIfEqual(result.contents, 99) + self.assertNotEqual(result.contents, 99) def test_errors(self): f = dll._testfunc_p_p @@ -242,7 +242,7 @@ cb = CallBack(callback) f(2**18, cb) - self.failUnlessEqual(args, expected) + self.assertEqual(args, expected) ################################################################ @@ -259,13 +259,13 @@ cb = MyCallback(callback) result = f(-10, cb) - self.failUnlessEqual(result, -18) + self.assertEqual(result, -18) # test with prototype f.argtypes = [c_int, MyCallback] cb = MyCallback(callback) result = f(-10, cb) - self.failUnlessEqual(result, -18) + self.assertEqual(result, -18) AnotherCallback = WINFUNCTYPE(c_int, c_int, c_int, c_int, c_int) @@ -288,12 +288,12 @@ def callback(value): #print "called back with", value - self.failUnlessEqual(type(value), int) + self.assertEqual(type(value), int) return value cb = MyCallback(callback) result = f(-10, cb) - self.failUnlessEqual(result, -18) + self.assertEqual(result, -18) def test_longlong_callbacks(self): @@ -305,12 +305,12 @@ f.argtypes = [c_longlong, MyCallback] def callback(value): - self.failUnless(isinstance(value, (int, long))) + self.assertTrue(isinstance(value, (int, long))) return value & 0x7FFFFFFF cb = MyCallback(callback) - self.failUnlessEqual(13577625587, f(1000000000000, cb)) + self.assertEqual(13577625587, f(1000000000000, cb)) def test_errors(self): self.assertRaises(AttributeError, getattr, dll, "_xxx_yyy") @@ -325,7 +325,7 @@ result = dll._testfunc_byval(ptin, byref(ptout)) got = result, ptout.x, ptout.y expected = 3, 1, 2 - self.failUnlessEqual(got, expected) + self.assertEqual(got, expected) # with prototype ptin = POINT(101, 102) @@ -335,7 +335,7 @@ result = dll._testfunc_byval(ptin, byref(ptout)) got = result, ptout.x, ptout.y expected = 203, 101, 102 - self.failUnlessEqual(got, expected) + self.assertEqual(got, expected) def test_struct_return_2H(self): class S2H(Structure): @@ -345,7 +345,7 @@ dll.ret_2h_func.argtypes = [S2H] inp = S2H(99, 88) s2h = dll.ret_2h_func(inp) - self.failUnlessEqual((s2h.x, s2h.y), (99*2, 88*3)) + self.assertEqual((s2h.x, s2h.y), (99*2, 88*3)) if sys.platform == "win32": def test_struct_return_2H_stdcall(self): @@ -356,7 +356,7 @@ windll.s_ret_2h_func.restype = S2H windll.s_ret_2h_func.argtypes = [S2H] s2h = windll.s_ret_2h_func(S2H(99, 88)) - self.failUnlessEqual((s2h.x, s2h.y), (99*2, 88*3)) + self.assertEqual((s2h.x, s2h.y), (99*2, 88*3)) def test_struct_return_8H(self): class S8I(Structure): @@ -372,7 +372,7 @@ dll.ret_8i_func.argtypes = [S8I] inp = S8I(9, 8, 7, 6, 5, 4, 3, 2) s8i = dll.ret_8i_func(inp) - self.failUnlessEqual((s8i.a, s8i.b, s8i.c, s8i.d, s8i.e, s8i.f, s8i.g, s8i.h), + self.assertEqual((s8i.a, s8i.b, s8i.c, s8i.d, s8i.e, s8i.f, s8i.g, s8i.h), (9*2, 8*3, 7*4, 6*5, 5*6, 4*7, 3*8, 2*9)) if sys.platform == "win32": @@ -390,7 +390,7 @@ windll.s_ret_8i_func.argtypes = [S8I] inp = S8I(9, 8, 7, 6, 5, 4, 3, 2) s8i = windll.s_ret_8i_func(inp) - self.failUnlessEqual((s8i.a, s8i.b, s8i.c, s8i.d, s8i.e, s8i.f, s8i.g, s8i.h), + self.assertEqual((s8i.a, s8i.b, s8i.c, s8i.d, s8i.e, s8i.f, s8i.g, s8i.h), (9*2, 8*3, 7*4, 6*5, 5*6, 4*7, 3*8, 2*9)) def test_sf1651235(self): @@ -401,7 +401,7 @@ return 0 callback = proto(callback) - self.failUnlessRaises(ArgumentError, lambda: callback((1, 2, 3, 4), POINT())) + self.assertRaises(ArgumentError, lambda: callback((1, 2, 3, 4), POINT())) if __name__ == '__main__': unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_incomplete.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_incomplete.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_incomplete.py Wed Aug 5 15:32:47 2009 @@ -30,7 +30,7 @@ for i in range(8): result.append(p.name) p = p.next[0] - self.failUnlessEqual(result, ["foo", "bar"] * 4) + self.assertEqual(result, ["foo", "bar"] * 4) # to not leak references, we must clean _pointer_type_cache from ctypes import _pointer_type_cache Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_init.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_init.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_init.py Wed Aug 5 15:32:47 2009 @@ -24,17 +24,17 @@ # make sure the only accessing a nested structure # doesn't call the structure's __new__ and __init__ y = Y() - self.failUnlessEqual((y.x.a, y.x.b), (0, 0)) - self.failUnlessEqual(y.x.new_was_called, False) + self.assertEqual((y.x.a, y.x.b), (0, 0)) + self.assertEqual(y.x.new_was_called, False) # But explicitely creating an X structure calls __new__ and __init__, of course. x = X() - self.failUnlessEqual((x.a, x.b), (9, 12)) - self.failUnlessEqual(x.new_was_called, True) + self.assertEqual((x.a, x.b), (9, 12)) + self.assertEqual(x.new_was_called, True) y.x = x - self.failUnlessEqual((y.x.a, y.x.b), (9, 12)) - self.failUnlessEqual(y.x.new_was_called, False) + self.assertEqual((y.x.a, y.x.b), (9, 12)) + self.assertEqual(y.x.new_was_called, False) if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_internals.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_internals.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_internals.py Wed Aug 5 15:32:47 2009 @@ -18,22 +18,22 @@ """ class ObjectsTestCase(unittest.TestCase): - def failUnlessSame(self, a, b): - self.failUnlessEqual(id(a), id(b)) + def assertSame(self, a, b): + self.assertEqual(id(a), id(b)) def test_ints(self): i = 42000123 - self.failUnlessEqual(3, grc(i)) + self.assertEqual(3, grc(i)) ci = c_int(i) - self.failUnlessEqual(3, grc(i)) - self.failUnlessEqual(ci._objects, None) + self.assertEqual(3, grc(i)) + self.assertEqual(ci._objects, None) def test_c_char_p(self): s = "Hello, World" - self.failUnlessEqual(3, grc(s)) + self.assertEqual(3, grc(s)) cs = c_char_p(s) - self.failUnlessEqual(4, grc(s)) - self.failUnlessSame(cs._objects, s) + self.assertEqual(4, grc(s)) + self.assertSame(cs._objects, s) def test_simple_struct(self): class X(Structure): @@ -42,10 +42,10 @@ a = 421234 b = 421235 x = X() - self.failUnlessEqual(x._objects, None) + self.assertEqual(x._objects, None) x.a = a x.b = b - self.failUnlessEqual(x._objects, None) + self.assertEqual(x._objects, None) def test_embedded_structs(self): class X(Structure): @@ -55,13 +55,13 @@ _fields_ = [("x", X), ("y", X)] y = Y() - self.failUnlessEqual(y._objects, None) + self.assertEqual(y._objects, None) x1, x2 = X(), X() y.x, y.y = x1, x2 - self.failUnlessEqual(y._objects, {"0": {}, "1": {}}) + self.assertEqual(y._objects, {"0": {}, "1": {}}) x1.a, x2.b = 42, 93 - self.failUnlessEqual(y._objects, {"0": {}, "1": {}}) + self.assertEqual(y._objects, {"0": {}, "1": {}}) def test_xxx(self): class X(Structure): @@ -76,11 +76,11 @@ x = X() x.a = s1 x.b = s2 - self.failUnlessEqual(x._objects, {"0": s1, "1": s2}) + self.assertEqual(x._objects, {"0": s1, "1": s2}) y = Y() y.x = x - self.failUnlessEqual(y._objects, {"0": {"0": s1, "1": s2}}) + self.assertEqual(y._objects, {"0": {"0": s1, "1": s2}}) ## x = y.x ## del y ## print x._b_base_._objects @@ -91,7 +91,7 @@ A = c_int*4 a = A(11, 22, 33, 44) - self.failUnlessEqual(a._objects, None) + self.assertEqual(a._objects, None) x = X() x.data = a Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_keeprefs.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_keeprefs.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_keeprefs.py Wed Aug 5 15:32:47 2009 @@ -91,7 +91,7 @@ def test_p_cint(self): i = c_int(42) x = pointer(i) - self.failUnlessEqual(x._objects, {'1': i}) + self.assertEqual(x._objects, {'1': i}) class DeletePointerTestCase(unittest.TestCase): def X_test(self): Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_libc.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_libc.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_libc.py Wed Aug 5 15:32:47 2009 @@ -9,9 +9,9 @@ def test_sqrt(self): lib.my_sqrt.argtypes = c_double, lib.my_sqrt.restype = c_double - self.failUnlessEqual(lib.my_sqrt(4.0), 2.0) + self.assertEqual(lib.my_sqrt(4.0), 2.0) import math - self.failUnlessEqual(lib.my_sqrt(2.0), math.sqrt(2.0)) + self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0)) def test_qsort(self): comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char)) @@ -23,7 +23,7 @@ chars = create_string_buffer("spam, spam, and spam") lib.my_qsort(chars, len(chars)-1, sizeof(c_char), comparefunc(sort)) - self.failUnlessEqual(chars.raw, " ,,aaaadmmmnpppsss\x00") + self.assertEqual(chars.raw, " ,,aaaadmmmnpppsss\x00") if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_loading.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_loading.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_loading.py Wed Aug 5 15:32:47 2009 @@ -43,7 +43,7 @@ if os.name in ("nt", "ce"): def test_load_library(self): - self.failIf(libc_name is None) + self.assertFalse(libc_name is None) if is_resource_enabled("printing"): print find_library("kernel32") print find_library("user32") @@ -70,9 +70,9 @@ a_name = addressof(func_name) f_ord_addr = c_void_p.from_address(a_ord).value f_name_addr = c_void_p.from_address(a_name).value - self.failUnlessEqual(hex(f_ord_addr), hex(f_name_addr)) + self.assertEqual(hex(f_ord_addr), hex(f_name_addr)) - self.failUnlessRaises(AttributeError, dll.__getitem__, 1234) + self.assertRaises(AttributeError, dll.__getitem__, 1234) if os.name == "nt": def test_1703286_A(self): @@ -94,13 +94,13 @@ advapi32 = windll.advapi32 # Calling CloseEventLog with a NULL argument should fail, # but the call should not segfault or so. - self.failUnlessEqual(0, advapi32.CloseEventLog(None)) + self.assertEqual(0, advapi32.CloseEventLog(None)) windll.kernel32.GetProcAddress.argtypes = c_void_p, c_char_p windll.kernel32.GetProcAddress.restype = c_void_p proc = windll.kernel32.GetProcAddress(advapi32._handle, "CloseEventLog") - self.failUnless(proc) + self.assertTrue(proc) # This is the real test: call the function via 'call_function' - self.failUnlessEqual(0, call_function(proc, (None,))) + self.assertEqual(0, call_function(proc, (None,))) if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_macholib.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_macholib.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_macholib.py Wed Aug 5 15:32:47 2009 @@ -48,14 +48,14 @@ if sys.platform == "darwin": def test_find(self): - self.failUnlessEqual(find_lib('pthread'), + self.assertEqual(find_lib('pthread'), '/usr/lib/libSystem.B.dylib') result = find_lib('z') - self.failUnless(result.startswith('/usr/lib/libz.1')) - self.failUnless(result.endswith('.dylib')) + self.assertTrue(result.startswith('/usr/lib/libz.1')) + self.assertTrue(result.endswith('.dylib')) - self.failUnlessEqual(find_lib('IOKit'), + self.assertEqual(find_lib('IOKit'), '/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit') if __name__ == "__main__": Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_memfunctions.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_memfunctions.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_memfunctions.py Wed Aug 5 15:32:47 2009 @@ -19,45 +19,45 @@ a = create_string_buffer(1000000) p = "Hello, World" result = memmove(a, p, len(p)) - self.failUnlessEqual(a.value, "Hello, World") + self.assertEqual(a.value, "Hello, World") - self.failUnlessEqual(string_at(result), "Hello, World") - self.failUnlessEqual(string_at(result, 5), "Hello") - self.failUnlessEqual(string_at(result, 16), "Hello, World\0\0\0\0") - self.failUnlessEqual(string_at(result, 0), "") + self.assertEqual(string_at(result), "Hello, World") + self.assertEqual(string_at(result, 5), "Hello") + self.assertEqual(string_at(result, 16), "Hello, World\0\0\0\0") + self.assertEqual(string_at(result, 0), "") def test_memset(self): a = create_string_buffer(1000000) result = memset(a, ord('x'), 16) - self.failUnlessEqual(a.value, "xxxxxxxxxxxxxxxx") + self.assertEqual(a.value, "xxxxxxxxxxxxxxxx") - self.failUnlessEqual(string_at(result), "xxxxxxxxxxxxxxxx") - self.failUnlessEqual(string_at(a), "xxxxxxxxxxxxxxxx") - self.failUnlessEqual(string_at(a, 20), "xxxxxxxxxxxxxxxx\0\0\0\0") + self.assertEqual(string_at(result), "xxxxxxxxxxxxxxxx") + self.assertEqual(string_at(a), "xxxxxxxxxxxxxxxx") + self.assertEqual(string_at(a, 20), "xxxxxxxxxxxxxxxx\0\0\0\0") def test_cast(self): a = (c_ubyte * 32)(*map(ord, "abcdef")) - self.failUnlessEqual(cast(a, c_char_p).value, "abcdef") - self.failUnlessEqual(cast(a, POINTER(c_byte))[:7], + self.assertEqual(cast(a, c_char_p).value, "abcdef") + self.assertEqual(cast(a, POINTER(c_byte))[:7], [97, 98, 99, 100, 101, 102, 0]) - self.failUnlessEqual(cast(a, POINTER(c_byte))[:7:], + self.assertEqual(cast(a, POINTER(c_byte))[:7:], [97, 98, 99, 100, 101, 102, 0]) - self.failUnlessEqual(cast(a, POINTER(c_byte))[6:-1:-1], + self.assertEqual(cast(a, POINTER(c_byte))[6:-1:-1], [0, 102, 101, 100, 99, 98, 97]) - self.failUnlessEqual(cast(a, POINTER(c_byte))[:7:2], + self.assertEqual(cast(a, POINTER(c_byte))[:7:2], [97, 99, 101, 0]) - self.failUnlessEqual(cast(a, POINTER(c_byte))[:7:7], + self.assertEqual(cast(a, POINTER(c_byte))[:7:7], [97]) def test_string_at(self): s = string_at("foo bar") # XXX The following may be wrong, depending on how Python # manages string instances - self.failUnlessEqual(2, sys.getrefcount(s)) - self.failUnless(s, "foo bar") + self.assertEqual(2, sys.getrefcount(s)) + self.assertTrue(s, "foo bar") - self.failUnlessEqual(string_at("foo bar", 8), "foo bar\0") - self.failUnlessEqual(string_at("foo bar", 3), "foo") + self.assertEqual(string_at("foo bar", 8), "foo bar\0") + self.assertEqual(string_at("foo bar", 3), "foo") try: create_unicode_buffer @@ -68,12 +68,12 @@ p = create_unicode_buffer("Hello, World") a = create_unicode_buffer(1000000) result = memmove(a, p, len(p) * sizeof(c_wchar)) - self.failUnlessEqual(a.value, "Hello, World") + self.assertEqual(a.value, "Hello, World") - self.failUnlessEqual(wstring_at(a), "Hello, World") - self.failUnlessEqual(wstring_at(a, 5), "Hello") - self.failUnlessEqual(wstring_at(a, 16), "Hello, World\0\0\0\0") - self.failUnlessEqual(wstring_at(a, 0), "") + self.assertEqual(wstring_at(a), "Hello, World") + self.assertEqual(wstring_at(a, 5), "Hello") + self.assertEqual(wstring_at(a, 16), "Hello, World\0\0\0\0") + self.assertEqual(wstring_at(a, 0), "") if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_numbers.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_numbers.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_numbers.py Wed Aug 5 15:32:47 2009 @@ -55,25 +55,25 @@ def test_default_init(self): # default values are set to zero for t in signed_types + unsigned_types + float_types: - self.failUnlessEqual(t().value, 0) + self.assertEqual(t().value, 0) def test_unsigned_values(self): # the value given to the constructor is available # as the 'value' attribute for t, (l, h) in zip(unsigned_types, unsigned_ranges): - self.failUnlessEqual(t(l).value, l) - self.failUnlessEqual(t(h).value, h) + self.assertEqual(t(l).value, l) + self.assertEqual(t(h).value, h) def test_signed_values(self): # see above for t, (l, h) in zip(signed_types, signed_ranges): - self.failUnlessEqual(t(l).value, l) - self.failUnlessEqual(t(h).value, h) + self.assertEqual(t(l).value, l) + self.assertEqual(t(h).value, h) def test_bool_values(self): from operator import truth for t, v in zip(bool_types, bool_values): - self.failUnlessEqual(t(v).value, truth(v)) + self.assertEqual(t(v).value, truth(v)) def test_typeerror(self): # Only numbers are allowed in the contructor, @@ -93,13 +93,13 @@ # the from_param class method attribute always # returns PyCArgObject instances for t in signed_types + unsigned_types + float_types: - self.failUnlessEqual(ArgType, type(t.from_param(0))) + self.assertEqual(ArgType, type(t.from_param(0))) def test_byref(self): # calling byref returns also a PyCArgObject instance for t in signed_types + unsigned_types + float_types + bool_types: parm = byref(t()) - self.failUnlessEqual(ArgType, type(parm)) + self.assertEqual(ArgType, type(parm)) def test_floats(self): @@ -110,10 +110,10 @@ return 2.0 f = FloatLike() for t in float_types: - self.failUnlessEqual(t(2.0).value, 2.0) - self.failUnlessEqual(t(2).value, 2.0) - self.failUnlessEqual(t(2L).value, 2.0) - self.failUnlessEqual(t(f).value, 2.0) + self.assertEqual(t(2.0).value, 2.0) + self.assertEqual(t(2).value, 2.0) + self.assertEqual(t(2L).value, 2.0) + self.assertEqual(t(f).value, 2.0) def test_integers(self): class FloatLike(object): @@ -129,7 +129,7 @@ for t in signed_types + unsigned_types: self.assertRaises(TypeError, t, 3.14) self.assertRaises(TypeError, t, f) - self.failUnlessEqual(t(i).value, 2) + self.assertEqual(t(i).value, 2) def test_sizes(self): for t in signed_types + unsigned_types + float_types + bool_types: @@ -138,9 +138,9 @@ except struct.error: continue # sizeof of the type... - self.failUnlessEqual(sizeof(t), size) + self.assertEqual(sizeof(t), size) # and sizeof of an instance - self.failUnlessEqual(sizeof(t()), size) + self.assertEqual(sizeof(t()), size) def test_alignments(self): for t in signed_types + unsigned_types + float_types: @@ -148,10 +148,10 @@ align = struct.calcsize("c%c" % code) - struct.calcsize(code) # alignment of the type... - self.failUnlessEqual((code, alignment(t)), + self.assertEqual((code, alignment(t)), (code, align)) # and alignment of an instance - self.failUnlessEqual((code, alignment(t())), + self.assertEqual((code, alignment(t())), (code, align)) def test_int_from_address(self): @@ -167,12 +167,12 @@ # v now is an integer at an 'external' memory location v = t.from_address(a.buffer_info()[0]) - self.failUnlessEqual(v.value, a[0]) - self.failUnlessEqual(type(v), t) + self.assertEqual(v.value, a[0]) + self.assertEqual(type(v), t) # changing the value at the memory location changes v's value also a[0] = 42 - self.failUnlessEqual(v.value, a[0]) + self.assertEqual(v.value, a[0]) def test_float_from_address(self): @@ -180,11 +180,11 @@ for t in float_types: a = array(t._type_, [3.14]) v = t.from_address(a.buffer_info()[0]) - self.failUnlessEqual(v.value, a[0]) - self.failUnless(type(v) is t) + self.assertEqual(v.value, a[0]) + self.assertTrue(type(v) is t) a[0] = 2.3456e17 - self.failUnlessEqual(v.value, a[0]) - self.failUnless(type(v) is t) + self.assertEqual(v.value, a[0]) + self.assertTrue(type(v) is t) def test_char_from_address(self): from ctypes import c_char @@ -192,11 +192,11 @@ a = array('c', 'x') v = c_char.from_address(a.buffer_info()[0]) - self.failUnlessEqual(v.value, a[0]) - self.failUnless(type(v) is c_char) + self.assertEqual(v.value, a[0]) + self.assertTrue(type(v) is c_char) a[0] = '?' - self.failUnlessEqual(v.value, a[0]) + self.assertEqual(v.value, a[0]) # array does not support c_bool / 't' # def test_bool_from_address(self): @@ -204,11 +204,11 @@ # from array import array # a = array(c_bool._type_, [True]) # v = t.from_address(a.buffer_info()[0]) - # self.failUnlessEqual(v.value, a[0]) - # self.failUnlessEqual(type(v) is t) + # self.assertEqual(v.value, a[0]) + # self.assertEqual(type(v) is t) # a[0] = False - # self.failUnlessEqual(v.value, a[0]) - # self.failUnlessEqual(type(v) is t) + # self.assertEqual(v.value, a[0]) + # self.assertEqual(type(v) is t) def test_init(self): # c_int() can be initialized from Python's int, and c_int. Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_parameters.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_parameters.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_parameters.py Wed Aug 5 15:32:47 2009 @@ -33,8 +33,8 @@ return value * 4 from_param = classmethod(from_param) - self.failUnlessEqual(CVOIDP.from_param("abc"), "abcabc") - self.failUnlessEqual(CCHARP.from_param("abc"), "abcabcabcabc") + self.assertEqual(CVOIDP.from_param("abc"), "abcabc") + self.assertEqual(CCHARP.from_param("abc"), "abcabcabcabc") try: from ctypes import c_wchar_p @@ -46,7 +46,7 @@ return value * 3 from_param = classmethod(from_param) - self.failUnlessEqual(CWCHARP.from_param("abc"), "abcabcabc") + self.assertEqual(CWCHARP.from_param("abc"), "abcabcabc") # XXX Replace by c_char_p tests def test_cstrings(self): @@ -55,10 +55,10 @@ # c_char_p.from_param on a Python String packs the string # into a cparam object s = "123" - self.failUnless(c_char_p.from_param(s)._obj is s) + self.assertTrue(c_char_p.from_param(s)._obj is s) # new in 0.9.1: convert (encode) unicode to ascii - self.failUnlessEqual(c_char_p.from_param(u"123")._obj, "123") + self.assertEqual(c_char_p.from_param(u"123")._obj, "123") self.assertRaises(UnicodeEncodeError, c_char_p.from_param, u"123\377") self.assertRaises(TypeError, c_char_p.from_param, 42) @@ -66,7 +66,7 @@ # calling c_char_p.from_param with a c_char_p instance # returns the argument itself: a = c_char_p("123") - self.failUnless(c_char_p.from_param(a) is a) + self.assertTrue(c_char_p.from_param(a) is a) def test_cw_strings(self): from ctypes import byref @@ -77,15 +77,15 @@ return s = u"123" if sys.platform == "win32": - self.failUnless(c_wchar_p.from_param(s)._obj is s) + self.assertTrue(c_wchar_p.from_param(s)._obj is s) self.assertRaises(TypeError, c_wchar_p.from_param, 42) # new in 0.9.1: convert (decode) ascii to unicode - self.failUnlessEqual(c_wchar_p.from_param("123")._obj, u"123") + self.assertEqual(c_wchar_p.from_param("123")._obj, u"123") self.assertRaises(UnicodeDecodeError, c_wchar_p.from_param, "123\377") pa = c_wchar_p.from_param(c_wchar_p(u"123")) - self.failUnlessEqual(type(pa), c_wchar_p) + self.assertEqual(type(pa), c_wchar_p) def test_int_pointers(self): from ctypes import c_short, c_uint, c_int, c_long, POINTER, pointer @@ -94,10 +94,10 @@ ## p = pointer(c_int(42)) ## x = LPINT.from_param(p) x = LPINT.from_param(pointer(c_int(42))) - self.failUnlessEqual(x.contents.value, 42) - self.failUnlessEqual(LPINT(c_int(42)).contents.value, 42) + self.assertEqual(x.contents.value, 42) + self.assertEqual(LPINT(c_int(42)).contents.value, 42) - self.failUnlessEqual(LPINT.from_param(None), 0) + self.assertEqual(LPINT.from_param(None), 0) if c_int != c_long: self.assertRaises(TypeError, LPINT.from_param, pointer(c_long(42))) @@ -133,8 +133,8 @@ from ctypes import c_short, c_uint, c_int, c_long, POINTER INTARRAY = c_int * 3 ia = INTARRAY() - self.failUnlessEqual(len(ia), 3) - self.failUnlessEqual([ia[i] for i in range(3)], [0, 0, 0]) + self.assertEqual(len(ia), 3) + self.assertEqual([ia[i] for i in range(3)], [0, 0, 0]) # Pointers are only compatible with arrays containing items of # the same type! @@ -161,8 +161,8 @@ return None func.argtypes = (Adapter(),) - self.failUnlessEqual(func(None), None) - self.failUnlessEqual(func(object()), None) + self.assertEqual(func(None), None) + self.assertEqual(func(object()), None) class Adapter(object): def from_param(cls, obj): @@ -171,7 +171,7 @@ func.argtypes = (Adapter(),) # don't know how to convert parameter 1 self.assertRaises(ArgumentError, func, object()) - self.failUnlessEqual(func(c_void_p(42)), 42) + self.assertEqual(func(c_void_p(42)), 42) class Adapter(object): def from_param(cls, obj): Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pep3118.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pep3118.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pep3118.py Wed Aug 5 15:32:47 2009 @@ -45,20 +45,20 @@ ob = tp() v = memoryview(ob) try: - self.failUnlessEqual(normalize(v.format), normalize(fmt)) - self.failUnlessEqual(v.size, sizeof(ob)) - self.failUnlessEqual(v.itemsize, sizeof(itemtp)) - self.failUnlessEqual(v.shape, shape) + self.assertEqual(normalize(v.format), normalize(fmt)) + self.assertEqual(v.size, sizeof(ob)) + self.assertEqual(v.itemsize, sizeof(itemtp)) + self.assertEqual(v.shape, shape) # ctypes object always have a non-strided memory block - self.failUnlessEqual(v.strides, None) + self.assertEqual(v.strides, None) # they are always read/write - self.failIf(v.readonly) + self.assertFalse(v.readonly) if v.shape: n = 1 for dim in v.shape: n = n * dim - self.failUnlessEqual(v.itemsize * n, v.size) + self.assertEqual(v.itemsize * n, v.size) except: # so that we can see the failing type print(tp) @@ -69,20 +69,20 @@ ob = tp() v = memoryview(ob) try: - self.failUnlessEqual(v.format, fmt) - self.failUnlessEqual(v.size, sizeof(ob)) - self.failUnlessEqual(v.itemsize, sizeof(itemtp)) - self.failUnlessEqual(v.shape, shape) + self.assertEqual(v.format, fmt) + self.assertEqual(v.size, sizeof(ob)) + self.assertEqual(v.itemsize, sizeof(itemtp)) + self.assertEqual(v.shape, shape) # ctypes object always have a non-strided memory block - self.failUnlessEqual(v.strides, None) + self.assertEqual(v.strides, None) # they are always read/write - self.failIf(v.readonly) + self.assertFalse(v.readonly) if v.shape: n = 1 for dim in v.shape: n = n * dim - self.failUnlessEqual(v.itemsize * n, v.size) + self.assertEqual(v.itemsize * n, v.size) except: # so that we can see the failing type print(tp) Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pickling.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pickling.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pickling.py Wed Aug 5 15:32:47 2009 @@ -27,8 +27,8 @@ c_double(3.14), ]: dst = self.loads(self.dumps(src)) - self.failUnlessEqual(src.__dict__, dst.__dict__) - self.failUnlessEqual(buffer(src)[:], + self.assertEqual(src.__dict__, dst.__dict__) + self.assertEqual(buffer(src)[:], buffer(dst)[:]) def test_struct(self): @@ -36,17 +36,17 @@ x = X() x.a = 42 - self.failUnlessEqual(X.init_called, 1) + self.assertEqual(X.init_called, 1) y = self.loads(self.dumps(x)) # loads must NOT call __init__ - self.failUnlessEqual(X.init_called, 1) + self.assertEqual(X.init_called, 1) # ctypes instances are identical when the instance __dict__ # and the memory buffer are identical - self.failUnlessEqual(y.__dict__, x.__dict__) - self.failUnlessEqual(buffer(y)[:], + self.assertEqual(y.__dict__, x.__dict__) + self.assertEqual(buffer(y)[:], buffer(x)[:]) def test_unpickable(self): Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pointers.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pointers.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_pointers.py Wed Aug 5 15:32:47 2009 @@ -17,7 +17,7 @@ POINTER(c_ulong)(c_ulong(22)) # Pointer can't set contents: has no _type_ - self.failUnlessRaises(TypeError, A, c_ulong(33)) + self.assertRaises(TypeError, A, c_ulong(33)) def test_pass_pointers(self): dll = CDLL(_ctypes_test.__file__) @@ -27,12 +27,12 @@ i = c_int(12345678) ## func.argtypes = (POINTER(c_int),) address = func(byref(i)) - self.failUnlessEqual(c_int.from_address(address).value, 12345678) + self.assertEqual(c_int.from_address(address).value, 12345678) func.restype = POINTER(c_int) res = func(pointer(i)) - self.failUnlessEqual(res.contents.value, 12345678) - self.failUnlessEqual(res[0], 12345678) + self.assertEqual(res.contents.value, 12345678) + self.assertEqual(res[0], 12345678) def test_change_pointers(self): dll = CDLL(_ctypes_test.__file__) @@ -43,18 +43,18 @@ func.argtypes = (POINTER(c_int),) res = func(pointer(i)) - self.failUnlessEqual(res[0], 87654) - self.failUnlessEqual(res.contents.value, 87654) + self.assertEqual(res[0], 87654) + self.assertEqual(res.contents.value, 87654) # C code: *res = 54345 res[0] = 54345 - self.failUnlessEqual(i.value, 54345) + self.assertEqual(i.value, 54345) # C code: # int x = 12321; # res = &x res.contents = c_int(12321) - self.failUnlessEqual(i.value, 54345) + self.assertEqual(i.value, 54345) def test_callbacks_with_pointers(self): # a function type receiving a pointer @@ -78,7 +78,7 @@ ## i = c_int(42) ## callback(byref(i)) -## self.failUnless(i.value == 84) +## self.assertTrue(i.value == 84) doit(callback) ## print self.result @@ -91,11 +91,11 @@ i = ct(42) p = pointer(i) ## print type(p.contents), ct - self.failUnless(type(p.contents) is ct) + self.assertTrue(type(p.contents) is ct) # p.contents is the same as p[0] ## print p.contents -## self.failUnless(p.contents == 42) -## self.failUnless(p[0] == 42) +## self.assertTrue(p.contents == 42) +## self.assertTrue(p[0] == 42) self.assertRaises(TypeError, delitem, p, 0) @@ -117,9 +117,9 @@ pt = pointer(Table(1, 2, 3)) - self.failUnlessEqual(pt.contents.a, 1) - self.failUnlessEqual(pt.contents.b, 2) - self.failUnlessEqual(pt.contents.c, 3) + self.assertEqual(pt.contents.a, 1) + self.assertEqual(pt.contents.b, 2) + self.assertEqual(pt.contents.c, 3) pt.contents.c = 33 @@ -130,8 +130,8 @@ p = pointer(c_int(42)) # Although a pointer can be indexed, it ha no length self.assertRaises(TypeError, len, p) - self.failUnlessEqual(p[0], 42) - self.failUnlessEqual(p.contents.value, 42) + self.assertEqual(p[0], 42) + self.assertEqual(p.contents.value, 42) def test_charpp(self): """Test that a character pointer-to-pointer is correctly passed""" @@ -156,20 +156,20 @@ pp = pointer(p) q = pointer(y) pp[0] = q # <== - self.failUnlessEqual(p[0], 6) + self.assertEqual(p[0], 6) def test_c_void_p(self): # http://sourceforge.net/tracker/?func=detail&aid=1518190&group_id=5470&atid=105470 if sizeof(c_void_p) == 4: - self.failUnlessEqual(c_void_p(0xFFFFFFFFL).value, + self.assertEqual(c_void_p(0xFFFFFFFFL).value, c_void_p(-1).value) - self.failUnlessEqual(c_void_p(0xFFFFFFFFFFFFFFFFL).value, + self.assertEqual(c_void_p(0xFFFFFFFFFFFFFFFFL).value, c_void_p(-1).value) elif sizeof(c_void_p) == 8: - self.failUnlessEqual(c_void_p(0xFFFFFFFFL).value, + self.assertEqual(c_void_p(0xFFFFFFFFL).value, 0xFFFFFFFFL) - self.failUnlessEqual(c_void_p(0xFFFFFFFFFFFFFFFFL).value, + self.assertEqual(c_void_p(0xFFFFFFFFFFFFFFFFL).value, c_void_p(-1).value) - self.failUnlessEqual(c_void_p(0xFFFFFFFFFFFFFFFFFFFFFFFFL).value, + self.assertEqual(c_void_p(0xFFFFFFFFFFFFFFFFFFFFFFFFL).value, c_void_p(-1).value) self.assertRaises(TypeError, c_void_p, 3.14) # make sure floats are NOT accepted @@ -177,16 +177,16 @@ def test_pointers_bool(self): # NULL pointers have a boolean False value, non-NULL pointers True. - self.failUnlessEqual(bool(POINTER(c_int)()), False) - self.failUnlessEqual(bool(pointer(c_int())), True) + self.assertEqual(bool(POINTER(c_int)()), False) + self.assertEqual(bool(pointer(c_int())), True) - self.failUnlessEqual(bool(CFUNCTYPE(None)(0)), False) - self.failUnlessEqual(bool(CFUNCTYPE(None)(42)), True) + self.assertEqual(bool(CFUNCTYPE(None)(0)), False) + self.assertEqual(bool(CFUNCTYPE(None)(42)), True) # COM methods are boolean True: if sys.platform == "win32": mth = WINFUNCTYPE(None)(42, "name", (), None) - self.failUnlessEqual(bool(mth), True) + self.assertEqual(bool(mth), True) if __name__ == '__main__': unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_prototypes.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_prototypes.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_prototypes.py Wed Aug 5 15:32:47 2009 @@ -58,23 +58,23 @@ try: func() except TypeError, details: - self.failUnlessEqual(str(details), "required argument 'input' missing") + self.assertEqual(str(details), "required argument 'input' missing") else: self.fail("TypeError not raised") - self.failUnlessEqual(func(None), None) - self.failUnlessEqual(func(input=None), None) + self.assertEqual(func(None), None) + self.assertEqual(func(input=None), None) def test_int_pointer_arg(self): func = testdll._testfunc_p_p func.restype = c_long - self.failUnlessEqual(0, func(0)) + self.assertEqual(0, func(0)) ci = c_int(0) func.argtypes = POINTER(c_int), - self.failUnlessEqual(positive_address(addressof(ci)), + self.assertEqual(positive_address(addressof(ci)), positive_address(func(byref(ci)))) func.argtypes = c_char_p, @@ -91,45 +91,45 @@ func.restype = c_char_p func.argtypes = POINTER(c_char), - self.failUnlessEqual(None, func(None)) - self.failUnlessEqual("123", func("123")) - self.failUnlessEqual(None, func(c_char_p(None))) - self.failUnlessEqual("123", func(c_char_p("123"))) + self.assertEqual(None, func(None)) + self.assertEqual("123", func("123")) + self.assertEqual(None, func(c_char_p(None))) + self.assertEqual("123", func(c_char_p("123"))) - self.failUnlessEqual("123", func(c_buffer("123"))) + self.assertEqual("123", func(c_buffer("123"))) ca = c_char("a") - self.failUnlessEqual("a", func(pointer(ca))[0]) - self.failUnlessEqual("a", func(byref(ca))[0]) + self.assertEqual("a", func(pointer(ca))[0]) + self.assertEqual("a", func(byref(ca))[0]) def test_c_char_p_arg(self): func = testdll._testfunc_p_p func.restype = c_char_p func.argtypes = c_char_p, - self.failUnlessEqual(None, func(None)) - self.failUnlessEqual("123", func("123")) - self.failUnlessEqual(None, func(c_char_p(None))) - self.failUnlessEqual("123", func(c_char_p("123"))) + self.assertEqual(None, func(None)) + self.assertEqual("123", func("123")) + self.assertEqual(None, func(c_char_p(None))) + self.assertEqual("123", func(c_char_p("123"))) - self.failUnlessEqual("123", func(c_buffer("123"))) + self.assertEqual("123", func(c_buffer("123"))) ca = c_char("a") - self.failUnlessEqual("a", func(pointer(ca))[0]) - self.failUnlessEqual("a", func(byref(ca))[0]) + self.assertEqual("a", func(pointer(ca))[0]) + self.assertEqual("a", func(byref(ca))[0]) def test_c_void_p_arg(self): func = testdll._testfunc_p_p func.restype = c_char_p func.argtypes = c_void_p, - self.failUnlessEqual(None, func(None)) - self.failUnlessEqual("123", func("123")) - self.failUnlessEqual("123", func(c_char_p("123"))) - self.failUnlessEqual(None, func(c_char_p(None))) + self.assertEqual(None, func(None)) + self.assertEqual("123", func("123")) + self.assertEqual("123", func(c_char_p("123"))) + self.assertEqual(None, func(c_char_p(None))) - self.failUnlessEqual("123", func(c_buffer("123"))) + self.assertEqual("123", func(c_buffer("123"))) ca = c_char("a") - self.failUnlessEqual("a", func(pointer(ca))[0]) - self.failUnlessEqual("a", func(byref(ca))[0]) + self.assertEqual("a", func(pointer(ca))[0]) + self.assertEqual("a", func(byref(ca))[0]) func(byref(c_int())) func(pointer(c_int())) @@ -140,8 +140,8 @@ except NameError: pass else: - self.failUnlessEqual(None, func(c_wchar_p(None))) - self.failUnlessEqual(u"123", func(c_wchar_p(u"123"))) + self.assertEqual(None, func(c_wchar_p(None))) + self.assertEqual(u"123", func(c_wchar_p(u"123"))) def test_instance(self): func = testdll._testfunc_p_p @@ -151,10 +151,10 @@ _as_parameter_ = None func.argtypes = c_void_p, - self.failUnlessEqual(None, func(X())) + self.assertEqual(None, func(X())) func.argtypes = None - self.failUnlessEqual(None, func(X())) + self.assertEqual(None, func(X())) try: c_wchar @@ -174,15 +174,15 @@ func.restype = c_wchar_p func.argtypes = POINTER(c_wchar), - self.failUnlessEqual(None, func(None)) - self.failUnlessEqual(u"123", func(u"123")) - self.failUnlessEqual(None, func(c_wchar_p(None))) - self.failUnlessEqual(u"123", func(c_wchar_p(u"123"))) + self.assertEqual(None, func(None)) + self.assertEqual(u"123", func(u"123")) + self.assertEqual(None, func(c_wchar_p(None))) + self.assertEqual(u"123", func(c_wchar_p(u"123"))) - self.failUnlessEqual(u"123", func(c_wbuffer(u"123"))) + self.assertEqual(u"123", func(c_wbuffer(u"123"))) ca = c_wchar("a") - self.failUnlessEqual(u"a", func(pointer(ca))[0]) - self.failUnlessEqual(u"a", func(byref(ca))[0]) + self.assertEqual(u"a", func(pointer(ca))[0]) + self.assertEqual(u"a", func(byref(ca))[0]) def test_c_wchar_p_arg(self): func = testdll._testfunc_p_p @@ -191,16 +191,16 @@ c_wchar_p.from_param(u"123") - self.failUnlessEqual(None, func(None)) - self.failUnlessEqual("123", func(u"123")) - self.failUnlessEqual(None, func(c_wchar_p(None))) - self.failUnlessEqual("123", func(c_wchar_p("123"))) + self.assertEqual(None, func(None)) + self.assertEqual("123", func(u"123")) + self.assertEqual(None, func(c_wchar_p(None))) + self.assertEqual("123", func(c_wchar_p("123"))) # XXX Currently, these raise TypeErrors, although they shouldn't: - self.failUnlessEqual("123", func(c_wbuffer("123"))) + self.assertEqual("123", func(c_wbuffer("123"))) ca = c_wchar("a") - self.failUnlessEqual("a", func(pointer(ca))[0]) - self.failUnlessEqual("a", func(byref(ca))[0]) + self.assertEqual("a", func(pointer(ca))[0]) + self.assertEqual("a", func(byref(ca))[0]) class ArrayTest(unittest.TestCase): def test(self): Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_python_api.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_python_api.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_python_api.py Wed Aug 5 15:32:47 2009 @@ -23,7 +23,7 @@ PyString_FromStringAndSize.restype = py_object PyString_FromStringAndSize.argtypes = c_char_p, c_py_ssize_t - self.failUnlessEqual(PyString_FromStringAndSize("abcdefghi", 3), "abc") + self.assertEqual(PyString_FromStringAndSize("abcdefghi", 3), "abc") def test_PyString_FromString(self): pythonapi.PyString_FromString.restype = py_object @@ -32,10 +32,10 @@ s = "abc" refcnt = grc(s) pyob = pythonapi.PyString_FromString(s) - self.failUnlessEqual(grc(s), refcnt) - self.failUnlessEqual(s, pyob) + self.assertEqual(grc(s), refcnt) + self.assertEqual(s, pyob) del pyob - self.failUnlessEqual(grc(s), refcnt) + self.assertEqual(grc(s), refcnt) if is_resource_enabled("refcount"): # This test is unreliable, because it is possible that code in @@ -44,28 +44,28 @@ def test_PyInt_Long(self): ref42 = grc(42) pythonapi.PyInt_FromLong.restype = py_object - self.failUnlessEqual(pythonapi.PyInt_FromLong(42), 42) + self.assertEqual(pythonapi.PyInt_FromLong(42), 42) - self.failUnlessEqual(grc(42), ref42) + self.assertEqual(grc(42), ref42) pythonapi.PyInt_AsLong.argtypes = (py_object,) pythonapi.PyInt_AsLong.restype = c_long res = pythonapi.PyInt_AsLong(42) - self.failUnlessEqual(grc(res), ref42 + 1) + self.assertEqual(grc(res), ref42 + 1) del res - self.failUnlessEqual(grc(42), ref42) + self.assertEqual(grc(42), ref42) def test_PyObj_FromPtr(self): s = "abc def ghi jkl" ref = grc(s) # id(python-object) is the address pyobj = PyObj_FromPtr(id(s)) - self.failUnless(s is pyobj) + self.assertTrue(s is pyobj) - self.failUnlessEqual(grc(s), ref + 1) + self.assertEqual(grc(s), ref + 1) del pyobj - self.failUnlessEqual(grc(s), ref) + self.assertEqual(grc(s), ref) def test_PyOS_snprintf(self): PyOS_snprintf = pythonapi.PyOS_snprintf @@ -73,18 +73,18 @@ buf = c_buffer(256) PyOS_snprintf(buf, sizeof(buf), "Hello from %s", "ctypes") - self.failUnlessEqual(buf.value, "Hello from ctypes") + self.assertEqual(buf.value, "Hello from ctypes") PyOS_snprintf(buf, sizeof(buf), "Hello from %s", "ctypes", 1, 2, 3) - self.failUnlessEqual(buf.value, "Hello from ctypes") + self.assertEqual(buf.value, "Hello from ctypes") # not enough arguments - self.failUnlessRaises(TypeError, PyOS_snprintf, buf) + self.assertRaises(TypeError, PyOS_snprintf, buf) def test_pyobject_repr(self): - self.failUnlessEqual(repr(py_object()), "py_object()") - self.failUnlessEqual(repr(py_object(42)), "py_object(42)") - self.failUnlessEqual(repr(py_object(object)), "py_object(%r)" % object) + self.assertEqual(repr(py_object()), "py_object()") + self.assertEqual(repr(py_object(42)), "py_object(42)") + self.assertEqual(repr(py_object(object)), "py_object(%r)" % object) if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_random_things.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_random_things.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_random_things.py Wed Aug 5 15:32:47 2009 @@ -20,7 +20,7 @@ hdll = windll.kernel32.LoadLibraryA("kernel32") funcaddr = windll.kernel32.GetProcAddress(hdll, "GetModuleHandleA") - self.failUnlessEqual(call_function(funcaddr, (None,)), + self.assertEqual(call_function(funcaddr, (None,)), windll.kernel32.GetModuleHandleA(None)) class CallbackTracbackTestCase(unittest.TestCase): @@ -49,25 +49,25 @@ def test_ValueError(self): cb = CFUNCTYPE(c_int, c_int)(callback_func) out = self.capture_stderr(cb, 42) - self.failUnlessEqual(out.splitlines()[-1], + self.assertEqual(out.splitlines()[-1], "ValueError: 42") def test_IntegerDivisionError(self): cb = CFUNCTYPE(c_int, c_int)(callback_func) out = self.capture_stderr(cb, 0) - self.failUnlessEqual(out.splitlines()[-1][:19], + self.assertEqual(out.splitlines()[-1][:19], "ZeroDivisionError: ") def test_FloatDivisionError(self): cb = CFUNCTYPE(c_int, c_double)(callback_func) out = self.capture_stderr(cb, 0.0) - self.failUnlessEqual(out.splitlines()[-1][:19], + self.assertEqual(out.splitlines()[-1][:19], "ZeroDivisionError: ") def test_TypeErrorDivisionError(self): cb = CFUNCTYPE(c_int, c_char_p)(callback_func) out = self.capture_stderr(cb, "spam") - self.failUnlessEqual(out.splitlines()[-1], + self.assertEqual(out.splitlines()[-1], "TypeError: " "unsupported operand type(s) for /: 'int' and 'str'") Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_refcounts.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_refcounts.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_refcounts.py Wed Aug 5 15:32:47 2009 @@ -21,17 +21,17 @@ #print "called back with", value return value - self.failUnlessEqual(grc(callback), 2) + self.assertEqual(grc(callback), 2) cb = MyCallback(callback) - self.failUnless(grc(callback) > 2) + self.assertTrue(grc(callback) > 2) result = f(-10, cb) - self.failUnlessEqual(result, -18) + self.assertEqual(result, -18) cb = None gc.collect() - self.failUnlessEqual(grc(callback), 2) + self.assertEqual(grc(callback), 2) def test_refcount(self): @@ -39,19 +39,19 @@ def func(*args): pass # this is the standard refcount for func - self.failUnlessEqual(grc(func), 2) + self.assertEqual(grc(func), 2) # the CFuncPtr instance holds atr least one refcount on func: f = OtherCallback(func) - self.failUnless(grc(func) > 2) + self.assertTrue(grc(func) > 2) # and may release it again del f - self.failUnless(grc(func) >= 2) + self.assertTrue(grc(func) >= 2) # but now it must be gone gc.collect() - self.failUnless(grc(func) == 2) + self.assertTrue(grc(func) == 2) class X(ctypes.Structure): _fields_ = [("a", OtherCallback)] @@ -59,27 +59,27 @@ x.a = OtherCallback(func) # the CFuncPtr instance holds atr least one refcount on func: - self.failUnless(grc(func) > 2) + self.assertTrue(grc(func) > 2) # and may release it again del x - self.failUnless(grc(func) >= 2) + self.assertTrue(grc(func) >= 2) # and now it must be gone again gc.collect() - self.failUnlessEqual(grc(func), 2) + self.assertEqual(grc(func), 2) f = OtherCallback(func) # the CFuncPtr instance holds atr least one refcount on func: - self.failUnless(grc(func) > 2) + self.assertTrue(grc(func) > 2) # create a cycle f.cycle = f del f gc.collect() - self.failUnlessEqual(grc(func), 2) + self.assertEqual(grc(func), 2) class AnotherLeak(unittest.TestCase): def test_callback(self): @@ -92,7 +92,7 @@ a = sys.getrefcount(ctypes.c_int) f(1, 2) - self.failUnlessEqual(sys.getrefcount(ctypes.c_int), a) + self.assertEqual(sys.getrefcount(ctypes.c_int), a) if __name__ == '__main__': unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_repr.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_repr.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_repr.py Wed Aug 5 15:32:47 2009 @@ -18,12 +18,12 @@ def test_numbers(self): for typ in subclasses: base = typ.__bases__[0] - self.failUnless(repr(base(42)).startswith(base.__name__)) - self.failUnlessEqual(": " "expected string or Unicode object, int found") else: - self.failUnlessEqual(msg, + self.assertEqual(msg, "(Phone) exceptions.TypeError: " "expected string or Unicode object, int found") cls, msg = self.get_except(Person, "Someone", ("a", "b", "c")) - self.failUnlessEqual(cls, RuntimeError) + self.assertEqual(cls, RuntimeError) if issubclass(Exception, object): - self.failUnlessEqual(msg, + self.assertEqual(msg, "(Phone) : too many initializers") else: - self.failUnlessEqual(msg, "(Phone) exceptions.TypeError: too many initializers") + self.assertEqual(msg, "(Phone) exceptions.TypeError: too many initializers") def get_except(self, func, *args): @@ -337,7 +337,7 @@ ## # same as 'class X(Structure): pass' ## # fails, since we need either a _fields_ or a _abstract_ attribute ## cls, msg = self.get_except(meta, "X", (Structure,), {}) -## self.failUnlessEqual((cls, msg), +## self.assertEqual((cls, msg), ## (AttributeError, "class must define a '_fields_' attribute")) def test_abstract_class(self): @@ -345,15 +345,15 @@ _abstract_ = "something" # try 'X()' cls, msg = self.get_except(eval, "X()", locals()) - self.failUnlessEqual((cls, msg), (TypeError, "abstract class")) + self.assertEqual((cls, msg), (TypeError, "abstract class")) def test_methods(self): ## class X(Structure): ## _fields_ = [] - self.failUnless("in_dll" in dir(type(Structure))) - self.failUnless("from_address" in dir(type(Structure))) - self.failUnless("in_dll" in dir(type(Structure))) + self.assertTrue("in_dll" in dir(type(Structure))) + self.assertTrue("from_address" in dir(type(Structure))) + self.assertTrue("in_dll" in dir(type(Structure))) class PointerMemberTestCase(unittest.TestCase): @@ -366,7 +366,7 @@ # We can assign arrays of the correct type s.array = (c_int * 3)(1, 2, 3) items = [s.array[i] for i in range(3)] - self.failUnlessEqual(items, [1, 2, 3]) + self.assertEqual(items, [1, 2, 3]) # The following are bugs, but are included here because the unittests # also describe the current behaviour. @@ -377,14 +377,14 @@ s.array[0] = 42 items = [s.array[i] for i in range(3)] - self.failUnlessEqual(items, [42, 2, 3]) + self.assertEqual(items, [42, 2, 3]) s.array[0] = 1 ## s.array[1] = 42 items = [s.array[i] for i in range(3)] - self.failUnlessEqual(items, [1, 2, 3]) + self.assertEqual(items, [1, 2, 3]) def test_none_to_pointer_fields(self): class S(Structure): @@ -394,7 +394,7 @@ s = S() s.x = 12345678 s.p = None - self.failUnlessEqual(s.x, 12345678) + self.assertEqual(s.x, 12345678) class TestRecursiveStructure(unittest.TestCase): def test_contains_itself(self): @@ -404,7 +404,7 @@ try: Recursive._fields_ = [("next", Recursive)] except AttributeError, details: - self.failUnless("Structure or union cannot contain itself" in + self.assertTrue("Structure or union cannot contain itself" in str(details)) else: self.fail("Structure or union cannot contain itself") @@ -421,7 +421,7 @@ try: Second._fields_ = [("first", First)] except AttributeError, details: - self.failUnless("_fields_ is final" in + self.assertTrue("_fields_ is final" in str(details)) else: self.fail("AttributeError not raised") Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_unaligned_structures.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_unaligned_structures.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_unaligned_structures.py Wed Aug 5 15:32:47 2009 @@ -28,18 +28,18 @@ def test_native(self): for typ in structures: ## print typ.value - self.failUnlessEqual(typ.value.offset, 1) + self.assertEqual(typ.value.offset, 1) o = typ() o.value = 4 - self.failUnlessEqual(o.value, 4) + self.assertEqual(o.value, 4) def test_swapped(self): for typ in byteswapped_structures: ## print >> sys.stderr, typ.value - self.failUnlessEqual(typ.value.offset, 1) + self.assertEqual(typ.value.offset, 1) o = typ() o.value = 4 - self.failUnlessEqual(o.value, 4) + self.assertEqual(o.value, 4) if __name__ == '__main__': unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_unicode.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_unicode.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_unicode.py Wed Aug 5 15:32:47 2009 @@ -23,55 +23,55 @@ def test_ascii_strict(self): ctypes.set_conversion_mode("ascii", "strict") # no conversions take place with unicode arguments - self.failUnlessEqual(wcslen(u"abc"), 3) - self.failUnlessEqual(wcslen(u"ab\u2070"), 3) + self.assertEqual(wcslen(u"abc"), 3) + self.assertEqual(wcslen(u"ab\u2070"), 3) # string args are converted - self.failUnlessEqual(wcslen("abc"), 3) - self.failUnlessRaises(ctypes.ArgumentError, wcslen, "ab?") + self.assertEqual(wcslen("abc"), 3) + self.assertRaises(ctypes.ArgumentError, wcslen, "ab?") def test_ascii_replace(self): ctypes.set_conversion_mode("ascii", "replace") - self.failUnlessEqual(wcslen(u"abc"), 3) - self.failUnlessEqual(wcslen(u"ab\u2070"), 3) - self.failUnlessEqual(wcslen("abc"), 3) - self.failUnlessEqual(wcslen("ab?"), 3) + self.assertEqual(wcslen(u"abc"), 3) + self.assertEqual(wcslen(u"ab\u2070"), 3) + self.assertEqual(wcslen("abc"), 3) + self.assertEqual(wcslen("ab?"), 3) def test_ascii_ignore(self): ctypes.set_conversion_mode("ascii", "ignore") - self.failUnlessEqual(wcslen(u"abc"), 3) - self.failUnlessEqual(wcslen(u"ab\u2070"), 3) + self.assertEqual(wcslen(u"abc"), 3) + self.assertEqual(wcslen(u"ab\u2070"), 3) # ignore error mode skips non-ascii characters - self.failUnlessEqual(wcslen("abc"), 3) - self.failUnlessEqual(wcslen("????"), 0) + self.assertEqual(wcslen("abc"), 3) + self.assertEqual(wcslen("????"), 0) def test_latin1_strict(self): ctypes.set_conversion_mode("latin-1", "strict") - self.failUnlessEqual(wcslen(u"abc"), 3) - self.failUnlessEqual(wcslen(u"ab\u2070"), 3) - self.failUnlessEqual(wcslen("abc"), 3) - self.failUnlessEqual(wcslen("????"), 4) + self.assertEqual(wcslen(u"abc"), 3) + self.assertEqual(wcslen(u"ab\u2070"), 3) + self.assertEqual(wcslen("abc"), 3) + self.assertEqual(wcslen("????"), 4) def test_buffers(self): ctypes.set_conversion_mode("ascii", "strict") buf = ctypes.create_unicode_buffer("abc") - self.failUnlessEqual(len(buf), 3+1) + self.assertEqual(len(buf), 3+1) ctypes.set_conversion_mode("ascii", "replace") buf = ctypes.create_unicode_buffer("ab???") - self.failUnlessEqual(buf[:], u"ab\uFFFD\uFFFD\uFFFD\0") - self.failUnlessEqual(buf[::], u"ab\uFFFD\uFFFD\uFFFD\0") - self.failUnlessEqual(buf[::-1], u"\0\uFFFD\uFFFD\uFFFDba") - self.failUnlessEqual(buf[::2], u"a\uFFFD\uFFFD") - self.failUnlessEqual(buf[6:5:-1], u"") + self.assertEqual(buf[:], u"ab\uFFFD\uFFFD\uFFFD\0") + self.assertEqual(buf[::], u"ab\uFFFD\uFFFD\uFFFD\0") + self.assertEqual(buf[::-1], u"\0\uFFFD\uFFFD\uFFFDba") + self.assertEqual(buf[::2], u"a\uFFFD\uFFFD") + self.assertEqual(buf[6:5:-1], u"") ctypes.set_conversion_mode("ascii", "ignore") buf = ctypes.create_unicode_buffer("ab???") # is that correct? not sure. But with 'ignore', you get what you pay for.. - self.failUnlessEqual(buf[:], u"ab\0\0\0\0") - self.failUnlessEqual(buf[::], u"ab\0\0\0\0") - self.failUnlessEqual(buf[::-1], u"\0\0\0\0ba") - self.failUnlessEqual(buf[::2], u"a\0\0") - self.failUnlessEqual(buf[6:5:-1], u"") + self.assertEqual(buf[:], u"ab\0\0\0\0") + self.assertEqual(buf[::], u"ab\0\0\0\0") + self.assertEqual(buf[::-1], u"\0\0\0\0ba") + self.assertEqual(buf[::2], u"a\0\0") + self.assertEqual(buf[6:5:-1], u"") import _ctypes_test func = ctypes.CDLL(_ctypes_test.__file__)._testfunc_p_p @@ -89,41 +89,41 @@ def test_ascii_replace(self): ctypes.set_conversion_mode("ascii", "strict") - self.failUnlessEqual(func("abc"), "abc") - self.failUnlessEqual(func(u"abc"), "abc") + self.assertEqual(func("abc"), "abc") + self.assertEqual(func(u"abc"), "abc") self.assertRaises(ctypes.ArgumentError, func, u"ab?") def test_ascii_ignore(self): ctypes.set_conversion_mode("ascii", "ignore") - self.failUnlessEqual(func("abc"), "abc") - self.failUnlessEqual(func(u"abc"), "abc") - self.failUnlessEqual(func(u"????"), "") + self.assertEqual(func("abc"), "abc") + self.assertEqual(func(u"abc"), "abc") + self.assertEqual(func(u"????"), "") def test_ascii_replace(self): ctypes.set_conversion_mode("ascii", "replace") - self.failUnlessEqual(func("abc"), "abc") - self.failUnlessEqual(func(u"abc"), "abc") - self.failUnlessEqual(func(u"????"), "????") + self.assertEqual(func("abc"), "abc") + self.assertEqual(func(u"abc"), "abc") + self.assertEqual(func(u"????"), "????") def test_buffers(self): ctypes.set_conversion_mode("ascii", "strict") buf = ctypes.create_string_buffer(u"abc") - self.failUnlessEqual(len(buf), 3+1) + self.assertEqual(len(buf), 3+1) ctypes.set_conversion_mode("ascii", "replace") buf = ctypes.create_string_buffer(u"ab???") - self.failUnlessEqual(buf[:], "ab???\0") - self.failUnlessEqual(buf[::], "ab???\0") - self.failUnlessEqual(buf[::-1], "\0???ba") - self.failUnlessEqual(buf[::2], "a??") - self.failUnlessEqual(buf[6:5:-1], "") + self.assertEqual(buf[:], "ab???\0") + self.assertEqual(buf[::], "ab???\0") + self.assertEqual(buf[::-1], "\0???ba") + self.assertEqual(buf[::2], "a??") + self.assertEqual(buf[6:5:-1], "") ctypes.set_conversion_mode("ascii", "ignore") buf = ctypes.create_string_buffer(u"ab???") # is that correct? not sure. But with 'ignore', you get what you pay for.. - self.failUnlessEqual(buf[:], "ab\0\0\0\0") - self.failUnlessEqual(buf[::], "ab\0\0\0\0") - self.failUnlessEqual(buf[::-1], "\0\0\0\0ba") + self.assertEqual(buf[:], "ab\0\0\0\0") + self.assertEqual(buf[::], "ab\0\0\0\0") + self.assertEqual(buf[::-1], "\0\0\0\0ba") if __name__ == '__main__': unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_values.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_values.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_values.py Wed Aug 5 15:32:47 2009 @@ -13,9 +13,9 @@ ctdll = CDLL(_ctypes_test.__file__) an_integer = c_int.in_dll(ctdll, "an_integer") x = an_integer.value - self.failUnlessEqual(x, ctdll.get_an_integer()) + self.assertEqual(x, ctdll.get_an_integer()) an_integer.value *= 2 - self.failUnlessEqual(x*2, ctdll.get_an_integer()) + self.assertEqual(x*2, ctdll.get_an_integer()) def test_undefined(self): ctdll = CDLL(_ctypes_test.__file__) @@ -34,11 +34,11 @@ # docstrings are also removed in the latter case. opt = c_int.in_dll(pydll, "Py_OptimizeFlag").value if __debug__: - self.failUnlessEqual(opt, 0) + self.assertEqual(opt, 0) elif ValuesTestCase.__doc__ is not None: - self.failUnlessEqual(opt, 1) + self.assertEqual(opt, 1) else: - self.failUnlessEqual(opt, 2) + self.assertEqual(opt, 2) def test_frozentable(self): # Python exports a PyImport_FrozenModules symbol. This is a @@ -70,7 +70,7 @@ expected = [("__hello__", 104), ("__phello__", -104), ("__phello__.spam", 104)] else: expected = [("__hello__", 100), ("__phello__", -100), ("__phello__.spam", 100)] - self.failUnlessEqual(items, expected) + self.assertEqual(items, expected) from ctypes import _pointer_type_cache del _pointer_type_cache[struct_frozen] Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_varsize_struct.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_varsize_struct.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_varsize_struct.py Wed Aug 5 15:32:47 2009 @@ -7,44 +7,44 @@ _fields_ = [("item", c_int), ("array", c_int * 1)] - self.failUnlessEqual(sizeof(X), sizeof(c_int) * 2) + self.assertEqual(sizeof(X), sizeof(c_int) * 2) x = X() x.item = 42 x.array[0] = 100 - self.failUnlessEqual(sizeof(x), sizeof(c_int) * 2) + self.assertEqual(sizeof(x), sizeof(c_int) * 2) # make room for one additional item new_size = sizeof(X) + sizeof(c_int) * 1 resize(x, new_size) - self.failUnlessEqual(sizeof(x), new_size) - self.failUnlessEqual((x.item, x.array[0]), (42, 100)) + self.assertEqual(sizeof(x), new_size) + self.assertEqual((x.item, x.array[0]), (42, 100)) # make room for 10 additional items new_size = sizeof(X) + sizeof(c_int) * 9 resize(x, new_size) - self.failUnlessEqual(sizeof(x), new_size) - self.failUnlessEqual((x.item, x.array[0]), (42, 100)) + self.assertEqual(sizeof(x), new_size) + self.assertEqual((x.item, x.array[0]), (42, 100)) # make room for one additional item new_size = sizeof(X) + sizeof(c_int) * 1 resize(x, new_size) - self.failUnlessEqual(sizeof(x), new_size) - self.failUnlessEqual((x.item, x.array[0]), (42, 100)) + self.assertEqual(sizeof(x), new_size) + self.assertEqual((x.item, x.array[0]), (42, 100)) def test_array_invalid_length(self): # cannot create arrays with non-positive size - self.failUnlessRaises(ValueError, lambda: c_int * -1) - self.failUnlessRaises(ValueError, lambda: c_int * -3) + self.assertRaises(ValueError, lambda: c_int * -1) + self.assertRaises(ValueError, lambda: c_int * -3) def test_zerosized_array(self): array = (c_int * 0)() # accessing elements of zero-sized arrays raise IndexError - self.failUnlessRaises(IndexError, array.__setitem__, 0, None) - self.failUnlessRaises(IndexError, array.__getitem__, 0) - self.failUnlessRaises(IndexError, array.__setitem__, 1, None) - self.failUnlessRaises(IndexError, array.__getitem__, 1) - self.failUnlessRaises(IndexError, array.__setitem__, -1, None) - self.failUnlessRaises(IndexError, array.__getitem__, -1) + self.assertRaises(IndexError, array.__setitem__, 0, None) + self.assertRaises(IndexError, array.__getitem__, 0) + self.assertRaises(IndexError, array.__setitem__, 1, None) + self.assertRaises(IndexError, array.__getitem__, 1) + self.assertRaises(IndexError, array.__setitem__, -1, None) + self.assertRaises(IndexError, array.__getitem__, -1) if __name__ == "__main__": unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_win32.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_win32.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/ctypes/test/test_win32.py Wed Aug 5 15:32:47 2009 @@ -18,7 +18,7 @@ self.assertRaises(ValueError, IsWindow) # This one should succeeed... - self.failUnlessEqual(0, IsWindow(0)) + self.assertEqual(0, IsWindow(0)) # ValueError: Procedure probably called with too many arguments (8 bytes in excess) self.assertRaises(ValueError, IsWindow, 0, 0, 0) @@ -49,13 +49,13 @@ class TestWintypes(unittest.TestCase): def test_HWND(self): from ctypes import wintypes - self.failUnlessEqual(sizeof(wintypes.HWND), sizeof(c_void_p)) + self.assertEqual(sizeof(wintypes.HWND), sizeof(c_void_p)) def test_PARAM(self): from ctypes import wintypes - self.failUnlessEqual(sizeof(wintypes.WPARAM), + self.assertEqual(sizeof(wintypes.WPARAM), sizeof(c_void_p)) - self.failUnlessEqual(sizeof(wintypes.LPARAM), + self.assertEqual(sizeof(wintypes.LPARAM), sizeof(c_void_p)) def test_COMError(self): @@ -84,7 +84,7 @@ pt = POINT(10, 10) rect = RECT(0, 0, 20, 20) - self.failUnlessEqual(1, dll.PointInRect(byref(rect), pt)) + self.assertEqual(1, dll.PointInRect(byref(rect), pt)) if __name__ == '__main__': unittest.main() Modified: python/branches/tk_and_idle_maintenance/Lib/decimal.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/decimal.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/decimal.py Wed Aug 5 15:32:47 2009 @@ -554,20 +554,16 @@ intpart = m.group('int') if intpart is not None: # finite number - fracpart = m.group('frac') + fracpart = m.group('frac') or '' exp = int(m.group('exp') or '0') - if fracpart is not None: - self._int = str((intpart+fracpart).lstrip('0') or '0') - self._exp = exp - len(fracpart) - else: - self._int = str(intpart.lstrip('0') or '0') - self._exp = exp + self._int = str(int(intpart+fracpart)) + self._exp = exp - len(fracpart) self._is_special = False else: diag = m.group('diag') if diag is not None: # NaN - self._int = str(diag.lstrip('0')) + self._int = str(int(diag or '0')).lstrip('0') if m.group('signal'): self._exp = 'N' else: @@ -5402,29 +5398,26 @@ # number between the optional sign and the optional exponent must have # at least one decimal digit, possibly after the decimal point. The # lookahead expression '(?=\d|\.\d)' checks this. -# -# As the flag UNICODE is not enabled here, we're explicitly avoiding any -# other meaning for \d than the numbers [0-9]. import re _parser = re.compile(r""" # A numeric string consists of: # \s* (?P[-+])? # an optional sign, followed by either... ( - (?=[0-9]|\.[0-9]) # ...a number (with at least one digit) - (?P[0-9]*) # having a (possibly empty) integer part - (\.(?P[0-9]*))? # followed by an optional fractional part - (E(?P[-+]?[0-9]+))? # followed by an optional exponent, or... + (?=\d|\.\d) # ...a number (with at least one digit) + (?P\d*) # having a (possibly empty) integer part + (\.(?P\d*))? # followed by an optional fractional part + (E(?P[-+]?\d+))? # followed by an optional exponent, or... | Inf(inity)? # ...an infinity, or... | (?Ps)? # ...an (optionally signaling) NaN # NaN - (?P[0-9]*) # with (possibly empty) diagnostic info. + (?P\d*) # with (possibly empty) diagnostic info. ) # \s* \Z -""", re.VERBOSE | re.IGNORECASE).match +""", re.VERBOSE | re.IGNORECASE | re.UNICODE).match _all_zeros = re.compile('0*$').match _exact_half = re.compile('50*$').match Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/command/bdist_dumb.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/command/bdist_dumb.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/command/bdist_dumb.py Wed Aug 5 15:32:47 2009 @@ -7,16 +7,17 @@ __revision__ = "$Id$" import os + from distutils.core import Command from distutils.util import get_platform from distutils.dir_util import remove_tree, ensure_relative -from distutils.errors import * +from distutils.errors import DistutilsPlatformError from distutils.sysconfig import get_python_version from distutils import log class bdist_dumb (Command): - description = "create a \"dumb\" built distribution" + description = 'create a "dumb" built distribution' user_options = [('bdist-dir=', 'd', "temporary directory for creating the distribution"), @@ -53,11 +54,7 @@ self.skip_build = 0 self.relative = 0 - # initialize_options() - - - def finalize_options (self): - + def finalize_options(self): if self.bdist_dir is None: bdist_base = self.get_finalized_command('bdist').bdist_base self.bdist_dir = os.path.join(bdist_base, 'dumb') @@ -74,11 +71,7 @@ ('dist_dir', 'dist_dir'), ('plat_name', 'plat_name')) - # finalize_options() - - def run (self): - if not self.skip_build: self.run_command('build') @@ -127,7 +120,3 @@ if not self.keep_temp: remove_tree(self.bdist_dir, dry_run=self.dry_run) - - # run() - -# class bdist_dumb Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/command/bdist_msi.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/command/bdist_msi.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/command/bdist_msi.py Wed Aug 5 15:32:47 2009 @@ -315,8 +315,7 @@ key = seen[afile] add_data(self.db, "DuplicateFile", [(key + version, dir.component, key, None, dir.logical)]) - - + db.Commit() cab.commit(db) def add_find_python(self): Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/command/build.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/command/build.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/command/build.py Wed Aug 5 15:32:47 2009 @@ -9,13 +9,11 @@ from distutils.errors import DistutilsOptionError from distutils.util import get_platform - -def show_compilers (): +def show_compilers(): from distutils.ccompiler import show_compilers show_compilers() - -class build (Command): +class build(Command): description = "build everything needed to install" @@ -53,7 +51,7 @@ "list available compilers", show_compilers), ] - def initialize_options (self): + def initialize_options(self): self.build_base = 'build' # these are decided only after 'build_base' has its final value # (unless overridden by the user or client) @@ -68,8 +66,7 @@ self.force = 0 self.executable = None - def finalize_options (self): - + def finalize_options(self): if self.plat_name is None: self.plat_name = get_platform() else: @@ -118,11 +115,8 @@ if self.executable is None: self.executable = os.path.normpath(sys.executable) - # finalize_options () - - - def run (self): + def run(self): # Run all relevant sub-commands. This will be some subset of: # - build_py - pure Python modules # - build_clib - standalone C libraries @@ -131,7 +125,6 @@ for cmd_name in self.get_sub_commands(): self.run_command(cmd_name) - # -- Predicates for the sub-command list --------------------------- def has_pure_modules (self): @@ -146,11 +139,8 @@ def has_scripts (self): return self.distribution.has_scripts() - sub_commands = [('build_py', has_pure_modules), ('build_clib', has_c_libraries), ('build_ext', has_ext_modules), ('build_scripts', has_scripts), ] - -# class build Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/command/build_ext.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/command/build_ext.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/command/build_ext.py Wed Aug 5 15:32:47 2009 @@ -6,8 +6,9 @@ __revision__ = "$Id$" -import sys, os, string, re -from types import * +import sys, os, re +from warnings import warn + from distutils.core import Command from distutils.errors import * from distutils.sysconfig import customize_compiler, get_python_version @@ -39,7 +40,7 @@ show_compilers() -class build_ext (Command): +class build_ext(Command): description = "build C/C++ extensions (compile/link to build directory)" @@ -113,7 +114,41 @@ "list available compilers", show_compilers), ] - def initialize_options (self): + + # making 'compiler' a property to deprecate + # its usage as something else than a compiler type + # e.g. like a compiler instance + def __init__(self, dist): + self._compiler = None + Command.__init__(self, dist) + + def __setattr__(self, name, value): + # need this to make sure setattr() (used in distutils) + # doesn't kill our property + if name == 'compiler': + self._set_compiler(value) + else: + self.__dict__[name] = value + + def _set_compiler(self, compiler): + if not isinstance(compiler, str) and compiler is not None: + # we don't want to allow that anymore in the future + warn("'compiler' specifies the compiler type in build_ext. " + "If you want to get the compiler object itself, " + "use 'compiler_obj'", DeprecationWarning) + self._compiler = compiler + + def _get_compiler(self): + if not isinstance(self._compiler, str) and self._compiler is not None: + # we don't want to allow that anymore in the future + warn("'compiler' specifies the compiler type in build_ext. " + "If you want to get the compiler object itself, " + "use 'compiler_obj'", DeprecationWarning) + return self._compiler + + compiler = property(_get_compiler, _set_compiler) + + def initialize_options(self): self.extensions = None self.build_lib = None self.plat_name = None @@ -177,13 +212,13 @@ self.libraries = [] if self.library_dirs is None: self.library_dirs = [] - elif type(self.library_dirs) is StringType: - self.library_dirs = string.split(self.library_dirs, os.pathsep) + elif isinstance(self.library_dirs, str): + self.library_dirs = self.library_dirs.split(os.pathsep) if self.rpath is None: self.rpath = [] - elif type(self.rpath) is StringType: - self.rpath = string.split(self.rpath, os.pathsep) + elif isinstance(self.rpath, str): + self.rpath = self.rpath.split(os.pathsep) # for extensions under windows use different directories # for Release and Debug builds. @@ -260,7 +295,7 @@ if self.define: defines = self.define.split(',') - self.define = map(lambda symbol: (symbol, '1'), defines) + self.define = [(symbol, '1') for symbol in defines] # The option for macros to undefine is also a string from the # option parsing, but has to be a list. Multiple symbols can also @@ -311,38 +346,50 @@ # Setup the CCompiler object that we'll use to do all the # compiling and linking - self.compiler = new_compiler(compiler=None, - verbose=self.verbose, - dry_run=self.dry_run, - force=self.force) - customize_compiler(self.compiler) + + # used to prevent the usage of an existing compiler for the + # compiler option when calling new_compiler() + # this will be removed in 3.3 and 2.8 + if not isinstance(self._compiler, str): + self._compiler = None + + self.compiler_obj = new_compiler(compiler=self._compiler, + verbose=self.verbose, + dry_run=self.dry_run, + force=self.force) + + # used to keep the compiler object reachable with + # "self.compiler". this will be removed in 3.3 and 2.8 + self._compiler = self.compiler_obj + + customize_compiler(self.compiler_obj) # If we are cross-compiling, init the compiler now (if we are not # cross-compiling, init would not hurt, but people may rely on # late initialization of compiler even if they shouldn't...) if os.name == 'nt' and self.plat_name != get_platform(): - self.compiler.initialize(self.plat_name) + self.compiler_obj.initialize(self.plat_name) # And make sure that any compile/link-related options (which might # come from the command-line or from the setup script) are set in # that CCompiler object -- that way, they automatically apply to # all compiling and linking done here. if self.include_dirs is not None: - self.compiler.set_include_dirs(self.include_dirs) + self.compiler_obj.set_include_dirs(self.include_dirs) if self.define is not None: # 'define' option is a list of (name,value) tuples for (name, value) in self.define: - self.compiler.define_macro(name, value) + self.compiler_obj.define_macro(name, value) if self.undef is not None: for macro in self.undef: - self.compiler.undefine_macro(macro) + self.compiler_obj.undefine_macro(macro) if self.libraries is not None: - self.compiler.set_libraries(self.libraries) + self.compiler_obj.set_libraries(self.libraries) if self.library_dirs is not None: - self.compiler.set_library_dirs(self.library_dirs) + self.compiler_obj.set_library_dirs(self.library_dirs) if self.rpath is not None: - self.compiler.set_runtime_library_dirs(self.rpath) + self.compiler_obj.set_runtime_library_dirs(self.rpath) if self.link_objects is not None: - self.compiler.set_link_objects(self.link_objects) + self.compiler_obj.set_link_objects(self.link_objects) # Now actually compile and link everything. self.build_extensions() @@ -464,7 +511,7 @@ def build_extension(self, ext): sources = ext.sources - if sources is None or type(sources) not in (ListType, TupleType): + if sources is None or not isinstance(sources, (list, tuple)): raise DistutilsSetupError, \ ("in 'ext_modules' option (extension '%s'), " + "'sources' must be present and must be " + @@ -504,13 +551,13 @@ for undef in ext.undef_macros: macros.append((undef,)) - objects = self.compiler.compile(sources, - output_dir=self.build_temp, - macros=macros, - include_dirs=ext.include_dirs, - debug=self.debug, - extra_postargs=extra_args, - depends=ext.depends) + objects = self.compiler_obj.compile(sources, + output_dir=self.build_temp, + macros=macros, + include_dirs=ext.include_dirs, + debug=self.debug, + extra_postargs=extra_args, + depends=ext.depends) # XXX -- this is a Vile HACK! # @@ -531,9 +578,9 @@ extra_args = ext.extra_link_args or [] # Detect target language, if not provided - language = ext.language or self.compiler.detect_language(sources) + language = ext.language or self.compiler_obj.detect_language(sources) - self.compiler.link_shared_object( + self.compiler_obj.link_shared_object( objects, ext_path, libraries=self.get_libraries(ext), library_dirs=ext.library_dirs, @@ -545,14 +592,12 @@ target_lang=language) - def swig_sources (self, sources, extension): - + def swig_sources(self, sources, extension): """Walk the list of source files in 'sources', looking for SWIG interface (.i) files. Run SWIG on all that are found, and return a modified 'sources' list with SWIG source files replaced by the generated C (or C++) files. """ - new_sources = [] swig_sources = [] swig_targets = {} @@ -601,9 +646,7 @@ return new_sources - # swig_sources () - - def find_swig (self): + def find_swig(self): """Return the name of the SWIG executable. On Unix, this is just "swig" -- it should be in the PATH. Tries a bit harder on Windows. @@ -632,8 +675,6 @@ ("I don't know how to find (much less run) SWIG " "on platform '%s'") % os.name - # find_swig () - # -- Name generators ----------------------------------------------- # (extension names, filenames, whatever) def get_ext_fullpath(self, ext_name): @@ -643,18 +684,24 @@ (inplace option). """ fullname = self.get_ext_fullname(ext_name) - filename = self.get_ext_filename(fullname) + modpath = fullname.split('.') + filename = self.get_ext_filename(modpath[-1]) + if not self.inplace: # no further work needed + # returning : + # build_dir/package/path/filename + filename = os.path.join(*modpath[:-1]+[filename]) return os.path.join(self.build_lib, filename) # the inplace option requires to find the package directory - # using the build_py command - modpath = fullname.split('.') + # using the build_py command for that package = '.'.join(modpath[0:-1]) - base = modpath[-1] build_py = self.get_finalized_command('build_py') package_dir = os.path.abspath(build_py.get_package_dir(package)) + + # returning + # package_dir/filename return os.path.join(package_dir, filename) def get_ext_fullname(self, ext_name): @@ -672,29 +719,28 @@ "foo\bar.pyd"). """ from distutils.sysconfig import get_config_var - ext_path = string.split(ext_name, '.') + ext_path = ext_name.split('.') # OS/2 has an 8 character module (extension) limit :-( if os.name == "os2": ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8] # extensions in debug_mode are named 'module_d.pyd' under windows so_ext = get_config_var('SO') if os.name == 'nt' and self.debug: - return apply(os.path.join, ext_path) + '_d' + so_ext + return os.path.join(*ext_path) + '_d' + so_ext return os.path.join(*ext_path) + so_ext - def get_export_symbols (self, ext): + def get_export_symbols(self, ext): """Return the list of symbols that a shared extension has to export. This either uses 'ext.export_symbols' or, if it's not provided, "init" + module_name. Only relevant on Windows, where the .pyd file (DLL) must export the module "init" function. """ - - initfunc_name = "init" + string.split(ext.name,'.')[-1] + initfunc_name = "init" + ext.name.split('.')[-1] if initfunc_name not in ext.export_symbols: ext.export_symbols.append(initfunc_name) return ext.export_symbols - def get_libraries (self, ext): + def get_libraries(self, ext): """Return the list of libraries to link against when building a shared extension. On most platforms, this is just 'ext.libraries'; on Windows and OS/2, we add the Python library (eg. python20.dll). @@ -706,7 +752,7 @@ # Append '_d' to the python import library on debug builds. if sys.platform == "win32": from distutils.msvccompiler import MSVCCompiler - if not isinstance(self.compiler, MSVCCompiler): + if not isinstance(self.compiler_obj, MSVCCompiler): template = "python%d%d" if self.debug: template = template + '_d' @@ -767,5 +813,3 @@ return ext.libraries + [pythonlib] else: return ext.libraries - -# class build_ext Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/command/build_py.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/command/build_py.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/command/build_py.py Wed Aug 5 15:32:47 2009 @@ -4,16 +4,15 @@ __revision__ = "$Id$" -import string, os -from types import * +import os from glob import glob from distutils.core import Command -from distutils.errors import * +from distutils.errors import DistutilsOptionError, DistutilsFileError from distutils.util import convert_path from distutils import log -class build_py (Command): +class build_py(Command): description = "\"build\" pure Python modules (copy to build directory)" @@ -30,8 +29,7 @@ boolean_options = ['compile', 'force'] negative_opt = {'no-compile' : 'compile'} - - def initialize_options (self): + def initialize_options(self): self.build_lib = None self.py_modules = None self.package = None @@ -41,7 +39,7 @@ self.optimize = 0 self.force = None - def finalize_options (self): + def finalize_options(self): self.set_undefined_options('build', ('build_lib', 'build_lib'), ('force', 'force')) @@ -59,15 +57,14 @@ # Ick, copied straight from install_lib.py (fancy_getopt needs a # type system! Hell, *everything* needs a type system!!!) - if type(self.optimize) is not IntType: + if not isinstance(self.optimize, int): try: self.optimize = int(self.optimize) assert 0 <= self.optimize <= 2 except (ValueError, AssertionError): - raise DistutilsOptionError, "optimize must be 0, 1, or 2" - - def run (self): + raise DistutilsOptionError("optimize must be 0, 1, or 2") + def run(self): # XXX copy_file by default preserves atime and mtime. IMHO this is # the right thing to do, but perhaps it should be an option -- in # particular, a site administrator might want installed files to @@ -97,9 +94,7 @@ self.byte_compile(self.get_outputs(include_bytecode=0)) - # run () - - def get_data_files (self): + def get_data_files(self): """Generate list of '(package,src_dir,build_dir,filenames)' tuples""" data = [] if not self.packages: @@ -123,7 +118,7 @@ data.append((package, src_dir, build_dir, filenames)) return data - def find_data_files (self, package, src_dir): + def find_data_files(self, package, src_dir): """Return filenames for package's data files in 'src_dir'""" globs = (self.package_data.get('', []) + self.package_data.get(package, [])) @@ -135,7 +130,7 @@ files.extend([fn for fn in filelist if fn not in files]) return files - def build_package_data (self): + def build_package_data(self): """Copy data files into build directory""" lastdir = None for package, src_dir, build_dir, filenames in self.data_files: @@ -145,23 +140,23 @@ self.copy_file(os.path.join(src_dir, filename), target, preserve_mode=False) - def get_package_dir (self, package): + def get_package_dir(self, package): """Return the directory, relative to the top of the source distribution, where package 'package' should be found (at least according to the 'package_dir' option, if any).""" - path = string.split(package, '.') + path = package.split('.') if not self.package_dir: if path: - return apply(os.path.join, path) + return os.path.join(*path) else: return '' else: tail = [] while path: try: - pdir = self.package_dir[string.join(path, '.')] + pdir = self.package_dir['.'.join(path)] except KeyError: tail.insert(0, path[-1]) del path[-1] @@ -181,27 +176,23 @@ tail.insert(0, pdir) if tail: - return apply(os.path.join, tail) + return os.path.join(*tail) else: return '' - # get_package_dir () - - - def check_package (self, package, package_dir): - + def check_package(self, package, package_dir): # Empty dir name means current directory, which we can probably # assume exists. Also, os.path.exists and isdir don't know about # my "empty string means current dir" convention, so we have to # circumvent them. if package_dir != "": if not os.path.exists(package_dir): - raise DistutilsFileError, \ - "package directory '%s' does not exist" % package_dir + raise DistutilsFileError( + "package directory '%s' does not exist" % package_dir) if not os.path.isdir(package_dir): - raise DistutilsFileError, \ - ("supposed package directory '%s' exists, " + - "but is not a directory") % package_dir + raise DistutilsFileError( + "supposed package directory '%s' exists, " + "but is not a directory" % package_dir) # Require __init__.py for all but the "root package" if package: @@ -216,20 +207,14 @@ # __init__.py doesn't exist -- so don't return the filename. return None - # check_package () - - - def check_module (self, module, module_file): + def check_module(self, module, module_file): if not os.path.isfile(module_file): log.warn("file %s (for module %s) not found", module_file, module) - return 0 + return False else: - return 1 + return True - # check_module () - - - def find_package_modules (self, package, package_dir): + def find_package_modules(self, package, package_dir): self.check_package(package, package_dir) module_files = glob(os.path.join(package_dir, "*.py")) modules = [] @@ -244,8 +229,7 @@ self.debug_print("excluding %s" % setup_script) return modules - - def find_modules (self): + def find_modules(self): """Finds individually-specified Python modules, ie. those listed by module name in 'self.py_modules'. Returns a list of tuples (package, module_base, filename): 'package' is a tuple of the path through @@ -254,7 +238,6 @@ ".py" file (relative to the distribution root) that implements the module. """ - # Map package names to tuples of useful info about the package: # (package_dir, checked) # package_dir - the directory where we'll find source files for @@ -270,10 +253,9 @@ # just the "package" for a toplevel is empty (either an empty # string or empty list, depending on context). Differences: # - don't check for __init__.py in directory for empty package - for module in self.py_modules: - path = string.split(module, '.') - package = string.join(path[0:-1], '.') + path = module.split('.') + package = '.'.join(path[0:-1]) module_base = path[-1] try: @@ -299,16 +281,12 @@ return modules - # find_modules () - - - def find_all_modules (self): + def find_all_modules(self): """Compute the list of all modules that will be built, whether they are specified one-module-at-a-time ('self.py_modules') or by whole packages ('self.packages'). Return a list of tuples (package, module, module_file), just like 'find_modules()' and 'find_package_modules()' do.""" - modules = [] if self.py_modules: modules.extend(self.find_modules()) @@ -317,32 +295,20 @@ package_dir = self.get_package_dir(package) m = self.find_package_modules(package, package_dir) modules.extend(m) - return modules - # find_all_modules () - - - def get_source_files (self): - - modules = self.find_all_modules() - filenames = [] - for module in modules: - filenames.append(module[-1]) + def get_source_files(self): + return [module[-1] for module in self.find_all_modules()] - return filenames - - - def get_module_outfile (self, build_dir, package, module): + def get_module_outfile(self, build_dir, package, module): outfile_path = [build_dir] + list(package) + [module + ".py"] return os.path.join(*outfile_path) - - def get_outputs (self, include_bytecode=1): + def get_outputs(self, include_bytecode=1): modules = self.find_all_modules() outputs = [] for (package, module, module_file) in modules: - package = string.split(package, '.') + package = package.split('.') filename = self.get_module_outfile(self.build_lib, package, module) outputs.append(filename) if include_bytecode: @@ -359,13 +325,12 @@ return outputs - - def build_module (self, module, module_file, package): - if type(package) is StringType: - package = string.split(package, '.') - elif type(package) not in (ListType, TupleType): - raise TypeError, \ - "'package' must be a string (dot-separated), list, or tuple" + def build_module(self, module, module_file, package): + if isinstance(package, str): + package = package.split('.') + elif not isinstance(package, (list, tuple)): + raise TypeError( + "'package' must be a string (dot-separated), list, or tuple") # Now put the module source file into the "build" area -- this is # easy, we just copy it somewhere under self.build_lib (the build @@ -375,9 +340,7 @@ self.mkpath(dir) return self.copy_file(module_file, outfile, preserve_mode=0) - - def build_modules (self): - + def build_modules(self): modules = self.find_modules() for (package, module, module_file) in modules: @@ -387,11 +350,7 @@ # under self.build_lib.) self.build_module(module, module_file, package) - # build_modules () - - - def build_packages (self): - + def build_packages(self): for package in self.packages: # Get list of (package, module, module_file) tuples based on @@ -412,10 +371,7 @@ assert package == package_ self.build_module(module, module_file, package) - # build_packages () - - - def byte_compile (self, files): + def byte_compile(self, files): from distutils.util import byte_compile prefix = self.build_lib if prefix[-1] != os.sep: @@ -431,5 +387,3 @@ if self.optimize > 0: byte_compile(files, optimize=self.optimize, force=self.force, prefix=prefix, dry_run=self.dry_run) - -# class build_py Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/cygwinccompiler.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/cygwinccompiler.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/cygwinccompiler.py Wed Aug 5 15:32:47 2009 @@ -50,16 +50,15 @@ import os import sys import copy -from subprocess import Popen, PIPE import re +from warnings import warn from distutils.ccompiler import gen_preprocess_options, gen_lib_options from distutils.unixccompiler import UnixCCompiler from distutils.file_util import write_file from distutils.errors import DistutilsExecError, CompileError, UnknownFileError from distutils import log -from distutils.version import LooseVersion -from distutils.spawn import find_executable +from distutils.util import get_compiler_versions def get_msvcr(): """Include the appropriate MSVC runtime library if Python was built @@ -110,7 +109,7 @@ % details) self.gcc_version, self.ld_version, self.dllwrap_version = \ - get_versions() + get_compiler_versions() self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" % (self.gcc_version, self.ld_version, @@ -359,31 +358,26 @@ return (CONFIG_H_UNCERTAIN, "couldn't read '%s': %s" % (fn, exc.strerror)) -RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)') +class _Deprecated_SRE_Pattern(object): + def __init__(self, pattern): + self.pattern = pattern + + def __getattr__(self, name): + if name in ('findall', 'finditer', 'match', 'scanner', 'search', + 'split', 'sub', 'subn'): + warn("'distutils.cygwinccompiler.RE_VERSION' is deprecated " + "and will be removed in the next version", DeprecationWarning) + return getattr(self.pattern, name) -def _find_exe_version(cmd): - """Find the version of an executable by running `cmd` in the shell. - - If the command is not found, or the output does not match - `RE_VERSION`, returns None. - """ - executable = cmd.split()[0] - if find_executable(executable) is None: - return None - out = Popen(cmd, shell=True, stdout=PIPE).stdout - try: - out_string = out.read() - finally: - out.close() - result = RE_VERSION.search(out_string) - if result is None: - return None - return LooseVersion(result.group(1)) +RE_VERSION = _Deprecated_SRE_Pattern(re.compile('(\d+\.\d+(\.\d+)*)')) def get_versions(): """ Try to find out the versions of gcc, ld and dllwrap. If not possible it returns None for it. """ - commands = ['gcc -dumpversion', 'ld -v', 'dllwrap --version'] - return tuple([_find_exe_version(cmd) for cmd in commands]) + warn("'distutils.cygwinccompiler.get_versions' is deprecated " + "use 'distutils.util.get_compiler_versions' instead", + DeprecationWarning) + + return get_compiler_versions() Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/dist.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/dist.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/dist.py Wed Aug 5 15:32:47 2009 @@ -602,14 +602,14 @@ options = self.global_options parser.set_option_table(options) parser.print_help(self.common_usage + "\nGlobal options:") - self.announce('') + print('') if display_options: parser.set_option_table(self.display_options) parser.print_help( "Information display options (just display " + "information, ignore any commands)") - self.announce('') + print('') for command in self.commands: if isinstance(command, type) and issubclass(command, Command): @@ -623,9 +623,9 @@ else: parser.set_option_table(klass.user_options) parser.print_help("Options for '%s' command:" % klass.__name__) - self.announce('') + print('') - self.announce(gen_usage(self.script_name)) + print(gen_usage(self.script_name)) def handle_display_options(self, option_order): """If there were any non-global "display-only" options @@ -640,8 +640,8 @@ # we ignore "foo bar"). if self.help_commands: self.print_commands() - self.announce('') - self.announce(gen_usage(self.script_name)) + print('') + print(gen_usage(self.script_name)) return 1 # If user supplied any of the "display metadata" options, then @@ -657,12 +657,12 @@ opt = translate_longopt(opt) value = getattr(self.metadata, "get_"+opt)() if opt in ['keywords', 'platforms']: - self.announce(','.join(value)) + print(','.join(value)) elif opt in ('classifiers', 'provides', 'requires', 'obsoletes'): - self.announce('\n'.join(value)) + print('\n'.join(value)) else: - self.announce(value) + print(value) any_display_options = 1 return any_display_options @@ -671,7 +671,7 @@ """Print a subset of the list of all commands -- used by 'print_commands()'. """ - self.announce(header + ":") + print(header + ":") for cmd in commands: klass = self.cmdclass.get(cmd) @@ -682,7 +682,7 @@ except AttributeError: description = "(no description available)" - self.announce(" %-*s %s" % (max_length, cmd, description)) + print(" %-*s %s" % (max_length, cmd, description)) def print_commands(self): """Print out a help message listing all available commands with a @@ -914,8 +914,8 @@ # -- Methods that operate on the Distribution ---------------------- - def announce(self, msg, level=1): - log.debug(msg) + def announce(self, msg, level=log.INFO): + log.log(level, msg) def run_commands(self): """Run each command that was seen on the setup script command line. Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/emxccompiler.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/emxccompiler.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/emxccompiler.py Wed Aug 5 15:32:47 2009 @@ -21,12 +21,15 @@ __revision__ = "$Id$" -import os,sys,copy +import os, sys, copy +from warnings import warn + from distutils.ccompiler import gen_preprocess_options, gen_lib_options from distutils.unixccompiler import UnixCCompiler from distutils.file_util import write_file from distutils.errors import DistutilsExecError, CompileError, UnknownFileError from distutils import log +from distutils.util import get_compiler_versions class EMXCCompiler (UnixCCompiler): @@ -55,8 +58,8 @@ ("Reason: %s." % details) + "Compiling may fail because of undefined preprocessor macros.") - (self.gcc_version, self.ld_version) = \ - get_versions() + gcc_version, ld_version, dllwrap_version = get_compiler_versions() + self.gcc_version, self.ld_version = gcc_version, ld_version self.debug_print(self.compiler_type + ": gcc %s, ld %s\n" % (self.gcc_version, self.ld_version) ) @@ -293,23 +296,11 @@ """ Try to find out the versions of gcc and ld. If not possible it returns None for it. """ - from distutils.version import StrictVersion - from distutils.spawn import find_executable - import re - - gcc_exe = find_executable('gcc') - if gcc_exe: - out = os.popen(gcc_exe + ' -dumpversion','r') - out_string = out.read() - out.close() - result = re.search('(\d+\.\d+\.\d+)',out_string) - if result: - gcc_version = StrictVersion(result.group(1)) - else: - gcc_version = None - else: - gcc_version = None + warn("'distutils.emxccompiler.get_versions' is deprecated " + "use 'distutils.util.get_compiler_versions' instead", + DeprecationWarning) + # EMX ld has no way of reporting version number, and we use GCC # anyway - so we can link OMF DLLs - ld_version = None - return (gcc_version, ld_version) + gcc_version, ld_version, dllwrap_version = get_compiler_versions() + return gcc_version, None Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/extension.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/extension.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/extension.py Wed Aug 5 15:32:47 2009 @@ -103,10 +103,11 @@ optional=None, **kw # To catch unknown keywords ): - assert isinstance(name, str), "'name' must be a string" - assert (isinstance(sources, list) and - all(isinstance(v, str) for v in sources)), \ - "'sources' must be a list of strings" + if not isinstance(name, str): + raise AssertionError("'name' must be a string") + if not (isinstance(sources, list) and + all(isinstance(v, str) for v in sources)): + raise AssertionError("'sources' must be a list of strings") self.name = name self.sources = sources Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/file_util.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/file_util.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/file_util.py Wed Aug 5 15:32:47 2009 @@ -10,49 +10,48 @@ from distutils import log # for generating verbose output in 'copy_file()' -_copy_action = { None: 'copying', - 'hard': 'hard linking', - 'sym': 'symbolically linking' } +_copy_action = {None: 'copying', + 'hard': 'hard linking', + 'sym': 'symbolically linking'} -def _copy_file_contents (src, dst, buffer_size=16*1024): - """Copy the file 'src' to 'dst'; both must be filenames. Any error - opening either file, reading from 'src', or writing to 'dst', raises - DistutilsFileError. Data is read/written in chunks of 'buffer_size' - bytes (default 16k). No attempt is made to handle anything apart from - regular files. +def _copy_file_contents(src, dst, buffer_size=16*1024): + """Copy the file 'src' to 'dst'. + + Both must be filenames. Any error opening either file, reading from + 'src', or writing to 'dst', raises DistutilsFileError. Data is + read/written in chunks of 'buffer_size' bytes (default 16k). No attempt + is made to handle anything apart from regular files. """ # Stolen from shutil module in the standard library, but with # custom error-handling added. - fsrc = None fdst = None try: try: fsrc = open(src, 'rb') except os.error, (errno, errstr): - raise DistutilsFileError, \ - "could not open '%s': %s" % (src, errstr) + raise DistutilsFileError("could not open '%s': %s" % (src, errstr)) if os.path.exists(dst): try: os.unlink(dst) except os.error, (errno, errstr): - raise DistutilsFileError, \ - "could not delete '%s': %s" % (dst, errstr) + raise DistutilsFileError( + "could not delete '%s': %s" % (dst, errstr)) try: fdst = open(dst, 'wb') except os.error, (errno, errstr): - raise DistutilsFileError, \ - "could not create '%s': %s" % (dst, errstr) + raise DistutilsFileError( + "could not create '%s': %s" % (dst, errstr)) while 1: try: buf = fsrc.read(buffer_size) except os.error, (errno, errstr): - raise DistutilsFileError, \ - "could not read from '%s': %s" % (src, errstr) + raise DistutilsFileError( + "could not read from '%s': %s" % (src, errstr)) if not buf: break @@ -60,8 +59,8 @@ try: fdst.write(buf) except os.error, (errno, errstr): - raise DistutilsFileError, \ - "could not write to '%s': %s" % (dst, errstr) + raise DistutilsFileError( + "could not write to '%s': %s" % (dst, errstr)) finally: if fdst: @@ -69,25 +68,18 @@ if fsrc: fsrc.close() -# _copy_file_contents() - -def copy_file (src, dst, - preserve_mode=1, - preserve_times=1, - update=0, - link=None, - verbose=1, - dry_run=0): - - """Copy a file 'src' to 'dst'. If 'dst' is a directory, then 'src' is - copied there with the same name; otherwise, it must be a filename. (If - the file exists, it will be ruthlessly clobbered.) If 'preserve_mode' - is true (the default), the file's mode (type and permission bits, or - whatever is analogous on the current platform) is copied. If - 'preserve_times' is true (the default), the last-modified and - last-access times are copied as well. If 'update' is true, 'src' will - only be copied if 'dst' does not exist, or if 'dst' does exist but is - older than 'src'. +def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0, + link=None, verbose=1, dry_run=0): + """Copy a file 'src' to 'dst'. + + If 'dst' is a directory, then 'src' is copied there with the same name; + otherwise, it must be a filename. (If the file exists, it will be + ruthlessly clobbered.) If 'preserve_mode' is true (the default), + the file's mode (type and permission bits, or whatever is analogous on + the current platform) is copied. If 'preserve_times' is true (the + default), the last-modified and last-access times are copied as well. + If 'update' is true, 'src' will only be copied if 'dst' does not exist, + or if 'dst' does exist but is older than 'src'. 'link' allows you to make hard links (os.link) or symbolic links (os.symlink) instead of copying: set it to "hard" or "sym"; if it is @@ -113,8 +105,8 @@ from stat import ST_ATIME, ST_MTIME, ST_MODE, S_IMODE if not os.path.isfile(src): - raise DistutilsFileError, \ - "can't copy '%s': doesn't exist or not a regular file" % src + raise DistutilsFileError( + "can't copy '%s': doesn't exist or not a regular file" % src) if os.path.isdir(dst): dir = dst @@ -130,8 +122,7 @@ try: action = _copy_action[link] except KeyError: - raise ValueError, \ - "invalid value '%s' for 'link' argument" % link + raise ValueError("invalid value '%s' for 'link' argument" % link) if verbose >= 1: if os.path.basename(dst) == os.path.basename(src): @@ -148,8 +139,8 @@ try: macostools.copy(src, dst, 0, preserve_times) except os.error, exc: - raise DistutilsFileError, \ - "could not copy '%s' to '%s': %s" % (src, dst, exc[-1]) + raise DistutilsFileError( + "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])) # If linking (hard or symbolic), use the appropriate system call # (Unix only, of course, but that's the caller's responsibility) @@ -176,17 +167,13 @@ return (dst, 1) -# copy_file () - - # XXX I suspect this is Unix-specific -- need porting help! -def move_file (src, dst, - verbose=1, - dry_run=0): - - """Move a file 'src' to 'dst'. If 'dst' is a directory, the file will - be moved into it with the same name; otherwise, 'src' is just renamed - to 'dst'. Return the new full name of the file. +def move_file (src, dst, verbose=1, dry_run=0): + """Move a file 'src' to 'dst'. + + If 'dst' is a directory, the file will be moved into it with the same + name; otherwise, 'src' is just renamed to 'dst'. Return the new + full name of the file. Handles cross-device moves on Unix using 'copy_file()'. What about other systems??? @@ -201,20 +188,19 @@ return dst if not isfile(src): - raise DistutilsFileError, \ - "can't move '%s': not a regular file" % src + raise DistutilsFileError("can't move '%s': not a regular file" % src) if isdir(dst): dst = os.path.join(dst, basename(src)) elif exists(dst): - raise DistutilsFileError, \ - "can't move '%s': destination '%s' already exists" % \ - (src, dst) + raise DistutilsFileError( + "can't move '%s': destination '%s' already exists" % + (src, dst)) if not isdir(dirname(dst)): - raise DistutilsFileError, \ + raise DistutilsFileError( "can't move '%s': destination '%s' not a valid path" % \ - (src, dst) + (src, dst)) copy_it = 0 try: @@ -223,8 +209,8 @@ if num == errno.EXDEV: copy_it = 1 else: - raise DistutilsFileError, \ - "couldn't move '%s' to '%s': %s" % (src, dst, msg) + raise DistutilsFileError( + "couldn't move '%s' to '%s': %s" % (src, dst, msg)) if copy_it: copy_file(src, dst, verbose=verbose) @@ -235,15 +221,12 @@ os.unlink(dst) except os.error: pass - raise DistutilsFileError, \ + raise DistutilsFileError( ("couldn't move '%s' to '%s' by copy/delete: " + - "delete '%s' failed: %s") % \ - (src, dst, src, msg) - + "delete '%s' failed: %s") % + (src, dst, src, msg)) return dst -# move_file () - def write_file (filename, contents): """Create a file with the specified name and write 'contents' (a Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_archive_util.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_archive_util.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_archive_util.py Wed Aug 5 15:32:47 2009 @@ -47,7 +47,7 @@ # check if the compressed tarball was created tarball = base_name + '.tar.gz' - self.assert_(os.path.exists(tarball)) + self.assertTrue(os.path.exists(tarball)) # trying an uncompressed one base_name = os.path.join(tmpdir2, 'archive') @@ -58,7 +58,7 @@ finally: os.chdir(old_dir) tarball = base_name + '.tar' - self.assert_(os.path.exists(tarball)) + self.assertTrue(os.path.exists(tarball)) def _tarinfo(self, path): tar = tarfile.open(path) @@ -96,7 +96,7 @@ # check if the compressed tarball was created tarball = base_name + '.tar.gz' - self.assert_(os.path.exists(tarball)) + self.assertTrue(os.path.exists(tarball)) # now create another tarball using `tar` tarball2 = os.path.join(tmpdir, 'archive2.tar.gz') @@ -110,7 +110,7 @@ finally: os.chdir(old_dir) - self.assert_(os.path.exists(tarball2)) + self.assertTrue(os.path.exists(tarball2)) # let's compare both tarballs self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2)) @@ -123,7 +123,7 @@ finally: os.chdir(old_dir) tarball = base_name + '.tar' - self.assert_(os.path.exists(tarball)) + self.assertTrue(os.path.exists(tarball)) # now for a dry_run base_name = os.path.join(tmpdir2, 'archive') @@ -134,7 +134,7 @@ finally: os.chdir(old_dir) tarball = base_name + '.tar' - self.assert_(os.path.exists(tarball)) + self.assertTrue(os.path.exists(tarball)) @unittest.skipUnless(find_executable('compress'), 'The compress program is required') @@ -151,7 +151,7 @@ finally: os.chdir(old_dir) tarball = base_name + '.tar.Z' - self.assert_(os.path.exists(tarball)) + self.assertTrue(os.path.exists(tarball)) self.assertEquals(len(w.warnings), 1) # same test with dry_run @@ -165,7 +165,7 @@ dry_run=True) finally: os.chdir(old_dir) - self.assert_(not os.path.exists(tarball)) + self.assertTrue(not os.path.exists(tarball)) self.assertEquals(len(w.warnings), 1) @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run') Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_dumb.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_dumb.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_dumb.py Wed Aug 5 15:32:47 2009 @@ -71,6 +71,21 @@ # now let's check what we have in the zip file # XXX to be done + def test_finalize_options(self): + pkg_dir, dist = self.create_dist() + os.chdir(pkg_dir) + cmd = bdist_dumb(dist) + self.assertEquals(cmd.bdist_dir, None) + cmd.finalize_options() + + # bdist_dir is initialized to bdist_base/dumb if not set + base = cmd.get_finalized_command('bdist').bdist_base + self.assertEquals(cmd.bdist_dir, os.path.join(base, 'dumb')) + + # the format is set to a default value depending on the os.name + default = cmd.default_format[os.name] + self.assertEquals(cmd.format, default) + def test_suite(): return unittest.makeSuite(BuildDumbTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_rpm.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_rpm.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_rpm.py Wed Aug 5 15:32:47 2009 @@ -74,7 +74,7 @@ cmd.run() dist_created = os.listdir(os.path.join(pkg_dir, 'dist')) - self.assert_('foo-0.1-1.noarch.rpm' in dist_created) + self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created) def test_no_optimize_flag(self): @@ -114,7 +114,7 @@ cmd.run() dist_created = os.listdir(os.path.join(pkg_dir, 'dist')) - self.assert_('foo-0.1-1.noarch.rpm' in dist_created) + self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created) os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm')) def test_suite(): Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_wininst.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_wininst.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_bdist_wininst.py Wed Aug 5 15:32:47 2009 @@ -21,7 +21,7 @@ # and make sure it finds it and returns its content # no matter what platform we have exe_file = cmd.get_exe_bytes() - self.assert_(len(exe_file) > 10) + self.assertTrue(len(exe_file) > 10) def test_suite(): return unittest.makeSuite(BuildWinInstTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_clib.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_clib.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_clib.py Wed Aug 5 15:32:47 2009 @@ -135,7 +135,7 @@ cmd.run() # let's check the result - self.assert_('libfoo.a' in os.listdir(build_temp)) + self.assertTrue('libfoo.a' in os.listdir(build_temp)) def test_suite(): return unittest.makeSuite(BuildCLibTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_ext.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_ext.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_ext.py Wed Aug 5 15:32:47 2009 @@ -3,6 +3,9 @@ import tempfile import shutil from StringIO import StringIO +import warnings +from test.test_support import check_warnings +from test.test_support import captured_stdout from distutils.core import Extension, Distribution from distutils.command.build_ext import build_ext @@ -73,15 +76,15 @@ import xx for attr in ('error', 'foo', 'new', 'roj'): - self.assert_(hasattr(xx, attr)) + self.assertTrue(hasattr(xx, attr)) self.assertEquals(xx.foo(2, 5), 7) self.assertEquals(xx.foo(13,15), 28) self.assertEquals(xx.new().demo(), None) doc = 'This is a template module just for instruction.' self.assertEquals(xx.__doc__, doc) - self.assert_(isinstance(xx.Null(), xx.Null)) - self.assert_(isinstance(xx.Str(), xx.Str)) + self.assertTrue(isinstance(xx.Null(), xx.Null)) + self.assertTrue(isinstance(xx.Str(), xx.Str)) def tearDown(self): # Get everything back to normal @@ -114,7 +117,7 @@ _config_vars['Py_ENABLE_SHARED'] = old_var # make sure we get some library dirs under solaris - self.assert_(len(cmd.library_dirs) > 0) + self.assertTrue(len(cmd.library_dirs) > 0) def test_user_site(self): # site.USER_SITE was introduced in 2.6 @@ -128,7 +131,7 @@ # making sure the user option is there options = [name for name, short, lable in cmd.user_options] - self.assert_('user' in options) + self.assertTrue('user' in options) # setting a value cmd.user = 1 @@ -144,9 +147,9 @@ # see if include_dirs and library_dirs # were set - self.assert_(lib in cmd.library_dirs) - self.assert_(lib in cmd.rpath) - self.assert_(incl in cmd.include_dirs) + self.assertTrue(lib in cmd.library_dirs) + self.assertTrue(lib in cmd.rpath) + self.assertTrue(incl in cmd.include_dirs) def test_optional_extension(self): @@ -175,10 +178,10 @@ from distutils import sysconfig py_include = sysconfig.get_python_inc() - self.assert_(py_include in cmd.include_dirs) + self.assertTrue(py_include in cmd.include_dirs) plat_py_include = sysconfig.get_python_inc(plat_specific=1) - self.assert_(plat_py_include in cmd.include_dirs) + self.assertTrue(plat_py_include in cmd.include_dirs) # make sure cmd.libraries is turned into a list # if it's a string @@ -192,7 +195,7 @@ cmd = build_ext(dist) cmd.library_dirs = 'my_lib_dir' cmd.finalize_options() - self.assert_('my_lib_dir' in cmd.library_dirs) + self.assertTrue('my_lib_dir' in cmd.library_dirs) # make sure rpath is turned into a list # if it's a list of os.pathsep's paths @@ -257,13 +260,13 @@ 'some': 'bar'})] cmd.check_extensions_list(exts) ext = exts[0] - self.assert_(isinstance(ext, Extension)) + self.assertTrue(isinstance(ext, Extension)) # check_extensions_list adds in ext the values passed # when they are in ('include_dirs', 'library_dirs', 'libraries' # 'extra_objects', 'extra_compile_args', 'extra_link_args') self.assertEquals(ext.libraries, 'foo') - self.assert_(not hasattr(ext, 'some')) + self.assertTrue(not hasattr(ext, 'some')) # 'macros' element of build info dict must be 1- or 2-tuple exts = [('foo.bar', {'sources': [''], 'libraries': 'foo', @@ -321,7 +324,7 @@ so_file = cmd.get_outputs()[0] finally: os.chdir(old_wd) - self.assert_(os.path.exists(so_file)) + self.assertTrue(os.path.exists(so_file)) self.assertEquals(os.path.splitext(so_file)[-1], sysconfig.get_config_var('SO')) so_dir = os.path.dirname(so_file) @@ -330,19 +333,19 @@ cmd.inplace = 0 cmd.run() so_file = cmd.get_outputs()[0] - self.assert_(os.path.exists(so_file)) + self.assertTrue(os.path.exists(so_file)) self.assertEquals(os.path.splitext(so_file)[-1], sysconfig.get_config_var('SO')) so_dir = os.path.dirname(so_file) self.assertEquals(so_dir, cmd.build_lib) # inplace = 0, cmd.package = 'bar' - cmd.package = 'bar' + build_py = cmd.get_finalized_command('build_py') + build_py.package_dir = {'': 'bar'} path = cmd.get_ext_fullpath('foo') - # checking that the last directory is bar + # checking that the last directory is the build_dir path = os.path.split(path)[0] - lastdir = os.path.split(path)[-1] - self.assertEquals(lastdir, cmd.package) + self.assertEquals(path, cmd.build_lib) # inplace = 1, cmd.package = 'bar' cmd.inplace = 1 @@ -356,7 +359,65 @@ # checking that the last directory is bar path = os.path.split(path)[0] lastdir = os.path.split(path)[-1] - self.assertEquals(lastdir, cmd.package) + self.assertEquals(lastdir, 'bar') + + def test_ext_fullpath(self): + ext = sysconfig.get_config_vars()['SO'] + # building lxml.etree inplace + #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c') + #etree_ext = Extension('lxml.etree', [etree_c]) + #dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]}) + dist = Distribution() + cmd = build_ext(dist) + cmd.inplace = 1 + cmd.distribution.package_dir = {'': 'src'} + cmd.distribution.packages = ['lxml', 'lxml.html'] + curdir = os.getcwd() + wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext) + path = cmd.get_ext_fullpath('lxml.etree') + self.assertEquals(wanted, path) + + # building lxml.etree not inplace + cmd.inplace = 0 + cmd.build_lib = os.path.join(curdir, 'tmpdir') + wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext) + path = cmd.get_ext_fullpath('lxml.etree') + self.assertEquals(wanted, path) + + # building twisted.runner.portmap not inplace + build_py = cmd.get_finalized_command('build_py') + build_py.package_dir = {} + cmd.distribution.packages = ['twisted', 'twisted.runner.portmap'] + path = cmd.get_ext_fullpath('twisted.runner.portmap') + wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner', + 'portmap' + ext) + self.assertEquals(wanted, path) + + # building twisted.runner.portmap inplace + cmd.inplace = 1 + path = cmd.get_ext_fullpath('twisted.runner.portmap') + wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext) + self.assertEquals(wanted, path) + + def test_compiler_deprecation_warning(self): + dist = Distribution() + cmd = build_ext(dist) + + class MyCompiler(object): + def do_something(self): + pass + + with check_warnings() as w: + warnings.simplefilter("always") + cmd.compiler = MyCompiler() + self.assertEquals(len(w.warnings), 1) + cmd.compile = 'unix' + self.assertEquals(len(w.warnings), 1) + cmd.compiler = MyCompiler() + cmd.compiler.do_something() + # two more warnings genereated by the get + # and the set + self.assertEquals(len(w.warnings), 3) def test_suite(): src = _get_source_filename() Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_py.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_py.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_py.py Wed Aug 5 15:32:47 2009 @@ -52,9 +52,9 @@ self.assertEqual(len(cmd.get_outputs()), 3) pkgdest = os.path.join(destination, "pkg") files = os.listdir(pkgdest) - self.assert_("__init__.py" in files) - self.assert_("__init__.pyc" in files) - self.assert_("README.txt" in files) + self.assertTrue("__init__.py" in files) + self.assertTrue("__init__.pyc" in files) + self.assertTrue("README.txt" in files) def test_empty_package_dir (self): # See SF 1668596/1720897. Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_scripts.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_scripts.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_build_scripts.py Wed Aug 5 15:32:47 2009 @@ -16,12 +16,12 @@ def test_default_settings(self): cmd = self.get_build_scripts_cmd("/foo/bar", []) - self.assert_(not cmd.force) - self.assert_(cmd.build_dir is None) + self.assertTrue(not cmd.force) + self.assertTrue(cmd.build_dir is None) cmd.finalize_options() - self.assert_(cmd.force) + self.assertTrue(cmd.force) self.assertEqual(cmd.build_dir, "/foo/bar") def test_build(self): @@ -37,7 +37,7 @@ built = os.listdir(target) for name in expected: - self.assert_(name in built) + self.assertTrue(name in built) def get_build_scripts_cmd(self, target, scripts): import sys @@ -100,7 +100,7 @@ built = os.listdir(target) for name in expected: - self.assert_(name in built) + self.assertTrue(name in built) def test_suite(): return unittest.makeSuite(BuildScriptsTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_clean.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_clean.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_clean.py Wed Aug 5 15:32:47 2009 @@ -35,7 +35,7 @@ # make sure the files where removed for name, path in dirs: - self.assert_(not os.path.exists(path), + self.assertTrue(not os.path.exists(path), '%s was not removed' % path) # let's run the command again (should spit warnings but suceed) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_cmd.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_cmd.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_cmd.py Wed Aug 5 15:32:47 2009 @@ -70,7 +70,7 @@ cmd.option2 = None cmd.ensure_string('option2', 'xxx') - self.assert_(hasattr(cmd, 'option2')) + self.assertTrue(hasattr(cmd, 'option2')) cmd.option3 = 1 self.assertRaises(DistutilsOptionError, cmd.ensure_string, 'option3') Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_config.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_config.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_config.py Wed Aug 5 15:32:47 2009 @@ -105,9 +105,9 @@ def test_server_empty_registration(self): cmd = self._cmd(self.dist) rc = cmd._get_rc_file() - self.assert_(not os.path.exists(rc)) + self.assertTrue(not os.path.exists(rc)) cmd._store_pypirc('tarek', 'xxx') - self.assert_(os.path.exists(rc)) + self.assertTrue(os.path.exists(rc)) content = open(rc).read() self.assertEquals(content, WANTED) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_config_cmd.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_config_cmd.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_config_cmd.py Wed Aug 5 15:32:47 2009 @@ -73,14 +73,14 @@ self.write_file(f2, 'xxx') for f in (f1, f2): - self.assert_(os.path.exists(f)) + self.assertTrue(os.path.exists(f)) pkg_dir, dist = self.create_dist() cmd = config(dist) cmd._clean(f1, f2) for f in (f1, f2): - self.assert_(not os.path.exists(f)) + self.assertTrue(not os.path.exists(f)) def test_suite(): return unittest.makeSuite(ConfigTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_cygwinccompiler.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_cygwinccompiler.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_cygwinccompiler.py Wed Aug 5 15:32:47 2009 @@ -2,28 +2,19 @@ import unittest import sys import os -from StringIO import StringIO -import subprocess +import warnings + +from test.test_support import check_warnings +from test.test_support import captured_stdout from distutils import cygwinccompiler from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h, CONFIG_H_OK, CONFIG_H_NOTOK, CONFIG_H_UNCERTAIN, get_versions, - get_msvcr) + get_msvcr, RE_VERSION) +from distutils.util import get_compiler_versions from distutils.tests import support -class FakePopen(object): - test_class = None - - def __init__(self, cmd, shell, stdout): - self.cmd = cmd.split()[0] - exes = self.test_class._exes - if self.cmd in exes: - self.stdout = StringIO(exes[self.cmd]) - else: - self.stdout = os.popen(cmd, 'r') - - class CygwinCCompilerTestCase(support.TempdirManager, unittest.TestCase): @@ -34,29 +25,16 @@ from distutils import sysconfig self.old_get_config_h_filename = sysconfig.get_config_h_filename sysconfig.get_config_h_filename = self._get_config_h_filename - self.old_find_executable = cygwinccompiler.find_executable - cygwinccompiler.find_executable = self._find_executable - self._exes = {} - self.old_popen = cygwinccompiler.Popen - FakePopen.test_class = self - cygwinccompiler.Popen = FakePopen def tearDown(self): sys.version = self.version from distutils import sysconfig sysconfig.get_config_h_filename = self.old_get_config_h_filename - cygwinccompiler.find_executable = self.old_find_executable - cygwinccompiler.Popen = self.old_popen super(CygwinCCompilerTestCase, self).tearDown() def _get_config_h_filename(self): return self.python_h - def _find_executable(self, name): - if name in self._exes: - return name - return None - def test_check_config_h(self): # check_config_h looks for "GCC" in sys.version first @@ -80,40 +58,6 @@ self.write_file(self.python_h, 'xxx __GNUC__ xxx') self.assertEquals(check_config_h()[0], CONFIG_H_OK) - def test_get_versions(self): - - # get_versions calls distutils.spawn.find_executable on - # 'gcc', 'ld' and 'dllwrap' - self.assertEquals(get_versions(), (None, None, None)) - - # Let's fake we have 'gcc' and it returns '3.4.5' - self._exes['gcc'] = 'gcc (GCC) 3.4.5 (mingw special)\nFSF' - res = get_versions() - self.assertEquals(str(res[0]), '3.4.5') - - # and let's see what happens when the version - # doesn't match the regular expression - # (\d+\.\d+(\.\d+)*) - self._exes['gcc'] = 'very strange output' - res = get_versions() - self.assertEquals(res[0], None) - - # same thing for ld - self._exes['ld'] = 'GNU ld version 2.17.50 20060824' - res = get_versions() - self.assertEquals(str(res[1]), '2.17.50') - self._exes['ld'] = '@(#)PROGRAM:ld PROJECT:ld64-77' - res = get_versions() - self.assertEquals(res[1], None) - - # and dllwrap - self._exes['dllwrap'] = 'GNU dllwrap 2.17.50 20060824\nFSF' - res = get_versions() - self.assertEquals(str(res[2]), '2.17.50') - self._exes['dllwrap'] = 'Cheese Wrap' - res = get_versions() - self.assertEquals(res[2], None) - def test_get_msvcr(self): # none @@ -146,6 +90,21 @@ '[MSC v.1999 32 bits (Intel)]') self.assertRaises(ValueError, get_msvcr) + + def test_get_version_deprecated(self): + with check_warnings() as w: + warnings.simplefilter("always") + # make sure get_compiler_versions and get_versions + # returns the same thing + self.assertEquals(get_compiler_versions(), get_versions()) + # make sure using get_version() generated a warning + self.assertEquals(len(w.warnings), 1) + # make sure any usage of RE_VERSION will also + # generate a warning, but till works + version = RE_VERSION.search('1.2').group(1) + self.assertEquals(version, '1.2') + self.assertEquals(len(w.warnings), 2) + def test_suite(): return unittest.makeSuite(CygwinCCompilerTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_dist.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_dist.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_dist.py Wed Aug 5 15:32:47 2009 @@ -73,7 +73,7 @@ self.assertEqual(d.get_command_packages(), ["distutils.command", "foo.bar", "distutils.tests"]) cmd = d.get_command_obj("test_dist") - self.assert_(isinstance(cmd, test_dist)) + self.assertTrue(isinstance(cmd, test_dist)) self.assertEqual(cmd.sample_option, "sometext") def test_command_packages_configfile(self): @@ -165,24 +165,6 @@ self.assertEquals(dist.metadata.platforms, ['one', 'two']) self.assertEquals(dist.metadata.keywords, ['one', 'two']) - def test_show_help(self): - class FancyGetopt(object): - def __init__(self): - self.count = 0 - - def set_option_table(self, *args): - pass - - def print_help(self, *args): - self.count += 1 - - parser = FancyGetopt() - dist = Distribution() - dist.commands = ['sdist'] - dist.script_name = 'setup.py' - dist._show_help(parser) - self.assertEquals(parser.count, 3) - def test_get_command_packages(self): dist = Distribution() self.assertEquals(dist.command_packages, None) @@ -204,10 +186,10 @@ "version": "1.0"} dist = Distribution(attrs) meta = self.format_metadata(dist) - self.assert_("Metadata-Version: 1.0" in meta) - self.assert_("provides:" not in meta.lower()) - self.assert_("requires:" not in meta.lower()) - self.assert_("obsoletes:" not in meta.lower()) + self.assertTrue("Metadata-Version: 1.0" in meta) + self.assertTrue("provides:" not in meta.lower()) + self.assertTrue("requires:" not in meta.lower()) + self.assertTrue("obsoletes:" not in meta.lower()) def test_provides(self): attrs = {"name": "package", @@ -219,9 +201,9 @@ self.assertEqual(dist.get_provides(), ["package", "package.sub"]) meta = self.format_metadata(dist) - self.assert_("Metadata-Version: 1.1" in meta) - self.assert_("requires:" not in meta.lower()) - self.assert_("obsoletes:" not in meta.lower()) + self.assertTrue("Metadata-Version: 1.1" in meta) + self.assertTrue("requires:" not in meta.lower()) + self.assertTrue("obsoletes:" not in meta.lower()) def test_provides_illegal(self): self.assertRaises(ValueError, Distribution, @@ -239,11 +221,11 @@ self.assertEqual(dist.get_requires(), ["other", "another (==1.0)"]) meta = self.format_metadata(dist) - self.assert_("Metadata-Version: 1.1" in meta) - self.assert_("provides:" not in meta.lower()) - self.assert_("Requires: other" in meta) - self.assert_("Requires: another (==1.0)" in meta) - self.assert_("obsoletes:" not in meta.lower()) + self.assertTrue("Metadata-Version: 1.1" in meta) + self.assertTrue("provides:" not in meta.lower()) + self.assertTrue("Requires: other" in meta) + self.assertTrue("Requires: another (==1.0)" in meta) + self.assertTrue("obsoletes:" not in meta.lower()) def test_requires_illegal(self): self.assertRaises(ValueError, Distribution, @@ -261,11 +243,11 @@ self.assertEqual(dist.get_obsoletes(), ["other", "another (<1.0)"]) meta = self.format_metadata(dist) - self.assert_("Metadata-Version: 1.1" in meta) - self.assert_("provides:" not in meta.lower()) - self.assert_("requires:" not in meta.lower()) - self.assert_("Obsoletes: other" in meta) - self.assert_("Obsoletes: another (<1.0)" in meta) + self.assertTrue("Metadata-Version: 1.1" in meta) + self.assertTrue("provides:" not in meta.lower()) + self.assertTrue("requires:" not in meta.lower()) + self.assertTrue("Obsoletes: other" in meta) + self.assertTrue("Obsoletes: another (<1.0)" in meta) def test_obsoletes_illegal(self): self.assertRaises(ValueError, Distribution, @@ -299,14 +281,14 @@ if sys.platform in ('linux', 'darwin'): self.environ['HOME'] = temp_dir files = dist.find_config_files() - self.assert_(user_filename in files) + self.assertTrue(user_filename in files) # win32-style if sys.platform == 'win32': # home drive should be found self.environ['HOME'] = temp_dir files = dist.find_config_files() - self.assert_(user_filename in files, + self.assertTrue(user_filename in files, '%r not found in %r' % (user_filename, files)) finally: os.remove(user_filename) @@ -332,7 +314,7 @@ output = [line for line in s.getvalue().split('\n') if line.strip() != ''] - self.assert_(len(output) > 0) + self.assertTrue(len(output) > 0) def test_suite(): suite = unittest.TestSuite() Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_file_util.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_file_util.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_file_util.py Wed Aug 5 15:32:47 2009 @@ -3,7 +3,7 @@ import os import shutil -from distutils.file_util import move_file +from distutils.file_util import move_file, write_file, copy_file from distutils import log from distutils.tests import support @@ -55,6 +55,21 @@ wanted = ['moving %s -> %s' % (self.source, self.target_dir)] self.assertEquals(self._logs, wanted) + def test_write_file(self): + lines = ['a', 'b', 'c'] + dir = self.mkdtemp() + foo = os.path.join(dir, 'foo') + write_file(foo, lines) + content = [line.strip() for line in open(foo).readlines()] + self.assertEquals(content, lines) + + def test_copy_file(self): + src_dir = self.mkdtemp() + foo = os.path.join(src_dir, 'foo') + write_file(foo, 'content') + dst_dir = self.mkdtemp() + copy_file(foo, dst_dir) + self.assertTrue(os.path.exists(os.path.join(dst_dir, 'foo'))) def test_suite(): return unittest.makeSuite(FileUtilTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install.py Wed Aug 5 15:32:47 2009 @@ -88,7 +88,7 @@ def _test_user_site(self): for key in ('nt_user', 'unix_user', 'os2_home'): - self.assert_(key in INSTALL_SCHEMES) + self.assertTrue(key in INSTALL_SCHEMES) dist = Distribution({'name': 'xx'}) cmd = install(dist) @@ -96,24 +96,24 @@ # making sure the user option is there options = [name for name, short, lable in cmd.user_options] - self.assert_('user' in options) + self.assertTrue('user' in options) # setting a value cmd.user = 1 # user base and site shouldn't be created yet - self.assert_(not os.path.exists(self.user_base)) - self.assert_(not os.path.exists(self.user_site)) + self.assertTrue(not os.path.exists(self.user_base)) + self.assertTrue(not os.path.exists(self.user_site)) # let's run finalize cmd.ensure_finalized() # now they should - self.assert_(os.path.exists(self.user_base)) - self.assert_(os.path.exists(self.user_site)) + self.assertTrue(os.path.exists(self.user_base)) + self.assertTrue(os.path.exists(self.user_site)) - self.assert_('userbase' in cmd.config_vars) - self.assert_('usersite' in cmd.config_vars) + self.assertTrue('userbase' in cmd.config_vars) + self.assertTrue('usersite' in cmd.config_vars) def test_handle_extra_path(self): dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'}) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_data.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_data.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_data.py Wed Aug 5 15:32:47 2009 @@ -35,9 +35,9 @@ # let's check the result self.assertEquals(len(cmd.get_outputs()), 2) rtwo = os.path.split(two)[-1] - self.assert_(os.path.exists(os.path.join(inst2, rtwo))) + self.assertTrue(os.path.exists(os.path.join(inst2, rtwo))) rone = os.path.split(one)[-1] - self.assert_(os.path.exists(os.path.join(inst, rone))) + self.assertTrue(os.path.exists(os.path.join(inst, rone))) cmd.outfiles = [] # let's try with warn_dir one @@ -47,8 +47,8 @@ # let's check the result self.assertEquals(len(cmd.get_outputs()), 2) - self.assert_(os.path.exists(os.path.join(inst2, rtwo))) - self.assert_(os.path.exists(os.path.join(inst, rone))) + self.assertTrue(os.path.exists(os.path.join(inst2, rtwo))) + self.assertTrue(os.path.exists(os.path.join(inst, rone))) cmd.outfiles = [] # now using root and empty dir @@ -65,8 +65,8 @@ # let's check the result self.assertEquals(len(cmd.get_outputs()), 4) - self.assert_(os.path.exists(os.path.join(inst2, rtwo))) - self.assert_(os.path.exists(os.path.join(inst, rone))) + self.assertTrue(os.path.exists(os.path.join(inst2, rtwo))) + self.assertTrue(os.path.exists(os.path.join(inst, rone))) def test_suite(): return unittest.makeSuite(InstallDataTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_lib.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_lib.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_lib.py Wed Aug 5 15:32:47 2009 @@ -39,8 +39,8 @@ f = os.path.join(pkg_dir, 'foo.py') self.write_file(f, '# python file') cmd.byte_compile([f]) - self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyc'))) - self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyo'))) + self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc'))) + self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo'))) def test_get_outputs(self): pkg_dir, dist = self.create_dist() @@ -57,7 +57,7 @@ cmd.distribution.script_name = 'setup.py' # get_output should return 4 elements - self.assert_(len(cmd.get_outputs()) >= 2) + self.assertTrue(len(cmd.get_outputs()) >= 2) def test_get_inputs(self): pkg_dir, dist = self.create_dist() Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_scripts.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_scripts.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_install_scripts.py Wed Aug 5 15:32:47 2009 @@ -23,15 +23,15 @@ skip_build=1, ) cmd = install_scripts(dist) - self.assert_(not cmd.force) - self.assert_(not cmd.skip_build) - self.assert_(cmd.build_dir is None) - self.assert_(cmd.install_dir is None) + self.assertTrue(not cmd.force) + self.assertTrue(not cmd.skip_build) + self.assertTrue(cmd.build_dir is None) + self.assertTrue(cmd.install_dir is None) cmd.finalize_options() - self.assert_(cmd.force) - self.assert_(cmd.skip_build) + self.assertTrue(cmd.force) + self.assertTrue(cmd.skip_build) self.assertEqual(cmd.build_dir, "/foo/bar") self.assertEqual(cmd.install_dir, "/splat/funk") @@ -69,7 +69,7 @@ installed = os.listdir(target) for name in expected: - self.assert_(name in installed) + self.assertTrue(name in installed) def test_suite(): Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_msvc9compiler.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_msvc9compiler.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_msvc9compiler.py Wed Aug 5 15:32:47 2009 @@ -46,7 +46,7 @@ # windows registeries versions. path = r'Software\Microsoft\Notepad' v = Reg.get_value(path, u"lfitalic") - self.assert_(v in (0, 1)) + self.assertTrue(v in (0, 1)) import _winreg HKCU = _winreg.HKEY_CURRENT_USER @@ -54,7 +54,7 @@ self.assertEquals(keys, None) keys = Reg.read_keys(HKCU, r'Software\Microsoft') - self.assert_('Notepad' in keys) + self.assertTrue('Notepad' in keys) def test_suite(): return unittest.makeSuite(msvc9compilerTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_register.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_register.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_register.py Wed Aug 5 15:32:47 2009 @@ -96,7 +96,7 @@ cmd = self._get_cmd() # we shouldn't have a .pypirc file yet - self.assert_(not os.path.exists(self.rc)) + self.assertTrue(not os.path.exists(self.rc)) # patching raw_input and getpass.getpass # so register gets happy @@ -115,7 +115,7 @@ del register_module.raw_input # we should have a brand new .pypirc file - self.assert_(os.path.exists(self.rc)) + self.assertTrue(os.path.exists(self.rc)) # with the content similar to WANTED_PYPIRC content = open(self.rc).read() @@ -133,13 +133,13 @@ # let's see what the server received : we should # have 2 similar requests - self.assert_(self.conn.reqs, 2) + self.assertTrue(self.conn.reqs, 2) req1 = dict(self.conn.reqs[0].headers) req2 = dict(self.conn.reqs[1].headers) self.assertEquals(req1['Content-length'], '1374') self.assertEquals(req2['Content-length'], '1374') - self.assert_('xxx' in self.conn.reqs[1].data) + self.assertTrue('xxx' in self.conn.reqs[1].data) def test_password_not_in_file(self): @@ -165,11 +165,11 @@ del register_module.raw_input # we should have send a request - self.assert_(self.conn.reqs, 1) + self.assertTrue(self.conn.reqs, 1) req = self.conn.reqs[0] headers = dict(req.headers) self.assertEquals(headers['Content-length'], '608') - self.assert_('tarek' in req.data) + self.assertTrue('tarek' in req.data) def test_password_reset(self): # this test runs choice 3 @@ -183,11 +183,11 @@ del register_module.raw_input # we should have send a request - self.assert_(self.conn.reqs, 1) + self.assertTrue(self.conn.reqs, 1) req = self.conn.reqs[0] headers = dict(req.headers) self.assertEquals(headers['Content-length'], '290') - self.assert_('tarek' in req.data) + self.assertTrue('tarek' in req.data) def test_strict(self): # testing the script option Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_sysconfig.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_sysconfig.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_sysconfig.py Wed Aug 5 15:32:47 2009 @@ -21,12 +21,12 @@ def test_get_config_h_filename(self): config_h = sysconfig.get_config_h_filename() - self.assert_(os.path.isfile(config_h), config_h) + self.assertTrue(os.path.isfile(config_h), config_h) def test_get_python_lib(self): lib_dir = sysconfig.get_python_lib() # XXX doesn't work on Linux when Python was never installed before - #self.assert_(os.path.isdir(lib_dir), lib_dir) + #self.assertTrue(os.path.isdir(lib_dir), lib_dir) # test for pythonxx.lib? self.assertNotEqual(sysconfig.get_python_lib(), sysconfig.get_python_lib(prefix=TESTFN)) @@ -36,14 +36,14 @@ # This is not much of a test. We make sure Python.h exists # in the directory returned by get_python_inc() but we don't know # it is the correct file. - self.assert_(os.path.isdir(inc_dir), inc_dir) + self.assertTrue(os.path.isdir(inc_dir), inc_dir) python_h = os.path.join(inc_dir, "Python.h") - self.assert_(os.path.isfile(python_h), python_h) + self.assertTrue(os.path.isfile(python_h), python_h) def test_get_config_vars(self): cvars = sysconfig.get_config_vars() - self.assert_(isinstance(cvars, dict)) - self.assert_(cvars) + self.assertTrue(isinstance(cvars, dict)) + self.assertTrue(cvars) def test_customize_compiler(self): Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_unixccompiler.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_unixccompiler.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_unixccompiler.py Wed Aug 5 15:32:47 2009 @@ -86,6 +86,14 @@ sysconfig.get_config_var = gcv self.assertEqual(self.cc.rpath_foo(), '-R/foo') + # AIX C/C++ linker + sys.platform = 'aix' + def gcv(v): + return 'xxx' + sysconfig.get_config_var = gcv + self.assertEqual(self.cc.rpath_foo(), '-blibpath:/foo') + + def test_suite(): return unittest.makeSuite(UnixCCompilerTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_upload.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_upload.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_upload.py Wed Aug 5 15:32:47 2009 @@ -96,11 +96,11 @@ # what did we send ? headers = dict(self.last_open.req.headers) self.assertEquals(headers['Content-length'], '2086') - self.assert_(headers['Content-type'].startswith('multipart/form-data')) + self.assertTrue(headers['Content-type'].startswith('multipart/form-data')) self.assertEquals(self.last_open.req.get_method(), 'POST') self.assertEquals(self.last_open.req.get_full_url(), 'http://pypi.python.org/pypi') - self.assert_('xxx' in self.last_open.req.data) + self.assertTrue('xxx' in self.last_open.req.data) def test_suite(): return unittest.makeSuite(uploadTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_util.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_util.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_util.py Wed Aug 5 15:32:47 2009 @@ -6,15 +6,33 @@ import sys import unittest from copy import copy +from StringIO import StringIO +import subprocess from distutils.errors import DistutilsPlatformError from distutils.util import (get_platform, convert_path, change_root, check_environ, split_quoted, strtobool, - rfc822_escape) -from distutils import util # used to patch _environ_checked + rfc822_escape, get_compiler_versions, + _find_exe_version, _MAC_OS_X_LD_VERSION) +from distutils import util from distutils.sysconfig import get_config_vars from distutils import sysconfig from distutils.tests import support +from distutils.version import LooseVersion + +class FakePopen(object): + test_class = None + def __init__(self, cmd, shell, stdout, stderr): + self.cmd = cmd.split()[0] + exes = self.test_class._exes + if self.cmd not in exes: + # we don't want to call the system, returning an empty + # output so it doesn't match + self.stdout = StringIO() + self.stderr = StringIO() + else: + self.stdout = StringIO(exes[self.cmd]) + self.stderr = StringIO() class UtilTestCase(support.EnvironGuard, unittest.TestCase): @@ -37,9 +55,16 @@ else: self.uname = None self._uname = None - os.uname = self._get_uname + # patching POpen + self.old_find_executable = util.find_executable + util.find_executable = self._find_executable + self._exes = {} + self.old_popen = subprocess.Popen + FakePopen.test_class = self + subprocess.Popen = FakePopen + def tearDown(self): # getting back the environment os.name = self.name @@ -54,6 +79,8 @@ else: del os.uname sysconfig._config_vars = copy(self._config_vars) + util.find_executable = self.old_find_executable + subprocess.Popen = self.old_popen super(UtilTestCase, self).tearDown() def _set_uname(self, uname): @@ -225,10 +252,10 @@ no = ('n', 'no', 'f', 'false', 'off', '0', 'Off', 'No', 'N') for y in yes: - self.assert_(strtobool(y)) + self.assertTrue(strtobool(y)) for n in no: - self.assert_(not strtobool(n)) + self.assertTrue(not strtobool(n)) def test_rfc822_escape(self): header = 'I am a\npoor\nlonesome\nheader\n' @@ -237,6 +264,70 @@ 'header%(8s)s') % {'8s': '\n'+8*' '} self.assertEquals(res, wanted) + def test_find_exe_version(self): + # the ld version scheme under MAC OS is: + # ^@(#)PROGRAM:ld PROJECT:ld64-VERSION + # + # where VERSION is a 2-digit number for major + # revisions. For instance under Leopard, it's + # currently 77 + # + # Dots are used when branching is done. + # + # The SnowLeopard ld64 is currently 95.2.12 + + for output, version in (('@(#)PROGRAM:ld PROJECT:ld64-77', '77'), + ('@(#)PROGRAM:ld PROJECT:ld64-95.2.12', + '95.2.12')): + result = _MAC_OS_X_LD_VERSION.search(output) + self.assertEquals(result.group(1), version) + + def _find_executable(self, name): + if name in self._exes: + return name + return None + + def test_get_compiler_versions(self): + # get_versions calls distutils.spawn.find_executable on + # 'gcc', 'ld' and 'dllwrap' + self.assertEquals(get_compiler_versions(), (None, None, None)) + + # Let's fake we have 'gcc' and it returns '3.4.5' + self._exes['gcc'] = 'gcc (GCC) 3.4.5 (mingw special)\nFSF' + res = get_compiler_versions() + self.assertEquals(str(res[0]), '3.4.5') + + # and let's see what happens when the version + # doesn't match the regular expression + # (\d+\.\d+(\.\d+)*) + self._exes['gcc'] = 'very strange output' + res = get_compiler_versions() + self.assertEquals(res[0], None) + + # same thing for ld + if sys.platform != 'darwin': + self._exes['ld'] = 'GNU ld version 2.17.50 20060824' + res = get_compiler_versions() + self.assertEquals(str(res[1]), '2.17.50') + self._exes['ld'] = '@(#)PROGRAM:ld PROJECT:ld64-77' + res = get_compiler_versions() + self.assertEquals(res[1], None) + else: + self._exes['ld'] = 'GNU ld version 2.17.50 20060824' + res = get_compiler_versions() + self.assertEquals(res[1], None) + self._exes['ld'] = '@(#)PROGRAM:ld PROJECT:ld64-77' + res = get_compiler_versions() + self.assertEquals(str(res[1]), '77') + + # and dllwrap + self._exes['dllwrap'] = 'GNU dllwrap 2.17.50 20060824\nFSF' + res = get_compiler_versions() + self.assertEquals(str(res[2]), '2.17.50') + self._exes['dllwrap'] = 'Cheese Wrap' + res = get_compiler_versions() + self.assertEquals(res[2], None) + def test_suite(): return unittest.makeSuite(UtilTestCase) Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/unixccompiler.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/unixccompiler.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/unixccompiler.py Wed Aug 5 15:32:47 2009 @@ -288,23 +288,24 @@ return "+s -L" + dir elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5": return ["-rpath", dir] - else: - if compiler[:3] == "gcc" or compiler[:3] == "g++": - # gcc on non-GNU systems does not need -Wl, but can - # use it anyway. Since distutils has always passed in - # -Wl whenever gcc was used in the past it is probably - # safest to keep doing so. - if sysconfig.get_config_var("GNULD") == "yes": - # GNU ld needs an extra option to get a RUNPATH - # instead of just an RPATH. - return "-Wl,--enable-new-dtags,-R" + dir - else: - return "-Wl,-R" + dir + elif compiler[:3] == "gcc" or compiler[:3] == "g++": + # gcc on non-GNU systems does not need -Wl, but can + # use it anyway. Since distutils has always passed in + # -Wl whenever gcc was used in the past it is probably + # safest to keep doing so. + if sysconfig.get_config_var("GNULD") == "yes": + # GNU ld needs an extra option to get a RUNPATH + # instead of just an RPATH. + return "-Wl,--enable-new-dtags,-R" + dir else: - # No idea how --enable-new-dtags would be passed on to - # ld if this system was using GNU ld. Don't know if a - # system like this even exists. - return "-R" + dir + return "-Wl,-R" + dir + elif sys.platform[:3] == "aix": + return "-blibpath:" + dir + else: + # No idea how --enable-new-dtags would be passed on to + # ld if this system was using GNU ld. Don't know if a + # system like this even exists. + return "-R" + dir def library_option(self, lib): return "-l" + lib Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/util.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/distutils/util.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/distutils/util.py Wed Aug 5 15:32:47 2009 @@ -7,14 +7,17 @@ __revision__ = "$Id$" import sys, os, string, re + from distutils.errors import DistutilsPlatformError from distutils.dep_util import newer -from distutils.spawn import spawn +from distutils.spawn import spawn, find_executable from distutils import log +from distutils.version import LooseVersion + +def get_platform(): + """Return a string that identifies the current platform. -def get_platform (): - """Return a string that identifies the current platform. This is used - mainly to distinguish platform-specific build directories and + This is used mainly to distinguish platform-specific build directories and platform-specific built distributions. Typically includes the OS name and version and the architecture (as supplied by 'os.uname()'), although the exact information included depends on the OS; eg. for IRIX @@ -39,14 +42,14 @@ if os.name == 'nt': # sniff sys.version for architecture. prefix = " bit (" - i = string.find(sys.version, prefix) + i = sys.version.find(prefix) if i == -1: return sys.platform - j = string.find(sys.version, ")", i) + j = sys.version.find(")", i) look = sys.version[i+len(prefix):j].lower() - if look=='amd64': + if look == 'amd64': return 'win-amd64' - if look=='itanium': + if look == 'itanium': return 'win-ia64' return sys.platform @@ -61,10 +64,9 @@ # Convert the OS name to lowercase, remove '/' characters # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh") - osname = string.lower(osname) - osname = string.replace(osname, '/', '') - machine = string.replace(machine, ' ', '_') - machine = string.replace(machine, '/', '-') + osname = osname.lower().replace('/', '') + machine = machine.replace(' ', '_') + machine = machine.replace('/', '-') if osname[:5] == "linux": # At least on Linux/Intel, 'machine' is the processor -- @@ -154,11 +156,10 @@ return "%s-%s-%s" % (osname, release, machine) -# get_platform () +def convert_path(pathname): + """Return 'pathname' as a name that will work on the native filesystem. -def convert_path (pathname): - """Return 'pathname' as a name that will work on the native filesystem, i.e. split it on '/' and put it back together again using the current directory separator. Needed because filenames in the setup script are always supplied in Unix style, and have to be converted to the local @@ -171,23 +172,23 @@ if not pathname: return pathname if pathname[0] == '/': - raise ValueError, "path '%s' cannot be absolute" % pathname + raise ValueError("path '%s' cannot be absolute" % pathname) if pathname[-1] == '/': - raise ValueError, "path '%s' cannot end with '/'" % pathname + raise ValueError("path '%s' cannot end with '/'" % pathname) - paths = string.split(pathname, '/') + paths = pathname.split('/') while '.' in paths: paths.remove('.') if not paths: return os.curdir - return apply(os.path.join, paths) + return os.path.join(*paths) -# convert_path () +def change_root(new_root, pathname): + """Return 'pathname' with 'new_root' prepended. -def change_root (new_root, pathname): - """Return 'pathname' with 'new_root' prepended. If 'pathname' is - relative, this is equivalent to "os.path.join(new_root,pathname)". + If 'pathname' is relative, this is equivalent to + "os.path.join(new_root,pathname)". Otherwise, it requires making 'pathname' relative and then joining the two, which is tricky on DOS/Windows and Mac OS. """ @@ -214,19 +215,20 @@ return os.path.join(new_root, pathname) else: # Chop off volume name from start of path - elements = string.split(pathname, ":", 1) + elements = pathname.split(":", 1) pathname = ":" + elements[1] return os.path.join(new_root, pathname) else: - raise DistutilsPlatformError, \ - "nothing known about platform '%s'" % os.name - + raise DistutilsPlatformError("nothing known about " + "platform '%s'" % os.name) _environ_checked = 0 -def check_environ (): - """Ensure that 'os.environ' has all the environment variables we - guarantee that users can use in config files, command-line options, + +def check_environ(): + """Ensure that 'os.environ' has all the environment variables needed. + + We guarantee that users can use in config files, command-line options, etc. Currently this includes: HOME - user's home directory (Unix only) PLAT - description of the current platform, including hardware @@ -245,10 +247,10 @@ _environ_checked = 1 +def subst_vars(s, local_vars): + """Perform shell/Perl-style variable substitution on 'string'. -def subst_vars (s, local_vars): - """Perform shell/Perl-style variable substitution on 'string'. Every - occurrence of '$' followed by a name is considered a variable, and + Every occurrence of '$' followed by a name is considered a variable, and variable is substituted by the value found in the 'local_vars' dictionary, or in 'os.environ' if it's not in 'local_vars'. 'os.environ' is first checked/augmented to guarantee that it contains @@ -266,14 +268,13 @@ try: return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, s) except KeyError, var: - raise ValueError, "invalid variable '$%s'" % var + raise ValueError("invalid variable '$%s'" % var) -# subst_vars () +def grok_environment_error(exc, prefix="error: "): + """Generate a useful error message from an EnvironmentError. - -def grok_environment_error (exc, prefix="error: "): - """Generate a useful error message from an EnvironmentError (IOError or - OSError) exception object. Handles Python 1.5.1 and 1.5.2 styles, and + This will generate an IOError or an OSError exception object. + Handles Python 1.5.1 and 1.5.2 styles, and does what it can to deal with exception objects that don't have a filename (which happens when the error is due to a two-file operation, such as 'rename()' or 'link()'. Returns the error message as a string @@ -292,18 +293,20 @@ return error - # Needed by 'split_quoted()' _wordchars_re = _squote_re = _dquote_re = None + def _init_regex(): global _wordchars_re, _squote_re, _dquote_re _wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace) _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'") _dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"') -def split_quoted (s): +def split_quoted(s): """Split a string up according to Unix shell-like rules for quotes and - backslashes. In short: words are delimited by spaces, as long as those + backslashes. + + In short: words are delimited by spaces, as long as those spaces are not escaped by a backslash, or inside a quoted string. Single and double quotes are equivalent, and the quote characters can be backslash-escaped. The backslash is stripped from any two-character @@ -311,13 +314,12 @@ characters are stripped from any quoted string. Returns a list of words. """ - # This is a nice algorithm for splitting up a single string, since it # doesn't require character-by-character examination. It was a little # bit of a brain-bender to get it working right, though... if _wordchars_re is None: _init_regex() - s = string.strip(s) + s = s.strip() words = [] pos = 0 @@ -330,7 +332,7 @@ if s[end] in string.whitespace: # unescaped, unquoted whitespace: now words.append(s[:end]) # we definitely have a word delimiter - s = string.lstrip(s[end:]) + s = s[end:].lstrip() pos = 0 elif s[end] == '\\': # preserve whatever is being escaped; @@ -344,12 +346,11 @@ elif s[end] == '"': # slurp doubly-quoted string m = _dquote_re.match(s, end) else: - raise RuntimeError, \ - "this can't happen (bad char '%c')" % s[end] + raise RuntimeError("this can't happen " + "(bad char '%c')" % s[end]) if m is None: - raise ValueError, \ - "bad string (mismatched %s quotes?)" % s[end] + raise ValueError("bad string (mismatched %s quotes?)" % s[end]) (beg, end) = m.span() s = s[:beg] + s[beg+1:end-1] + s[end:] @@ -361,13 +362,12 @@ return words -# split_quoted () +def execute(func, args, msg=None, verbose=0, dry_run=0): + """Perform some action that affects the outside world. -def execute (func, args, msg=None, verbose=0, dry_run=0): - """Perform some action that affects the outside world (eg. by - writing to the filesystem). Such actions are special because they - are disabled by the 'dry_run' flag. This method takes care of all + eg. by writing to the filesystem). Such actions are special because + they are disabled by the 'dry_run' flag. This method takes care of all that bureaucracy for you; all you have to do is supply the function to call and an argument tuple for it (to embody the "external action" being performed), and an optional message to @@ -380,17 +380,17 @@ log.info(msg) if not dry_run: - apply(func, args) + func(*args) -def strtobool (val): +def strtobool(val): """Convert a string representation of truth to true (1) or false (0). True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values are 'n', 'no', 'f', 'false', 'off', and '0'. Raises ValueError if 'val' is anything else. """ - val = string.lower(val) + val = val.lower() if val in ('y', 'yes', 't', 'true', 'on', '1'): return 1 elif val in ('n', 'no', 'f', 'false', 'off', '0'): @@ -399,15 +399,13 @@ raise ValueError, "invalid truth value %r" % (val,) -def byte_compile (py_files, - optimize=0, force=0, - prefix=None, base_dir=None, - verbose=1, dry_run=0, - direct=None): +def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None, + verbose=1, dry_run=0, direct=None): """Byte-compile a collection of Python source files to either .pyc - or .pyo files in the same directory. 'py_files' is a list of files - to compile; any files that don't end in ".py" are silently skipped. - 'optimize' must be one of the following: + or .pyo files in the same directory. + + 'py_files' is a list of files to compile; any files that don't end in + ".py" are silently skipped. 'optimize' must be one of the following: 0 - don't optimize (generate .pyc) 1 - normal optimization (like "python -O") 2 - extra optimization (like "python -OO") @@ -432,7 +430,6 @@ generated in indirect mode; unless you know what you're doing, leave it set to None. """ - # First, if the caller didn't force us into direct or indirect mode, # figure out which mode we should be in. We take a conservative # approach: choose direct mode *only* if the current interpreter is @@ -481,7 +478,7 @@ #if prefix: # prefix = os.path.abspath(prefix) - script.write(string.join(map(repr, py_files), ",\n") + "]\n") + script.write(",\n".join(map(repr, py_files)) + "]\n") script.write(""" byte_compile(files, optimize=%r, force=%r, prefix=%r, base_dir=%r, @@ -520,9 +517,8 @@ dfile = file if prefix: if file[:len(prefix)] != prefix: - raise ValueError, \ - ("invalid prefix: filename %r doesn't start with %r" - % (file, prefix)) + raise ValueError("invalid prefix: filename %r doesn't " + "start with %r" % (file, prefix)) dfile = dfile[len(prefix):] if base_dir: dfile = os.path.join(base_dir, dfile) @@ -537,13 +533,61 @@ log.debug("skipping byte-compilation of %s to %s", file, cfile_base) -# byte_compile () -def rfc822_escape (header): +def rfc822_escape(header): """Return a version of the string escaped for inclusion in an RFC-822 header, by ensuring there are 8 spaces space after each newline. """ - lines = string.split(header, '\n') - lines = map(string.strip, lines) - header = string.join(lines, '\n' + 8*' ') - return header + lines = [x.strip() for x in header.split('\n')] + sep = '\n' + 8*' ' + return sep.join(lines) + +_RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)') +_MAC_OS_X_LD_VERSION = re.compile('^@\(#\)PROGRAM:ld PROJECT:ld64-((\d+)(\.\d+)*)') + +def _find_ld_version(): + """Finds the ld version. The version scheme differs under Mac OSX.""" + if sys.platform == 'darwin': + return _find_exe_version('ld -v', _MAC_OS_X_LD_VERSION) + else: + return _find_exe_version('ld -v') + +def _find_exe_version(cmd, pattern=_RE_VERSION): + """Find the version of an executable by running `cmd` in the shell. + + `pattern` is a compiled regular expression. If not provided, default + to _RE_VERSION. If the command is not found, or the output does not + match the mattern, returns None. + """ + from subprocess import Popen, PIPE + executable = cmd.split()[0] + if find_executable(executable) is None: + return None + pipe = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE) + try: + stdout, stderr = pipe.stdout.read(), pipe.stderr.read() + finally: + pipe.stdout.close() + pipe.stderr.close() + # some commands like ld under MacOS X, will give the + # output in the stderr, rather than stdout. + if stdout != '': + out_string = stdout + else: + out_string = stderr + + result = pattern.search(out_string) + if result is None: + return None + return LooseVersion(result.group(1)) + +def get_compiler_versions(): + """Returns a tuple providing the versions of gcc, ld and dllwrap + + For each command, if a command is not found, None is returned. + Otherwise a LooseVersion instance is returned. + """ + gcc = _find_exe_version('gcc -dumpversion') + ld = _find_ld_version() + dllwrap = _find_exe_version('dllwrap --version') + return gcc, ld, dllwrap Modified: python/branches/tk_and_idle_maintenance/Lib/email/base64mime.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/email/base64mime.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/email/base64mime.py Wed Aug 5 15:32:47 2009 @@ -20,7 +20,7 @@ This module does not do the line wrapping or end-of-line character conversion necessary for proper internationalized headers; it only does dumb encoding and -decoding. To deal with the various line wrapping issues, use the email.Header +decoding. To deal with the various line wrapping issues, use the email.header module. """ @@ -167,7 +167,7 @@ This function does not parse a full MIME header value encoded with base64 (like =?iso-8895-1?b?bmloISBuaWgh?=) -- please use the high - level email.Header class for that functionality. + level email.header class for that functionality. """ if not s: return s Modified: python/branches/tk_and_idle_maintenance/Lib/email/header.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/email/header.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/email/header.py Wed Aug 5 15:32:47 2009 @@ -62,7 +62,7 @@ header, otherwise a lower-case string containing the name of the character set specified in the encoded string. - An email.Errors.HeaderParseError may be raised when certain decoding error + An email.errors.HeaderParseError may be raised when certain decoding error occurs (e.g. a base64 decoding exception). """ # If no encoding, just return the header @@ -337,8 +337,8 @@ # different charsets and/or encodings, and the resulting header will # accurately reflect each setting. # - # Each encoding can be email.Utils.QP (quoted-printable, for - # ASCII-like character sets like iso-8859-1), email.Utils.BASE64 + # Each encoding can be email.utils.QP (quoted-printable, for + # ASCII-like character sets like iso-8859-1), email.utils.BASE64 # (Base64, for non-ASCII like character sets like KOI8-R and # iso-2022-jp), or None (no encoding). # Modified: python/branches/tk_and_idle_maintenance/Lib/email/message.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/email/message.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/email/message.py Wed Aug 5 15:32:47 2009 @@ -129,7 +129,7 @@ "From ". For more flexibility, use the flatten() method of a Generator instance. """ - from email.Generator import Generator + from email.generator import Generator fp = StringIO() g = Generator(fp) g.flatten(self, unixfrom=unixfrom) @@ -787,4 +787,4 @@ return [part.get_content_charset(failobj) for part in self.walk()] # I.e. def walk(self): ... - from email.Iterators import walk + from email.iterators import walk Modified: python/branches/tk_and_idle_maintenance/Lib/email/mime/nonmultipart.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/email/mime/nonmultipart.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/email/mime/nonmultipart.py Wed Aug 5 15:32:47 2009 @@ -14,13 +14,9 @@ class MIMENonMultipart(MIMEBase): """Base class for MIME multipart/* type messages.""" - __pychecker__ = 'unusednames=payload' - def attach(self, payload): # The public API prohibits attaching multiple subparts to MIMEBase # derived subtypes since none of them are, by definition, of content # type multipart/* raise errors.MultipartConversionError( 'Cannot attach additional subparts to non-multipart/*') - - del __pychecker__ Modified: python/branches/tk_and_idle_maintenance/Lib/email/quoprimime.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/email/quoprimime.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/email/quoprimime.py Wed Aug 5 15:32:47 2009 @@ -11,7 +11,7 @@ allowed in email bodies or headers. Quoted-printable is very space-inefficient for encoding binary files; use the -email.base64MIME module for that instead. +email.base64mime module for that instead. This module provides an interface to encode and decode both headers and bodies with quoted-printable encoding. @@ -23,7 +23,7 @@ This module does not do the line wrapping or end-of-line character conversion necessary for proper internationalized headers; it only does dumb encoding and decoding. To deal with the various line -wrapping issues, use the email.Header module. +wrapping issues, use the email.header module. """ __all__ = [ @@ -330,7 +330,7 @@ This function does not parse a full MIME header value encoded with quoted-printable (like =?iso-8895-1?q?Hello_World?=) -- please use - the high level email.Header class for that functionality. + the high level email.header class for that functionality. """ s = s.replace('_', ' ') return re.sub(r'=\w{2}', _unquote_match, s) Modified: python/branches/tk_and_idle_maintenance/Lib/email/test/test_email.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/email/test/test_email.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/email/test/test_email.py Wed Aug 5 15:32:47 2009 @@ -50,7 +50,7 @@ # Base test class class TestEmailBase(unittest.TestCase): def ndiffAssertEqual(self, first, second): - """Like failUnlessEqual except use ndiff for readable output.""" + """Like assertEqual except use ndiff for readable output.""" if first <> second: sfirst = str(first) ssecond = str(second) @@ -239,12 +239,12 @@ msg['From'] = 'Me' msg['to'] = 'You' # Check for case insensitivity - self.failUnless('from' in msg) - self.failUnless('From' in msg) - self.failUnless('FROM' in msg) - self.failUnless('to' in msg) - self.failUnless('To' in msg) - self.failUnless('TO' in msg) + self.assertTrue('from' in msg) + self.assertTrue('From' in msg) + self.assertTrue('FROM' in msg) + self.assertTrue('to' in msg) + self.assertTrue('To' in msg) + self.assertTrue('TO' in msg) def test_as_string(self): eq = self.assertEqual @@ -266,7 +266,7 @@ eq(text, msg.as_string()) fullrepr = str(msg) lines = fullrepr.split('\n') - self.failUnless(lines[0].startswith('From ')) + self.assertTrue(lines[0].startswith('From ')) eq(text, NL.join(lines[1:])) def test_bad_param(self): @@ -337,10 +337,10 @@ def test_has_key(self): msg = email.message_from_string('Header: exists') - self.failUnless(msg.has_key('header')) - self.failUnless(msg.has_key('Header')) - self.failUnless(msg.has_key('HEADER')) - self.failIf(msg.has_key('headeri')) + self.assertTrue(msg.has_key('header')) + self.assertTrue(msg.has_key('Header')) + self.assertTrue(msg.has_key('HEADER')) + self.assertFalse(msg.has_key('headeri')) def test_set_param(self): eq = self.assertEqual @@ -931,7 +931,7 @@ def test_add_header(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue self._au.add_header('Content-Disposition', 'attachment', filename='audiotest.au') eq(self._au['content-disposition'], @@ -974,7 +974,7 @@ def test_add_header(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue self._im.add_header('Content-Disposition', 'attachment', filename='dingusfish.gif') eq(self._im['content-disposition'], @@ -1001,7 +1001,7 @@ def test_types(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue eq(self._msg.get_content_type(), 'text/plain') eq(self._msg.get_param('charset'), 'us-ascii') missing = [] @@ -1011,7 +1011,7 @@ def test_payload(self): self.assertEqual(self._msg.get_payload(), 'hello there') - self.failUnless(not self._msg.is_multipart()) + self.assertTrue(not self._msg.is_multipart()) def test_charset(self): eq = self.assertEqual @@ -1066,7 +1066,7 @@ def test_hierarchy(self): # convenience eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue raises = self.assertRaises # tests m = self._msg @@ -1380,7 +1380,7 @@ -- XXXX-- ''') - self.failUnless(msg.is_multipart()) + self.assertTrue(msg.is_multipart()) eq(msg.get_boundary(), ' XXXX') eq(len(msg.get_payload()), 2) @@ -1410,7 +1410,7 @@ eq(msg.get_content_subtype(), 'plain') def test_same_boundary_inner_outer(self): - unless = self.failUnless + unless = self.assertTrue msg = self._msgobj('msg_15.txt') # XXX We can probably eventually do better inner = msg.get_payload(0) @@ -1420,7 +1420,7 @@ Errors.StartBoundaryNotFoundDefect)) def test_multipart_no_boundary(self): - unless = self.failUnless + unless = self.assertTrue msg = self._msgobj('msg_25.txt') unless(isinstance(msg.get_payload(), str)) self.assertEqual(len(msg.defects), 2) @@ -1478,7 +1478,7 @@ """) def test_lying_multipart(self): - unless = self.failUnless + unless = self.assertTrue msg = self._msgobj('msg_41.txt') unless(hasattr(msg, 'defects')) self.assertEqual(len(msg.defects), 2) @@ -1498,7 +1498,7 @@ # [*] This message is missing its start boundary bad = outer.get_payload(1).get_payload(0) self.assertEqual(len(bad.defects), 1) - self.failUnless(isinstance(bad.defects[0], + self.assertTrue(isinstance(bad.defects[0], Errors.StartBoundaryNotFoundDefect)) def test_first_line_is_continuation_header(self): @@ -1508,7 +1508,7 @@ eq(msg.keys(), []) eq(msg.get_payload(), 'Line 2\nLine 3') eq(len(msg.defects), 1) - self.failUnless(isinstance(msg.defects[0], + self.assertTrue(isinstance(msg.defects[0], Errors.FirstHeaderLineIsContinuationDefect)) eq(msg.defects[0].line, ' Line 1\n') @@ -1576,7 +1576,7 @@ def test_valid_argument(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue subject = 'A sub-message' m = Message() m['Subject'] = subject @@ -1620,20 +1620,20 @@ def test_parse_message_rfc822(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue msg = self._msgobj('msg_11.txt') eq(msg.get_content_type(), 'message/rfc822') payload = msg.get_payload() unless(isinstance(payload, list)) eq(len(payload), 1) submsg = payload[0] - self.failUnless(isinstance(submsg, Message)) + self.assertTrue(isinstance(submsg, Message)) eq(submsg['subject'], 'An enclosed message') eq(submsg.get_payload(), 'Here is the body of the message.\n') def test_dsn(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue # msg 16 is a Delivery Status Notification, see RFC 1894 msg = self._msgobj('msg_16.txt') eq(msg.get_content_type(), 'multipart/report') @@ -1983,7 +1983,7 @@ def test_content_type(self): eq = self.assertEquals - unless = self.failUnless + unless = self.assertTrue # Get a message object and reset the seek pointer for other tests msg, text = self._msgobj('msg_05.txt') eq(msg.get_content_type(), 'multipart/report') @@ -2005,7 +2005,7 @@ eq(msg2.get_payload(), 'Yadda yadda yadda\n') msg3 = msg.get_payload(2) eq(msg3.get_content_type(), 'message/rfc822') - self.failUnless(isinstance(msg3, Message)) + self.assertTrue(isinstance(msg3, Message)) payload = msg3.get_payload() unless(isinstance(payload, list)) eq(len(payload), 1) @@ -2015,7 +2015,7 @@ def test_parser(self): eq = self.assertEquals - unless = self.failUnless + unless = self.assertTrue msg, text = self._msgobj('msg_06.txt') # Check some of the outer headers eq(msg.get_content_type(), 'message/rfc822') @@ -2025,9 +2025,9 @@ unless(isinstance(payload, list)) eq(len(payload), 1) msg1 = payload[0] - self.failUnless(isinstance(msg1, Message)) + self.assertTrue(isinstance(msg1, Message)) eq(msg1.get_content_type(), 'text/plain') - self.failUnless(isinstance(msg1.get_payload(), str)) + self.assertTrue(isinstance(msg1.get_payload(), str)) eq(msg1.get_payload(), '\n') @@ -2064,7 +2064,7 @@ fp.close() def test_message_from_string_with_class(self): - unless = self.failUnless + unless = self.assertTrue fp = openfile('msg_01.txt') try: text = fp.read() @@ -2087,7 +2087,7 @@ unless(isinstance(subpart, MyMessage)) def test_message_from_file_with_class(self): - unless = self.failUnless + unless = self.assertTrue # Create a subclass class MyMessage(Message): pass @@ -2229,7 +2229,7 @@ def test_charset_richcomparisons(self): eq = self.assertEqual - ne = self.failIfEqual + ne = self.assertNotEqual cset1 = Charset() cset2 = Charset() eq(cset1, 'us-ascii') @@ -2428,8 +2428,8 @@ eq(msg['from'], 'ppp-request at zzz.org') eq(msg['to'], 'ppp at zzz.org') eq(msg.get_content_type(), 'multipart/mixed') - self.failIf(msg.is_multipart()) - self.failUnless(isinstance(msg.get_payload(), str)) + self.assertFalse(msg.is_multipart()) + self.assertTrue(isinstance(msg.get_payload(), str)) def test_whitespace_continuation(self): eq = self.assertEqual @@ -2648,15 +2648,15 @@ def test_header_quopri_check(self): for c in self.hlit: - self.failIf(quopriMIME.header_quopri_check(c)) + self.assertFalse(quopriMIME.header_quopri_check(c)) for c in self.hnon: - self.failUnless(quopriMIME.header_quopri_check(c)) + self.assertTrue(quopriMIME.header_quopri_check(c)) def test_body_quopri_check(self): for c in self.blit: - self.failIf(quopriMIME.body_quopri_check(c)) + self.assertFalse(quopriMIME.body_quopri_check(c)) for c in self.bnon: - self.failUnless(quopriMIME.body_quopri_check(c)) + self.assertTrue(quopriMIME.body_quopri_check(c)) def test_header_quopri_len(self): eq = self.assertEqual @@ -2825,7 +2825,7 @@ h = Header("I am the very model of a modern Major-General; I've information vegetable, animal, and mineral; I know the kings of England, and I quote the fights historical from Marathon to Waterloo, in order categorical; I'm very well acquainted, too, with matters mathematical; I understand equations, both the simple and quadratical; about binomial theorem I'm teeming with a lot o' news, with many cheerful facts about the square of the hypotenuse.", maxlinelen=76) for l in h.encode(splitchars=' ').split('\n '): - self.failUnless(len(l) <= 76) + self.assertTrue(len(l) <= 76) def test_multilingual(self): eq = self.ndiffAssertEqual @@ -3055,7 +3055,7 @@ ''' msg = email.message_from_string(m) param = msg.get_param('NAME') - self.failIf(isinstance(param, tuple)) + self.assertFalse(isinstance(param, tuple)) self.assertEqual( param, 'file____C__DOCUMENTS_20AND_20SETTINGS_FABIEN_LOCAL_20SETTINGS_TEMP_nsmail.htm') @@ -3208,7 +3208,7 @@ """ msg = email.message_from_string(m) param = msg.get_param('name') - self.failIf(isinstance(param, tuple)) + self.assertFalse(isinstance(param, tuple)) self.assertEqual(param, "Frank's Document") def test_rfc2231_tick_attack_extended(self): @@ -3232,7 +3232,7 @@ """ msg = email.message_from_string(m) param = msg.get_param('name') - self.failIf(isinstance(param, tuple)) + self.assertFalse(isinstance(param, tuple)) self.assertEqual(param, "us-ascii'en-us'Frank's Document") def test_rfc2231_no_extended_values(self): Modified: python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_codecs.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_codecs.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_codecs.py Wed Aug 5 15:32:47 2009 @@ -6,9 +6,9 @@ from test.test_support import run_unittest from email.test.test_email import TestEmailBase -from email.Charset import Charset -from email.Header import Header, decode_header -from email.Message import Message +from email.charset import Charset +from email.header import Header, decode_header +from email.message import Message # We're compatible with Python 2.3, but it doesn't have the built-in Asian # codecs, so we have to skip all these tests. Modified: python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_renamed.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_renamed.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_renamed.py Wed Aug 5 15:32:47 2009 @@ -51,7 +51,7 @@ # Base test class class TestEmailBase(unittest.TestCase): def ndiffAssertEqual(self, first, second): - """Like failUnlessEqual except use ndiff for readable output.""" + """Like assertEqual except use ndiff for readable output.""" if first <> second: sfirst = str(first) ssecond = str(second) @@ -227,12 +227,12 @@ msg['From'] = 'Me' msg['to'] = 'You' # Check for case insensitivity - self.failUnless('from' in msg) - self.failUnless('From' in msg) - self.failUnless('FROM' in msg) - self.failUnless('to' in msg) - self.failUnless('To' in msg) - self.failUnless('TO' in msg) + self.assertTrue('from' in msg) + self.assertTrue('From' in msg) + self.assertTrue('FROM' in msg) + self.assertTrue('to' in msg) + self.assertTrue('To' in msg) + self.assertTrue('TO' in msg) def test_as_string(self): eq = self.assertEqual @@ -254,7 +254,7 @@ self.ndiffAssertEqual(text, msg.as_string()) fullrepr = str(msg) lines = fullrepr.split('\n') - self.failUnless(lines[0].startswith('From ')) + self.assertTrue(lines[0].startswith('From ')) eq(text, NL.join(lines[1:])) def test_bad_param(self): @@ -325,10 +325,10 @@ def test_has_key(self): msg = email.message_from_string('Header: exists') - self.failUnless(msg.has_key('header')) - self.failUnless(msg.has_key('Header')) - self.failUnless(msg.has_key('HEADER')) - self.failIf(msg.has_key('headeri')) + self.assertTrue(msg.has_key('header')) + self.assertTrue(msg.has_key('Header')) + self.assertTrue(msg.has_key('HEADER')) + self.assertFalse(msg.has_key('headeri')) def test_set_param(self): eq = self.assertEqual @@ -912,7 +912,7 @@ def test_add_header(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue self._au.add_header('Content-Disposition', 'attachment', filename='audiotest.au') eq(self._au['content-disposition'], @@ -955,7 +955,7 @@ def test_add_header(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue self._im.add_header('Content-Disposition', 'attachment', filename='dingusfish.gif') eq(self._im['content-disposition'], @@ -999,7 +999,7 @@ def test_types(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue eq(self._msg.get_content_type(), 'text/plain') eq(self._msg.get_param('charset'), 'us-ascii') missing = [] @@ -1009,7 +1009,7 @@ def test_payload(self): self.assertEqual(self._msg.get_payload(), 'hello there') - self.failUnless(not self._msg.is_multipart()) + self.assertTrue(not self._msg.is_multipart()) def test_charset(self): eq = self.assertEqual @@ -1064,7 +1064,7 @@ def test_hierarchy(self): # convenience eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue raises = self.assertRaises # tests m = self._msg @@ -1378,7 +1378,7 @@ -- XXXX-- ''') - self.failUnless(msg.is_multipart()) + self.assertTrue(msg.is_multipart()) eq(msg.get_boundary(), ' XXXX') eq(len(msg.get_payload()), 2) @@ -1408,7 +1408,7 @@ eq(msg.get_content_subtype(), 'plain') def test_same_boundary_inner_outer(self): - unless = self.failUnless + unless = self.assertTrue msg = self._msgobj('msg_15.txt') # XXX We can probably eventually do better inner = msg.get_payload(0) @@ -1418,7 +1418,7 @@ errors.StartBoundaryNotFoundDefect)) def test_multipart_no_boundary(self): - unless = self.failUnless + unless = self.assertTrue msg = self._msgobj('msg_25.txt') unless(isinstance(msg.get_payload(), str)) self.assertEqual(len(msg.defects), 2) @@ -1476,7 +1476,7 @@ """) def test_lying_multipart(self): - unless = self.failUnless + unless = self.assertTrue msg = self._msgobj('msg_41.txt') unless(hasattr(msg, 'defects')) self.assertEqual(len(msg.defects), 2) @@ -1496,7 +1496,7 @@ # [*] This message is missing its start boundary bad = outer.get_payload(1).get_payload(0) self.assertEqual(len(bad.defects), 1) - self.failUnless(isinstance(bad.defects[0], + self.assertTrue(isinstance(bad.defects[0], errors.StartBoundaryNotFoundDefect)) def test_first_line_is_continuation_header(self): @@ -1506,7 +1506,7 @@ eq(msg.keys(), []) eq(msg.get_payload(), 'Line 2\nLine 3') eq(len(msg.defects), 1) - self.failUnless(isinstance(msg.defects[0], + self.assertTrue(isinstance(msg.defects[0], errors.FirstHeaderLineIsContinuationDefect)) eq(msg.defects[0].line, ' Line 1\n') @@ -1573,7 +1573,7 @@ def test_valid_argument(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue subject = 'A sub-message' m = Message() m['Subject'] = subject @@ -1617,20 +1617,20 @@ def test_parse_message_rfc822(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue msg = self._msgobj('msg_11.txt') eq(msg.get_content_type(), 'message/rfc822') payload = msg.get_payload() unless(isinstance(payload, list)) eq(len(payload), 1) submsg = payload[0] - self.failUnless(isinstance(submsg, Message)) + self.assertTrue(isinstance(submsg, Message)) eq(submsg['subject'], 'An enclosed message') eq(submsg.get_payload(), 'Here is the body of the message.\n') def test_dsn(self): eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue # msg 16 is a Delivery Status Notification, see RFC 1894 msg = self._msgobj('msg_16.txt') eq(msg.get_content_type(), 'multipart/report') @@ -1977,7 +1977,7 @@ def test_content_type(self): eq = self.assertEquals - unless = self.failUnless + unless = self.assertTrue # Get a message object and reset the seek pointer for other tests msg, text = self._msgobj('msg_05.txt') eq(msg.get_content_type(), 'multipart/report') @@ -1999,7 +1999,7 @@ eq(msg2.get_payload(), 'Yadda yadda yadda\n') msg3 = msg.get_payload(2) eq(msg3.get_content_type(), 'message/rfc822') - self.failUnless(isinstance(msg3, Message)) + self.assertTrue(isinstance(msg3, Message)) payload = msg3.get_payload() unless(isinstance(payload, list)) eq(len(payload), 1) @@ -2009,7 +2009,7 @@ def test_parser(self): eq = self.assertEquals - unless = self.failUnless + unless = self.assertTrue msg, text = self._msgobj('msg_06.txt') # Check some of the outer headers eq(msg.get_content_type(), 'message/rfc822') @@ -2019,9 +2019,9 @@ unless(isinstance(payload, list)) eq(len(payload), 1) msg1 = payload[0] - self.failUnless(isinstance(msg1, Message)) + self.assertTrue(isinstance(msg1, Message)) eq(msg1.get_content_type(), 'text/plain') - self.failUnless(isinstance(msg1.get_payload(), str)) + self.assertTrue(isinstance(msg1.get_payload(), str)) eq(msg1.get_payload(), '\n') @@ -2058,7 +2058,7 @@ fp.close() def test_message_from_string_with_class(self): - unless = self.failUnless + unless = self.assertTrue fp = openfile('msg_01.txt') try: text = fp.read() @@ -2081,7 +2081,7 @@ unless(isinstance(subpart, MyMessage)) def test_message_from_file_with_class(self): - unless = self.failUnless + unless = self.assertTrue # Create a subclass class MyMessage(Message): pass @@ -2224,7 +2224,7 @@ def test_charset_richcomparisons(self): eq = self.assertEqual - ne = self.failIfEqual + ne = self.assertNotEqual cset1 = Charset() cset2 = Charset() eq(cset1, 'us-ascii') @@ -2423,8 +2423,8 @@ eq(msg['from'], 'ppp-request at zzz.org') eq(msg['to'], 'ppp at zzz.org') eq(msg.get_content_type(), 'multipart/mixed') - self.failIf(msg.is_multipart()) - self.failUnless(isinstance(msg.get_payload(), str)) + self.assertFalse(msg.is_multipart()) + self.assertTrue(isinstance(msg.get_payload(), str)) def test_whitespace_continuation(self): eq = self.assertEqual @@ -2643,15 +2643,15 @@ def test_header_quopri_check(self): for c in self.hlit: - self.failIf(quoprimime.header_quopri_check(c)) + self.assertFalse(quoprimime.header_quopri_check(c)) for c in self.hnon: - self.failUnless(quoprimime.header_quopri_check(c)) + self.assertTrue(quoprimime.header_quopri_check(c)) def test_body_quopri_check(self): for c in self.blit: - self.failIf(quoprimime.body_quopri_check(c)) + self.assertFalse(quoprimime.body_quopri_check(c)) for c in self.bnon: - self.failUnless(quoprimime.body_quopri_check(c)) + self.assertTrue(quoprimime.body_quopri_check(c)) def test_header_quopri_len(self): eq = self.assertEqual @@ -2820,7 +2820,7 @@ h = Header("I am the very model of a modern Major-General; I've information vegetable, animal, and mineral; I know the kings of England, and I quote the fights historical from Marathon to Waterloo, in order categorical; I'm very well acquainted, too, with matters mathematical; I understand equations, both the simple and quadratical; about binomial theorem I'm teeming with a lot o' news, with many cheerful facts about the square of the hypotenuse.", maxlinelen=76) for l in h.encode(splitchars=' ').split('\n '): - self.failUnless(len(l) <= 76) + self.assertTrue(len(l) <= 76) def test_multilingual(self): eq = self.ndiffAssertEqual @@ -3050,7 +3050,7 @@ ''' msg = email.message_from_string(m) param = msg.get_param('NAME') - self.failIf(isinstance(param, tuple)) + self.assertFalse(isinstance(param, tuple)) self.assertEqual( param, 'file____C__DOCUMENTS_20AND_20SETTINGS_FABIEN_LOCAL_20SETTINGS_TEMP_nsmail.htm') @@ -3203,7 +3203,7 @@ """ msg = email.message_from_string(m) param = msg.get_param('name') - self.failIf(isinstance(param, tuple)) + self.assertFalse(isinstance(param, tuple)) self.assertEqual(param, "Frank's Document") def test_rfc2231_tick_attack_extended(self): @@ -3227,7 +3227,7 @@ """ msg = email.message_from_string(m) param = msg.get_param('name') - self.failIf(isinstance(param, tuple)) + self.assertFalse(isinstance(param, tuple)) self.assertEqual(param, "us-ascii'en-us'Frank's Document") def test_rfc2231_no_extended_values(self): Modified: python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_torture.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_torture.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/email/test/test_email_torture.py Wed Aug 5 15:32:47 2009 @@ -17,7 +17,7 @@ import email from email import __file__ as testfile -from email.Iterators import _structure +from email.iterators import _structure def openfile(filename): from os.path import join, dirname, abspath Modified: python/branches/tk_and_idle_maintenance/Lib/fractions.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/fractions.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/fractions.py Wed Aug 5 15:32:47 2009 @@ -486,54 +486,56 @@ if isinstance(b, numbers.Complex) and b.imag == 0: b = b.real if isinstance(b, float): - return a == a.from_float(b) + if math.isnan(b) or math.isinf(b): + # comparisons with an infinity or nan should behave in + # the same way for any finite a, so treat a as zero. + return 0.0 == b + else: + return a == a.from_float(b) else: - # XXX: If b.__eq__ is implemented like this method, it may - # give the wrong answer after float(a) changes a's - # value. Better ways of doing this are welcome. - return float(a) == b - - def _subtractAndCompareToZero(a, b, op): - """Helper function for comparison operators. - - Subtracts b from a, exactly if possible, and compares the - result with 0 using op, in such a way that the comparison - won't recurse. If the difference raises a TypeError, returns - NotImplemented instead. + # Since a doesn't know how to compare with b, let's give b + # a chance to compare itself with a. + return NotImplemented + + def _richcmp(self, other, op): + """Helper for comparison operators, for internal use only. + + Implement comparison between a Rational instance `self`, and + either another Rational instance or a float `other`. If + `other` is not a Rational instance or a float, return + NotImplemented. `op` should be one of the six standard + comparison operators. """ - if isinstance(b, numbers.Complex) and b.imag == 0: - b = b.real - if isinstance(b, float): - b = a.from_float(b) - try: - # XXX: If b <: Real but not <: Rational, this is likely - # to fall back to a float. If the actual values differ by - # less than MIN_FLOAT, this could falsely call them equal, - # which would make <= inconsistent with ==. Better ways of - # doing this are welcome. - diff = a - b - except TypeError: + # convert other to a Rational instance where reasonable. + if isinstance(other, Rational): + return op(self._numerator * other.denominator, + self._denominator * other.numerator) + if isinstance(other, numbers.Complex) and other.imag == 0: + other = other.real + if isinstance(other, float): + if math.isnan(other) or math.isinf(other): + return op(0.0, other) + else: + return op(self, self.from_float(other)) + else: return NotImplemented - if isinstance(diff, Rational): - return op(diff.numerator, 0) - return op(diff, 0) def __lt__(a, b): """a < b""" - return a._subtractAndCompareToZero(b, operator.lt) + return a._richcmp(b, operator.lt) def __gt__(a, b): """a > b""" - return a._subtractAndCompareToZero(b, operator.gt) + return a._richcmp(b, operator.gt) def __le__(a, b): """a <= b""" - return a._subtractAndCompareToZero(b, operator.le) + return a._richcmp(b, operator.le) def __ge__(a, b): """a >= b""" - return a._subtractAndCompareToZero(b, operator.ge) + return a._richcmp(b, operator.ge) def __nonzero__(a): """a != 0""" Modified: python/branches/tk_and_idle_maintenance/Lib/idlelib/configDialog.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/idlelib/configDialog.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/idlelib/configDialog.py Wed Aug 5 15:32:47 2009 @@ -28,6 +28,7 @@ self.wm_withdraw() self.configure(borderwidth=5) + self.title('IDLE Preferences') self.geometry("+%d+%d" % (parent.winfo_rootx()+20, parent.winfo_rooty()+30)) #Theme Elements. Each theme element key is its display name. Modified: python/branches/tk_and_idle_maintenance/Lib/inspect.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/inspect.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/inspect.py Wed Aug 5 15:32:47 2009 @@ -240,10 +240,6 @@ or ismethod(object) or ismethoddescriptor(object)) -def isgenerator(object): - """Return true if the object is a generator object.""" - return isinstance(object, types.GeneratorType) - def isabstract(object): """Return true if the object is an abstract base class (ABC).""" return isinstance(object, type) and object.__flags__ & TPFLAGS_IS_ABSTRACT @@ -952,7 +948,10 @@ tb = tb.tb_next return framelist -currentframe = sys._getframe +if hasattr(sys, '_getframe'): + currentframe = sys._getframe +else: + currentframe = lambda _=None: None def stack(context=1): """Return a list of records for the stack above the caller's frame.""" Deleted: python/branches/tk_and_idle_maintenance/Lib/ipaddr.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/ipaddr.py Wed Aug 5 15:32:47 2009 +++ (empty file) @@ -1,1353 +0,0 @@ -# Copyright 2007 Google Inc. -# Licensed to PSF under a Contributor Agreement. -# -# See also: http://code.google.com/p/ipaddr-py/ - -"""An IPv4/IPv6 manipulation library in Python. - -This library is used to create/poke/manipulate IPv4 and IPv6 addresses -and prefixes. - -""" - -__version__ = '1.1.1' - -import struct - - -class Error(Exception): - - """Base class for exceptions.""" - - -class IPTypeError(Error): - - """Tried to perform a v4 action on v6 object or vice versa.""" - - -class IPAddressExclusionError(Error): - - """An Error we should never see occurred in address exclusion.""" - - -class IPv4IpValidationError(Error): - - """Raised when an IPv4 address is invalid.""" - - def __init__(self, ip): - Error.__init__(self) - self.ip = ip - - def __str__(self): - return repr(self.ip) + ' is not a valid IPv4 address' - - -class IPv4NetmaskValidationError(Error): - - """Raised when a netmask is invalid.""" - - def __init__(self, netmask): - Error.__init__(self) - self.netmask = netmask - - def __str__(self): - return repr(self.netmask) + ' is not a valid IPv4 netmask' - - -class IPv6IpValidationError(Error): - - """Raised when an IPv6 address is invalid.""" - - def __init__(self, ip): - Error.__init__(self) - self.ip = ip - - def __str__(self): - return repr(self.ip) + ' is not a valid IPv6 address' - - -class IPv6NetmaskValidationError(Error): - - """Raised when an IPv6 netmask is invalid.""" - - def __init__(self, netmask): - Error.__init__(self) - self.netmask = netmask - - def __str__(self): - return repr(self.netmask) + ' is not a valid IPv6 netmask' - - -class PrefixlenDiffInvalidError(Error): - - """Raised when Sub/Supernets is called with a bad prefixlen_diff.""" - - def __init__(self, error_str): - Error.__init__(self) - self.error_str = error_str - - -def IP(ipaddr): - """Take an IP string/int and return an object of the correct type. - - Args: - ipaddr: A string or integer, the IP address. Either IPv4 or - IPv6 addresses may be supplied; integers less than 2**32 will - be considered to be IPv4. - - Returns: - An IPv4 or IPv6 object. - - Raises: - ValueError: if the string passed isn't either a v4 or a v6 - address. - - """ - - try: - return IPv4(ipaddr) - except (IPv4IpValidationError, IPv4NetmaskValidationError): - pass - - try: - return IPv6(ipaddr) - except (IPv6IpValidationError, IPv6NetmaskValidationError): - pass - - raise ValueError('%r does not appear to be an IPv4 or IPv6 address' % - ipaddr) - - -def _collapse_address_list_recursive(addresses): - """Loops through the addresses, collapsing concurrent netblocks. - - Example: - - ip1 = IPv4('1.1.0.0/24') - ip2 = IPv4('1.1.1.0/24') - ip3 = IPv4('1.1.2.0/24') - ip4 = IPv4('1.1.3.0/24') - ip5 = IPv4('1.1.4.0/24') - ip6 = IPv4('1.1.0.1/22') - - _collapse_address_list_recursive([ip1, ip2, ip3, ip4, ip5, ip6]) -> - [IPv4('1.1.0.0/22'), IPv4('1.1.4.0/24')] - - This shouldn't be called directly; it is called via - collapse_address_list([]). - - Args: - addresses: A list of IPv4 or IPv6 objects. - - Returns: - A list of IPv4 or IPv6 objects depending on what we were passed. - - """ - ret_array = [] - optimized = False - - for cur_addr in addresses: - if not ret_array: - ret_array.append(cur_addr) - continue - if cur_addr in ret_array[-1]: - optimized = True - elif cur_addr == ret_array[-1].supernet().subnet()[1]: - ret_array.append(ret_array.pop().supernet()) - optimized = True - else: - ret_array.append(cur_addr) - - if optimized: - return _collapse_address_list_recursive(ret_array) - - return ret_array - - -def collapse_address_list(addresses): - """Collapse a list of IP objects. - - Example: - collapse_address_list([IPv4('1.1.0.0/24'), IPv4('1.1.1.0/24')]) -> - [IPv4('1.1.0.0/23')] - - Args: - addresses: A list of IPv4 or IPv6 objects. - - Returns: - A list of IPv4 or IPv6 objects depending on what we were passed. - - """ - return _collapse_address_list_recursive( - sorted(addresses, key=BaseIP._get_networks_key)) - - -class BaseIP(object): - - """A generic IP object. - - This IP class contains most of the methods which are used by - the IPv4 and IPv6 classes. - - """ - - def __getitem__(self, n): - if n >= 0: - if self.network + n > self.broadcast: - raise IndexError - return self._string_from_ip_int(self.network + n) - else: - n += 1 - if self.broadcast + n < self.network: - raise IndexError - return self._string_from_ip_int(self.broadcast + n) - - def __lt__(self, other): - try: - if self.version != other.version: - return self.version < other.version - if self.ip != other.ip: - return self.ip < other.ip - if self.netmask != other.netmask: - return self.netmask < other.netmask - return False - except AttributeError: - return NotImplemented - - def __gt__(self, other): - try: - if self.version != other.version: - return self.version > other.version - if self.ip != other.ip: - return self.ip > other.ip - if self.netmask != other.netmask: - return self.netmask > other.netmask - return False - except AttributeError: - return NotImplemented - - def __eq__(self, other): - try: - return (self.version == other.version - and self.ip == other.ip - and self.netmask == other.netmask) - except AttributeError: - return NotImplemented - - def __ne__(self, other): - eq = self.__eq__(other) - if eq is NotImplemented: - return NotImplemented - return not eq - - def __le__(self, other): - gt = self.__gt__(other) - if gt is NotImplemented: - return NotImplemented - return not gt - - def __ge__(self, other): - lt = self.__lt__(other) - if lt is NotImplemented: - return NotImplemented - return not lt - - def __repr__(self): - return '%s(%r)' % (self.__class__.__name__, str(self)) - - def __index__(self): - return self.ip - - def __int__(self): - return self.ip - - def __hex__(self): - return hex(int(self)) - - def address_exclude(self, other): - """Remove an address from a larger block. - - For example: - - addr1 = IP('10.1.1.0/24') - addr2 = IP('10.1.1.0/26') - addr1.address_exclude(addr2) = - [IP('10.1.1.64/26'), IP('10.1.1.128/25')] - - or IPv6: - - addr1 = IP('::1/32') - addr2 = IP('::1/128') - addr1.address_exclude(addr2) = [IP('::0/128'), - IP('::2/127'), - IP('::4/126'), - IP('::8/125'), - ... - IP('0:0:8000::/33')] - - Args: - other: An IP object of the same type. - - Returns: - A sorted list of IP objects addresses which is self minus - other. - - Raises: - IPTypeError: If self and other are of difffering address - versions. - IPAddressExclusionError: There was some unknown error in the - address exclusion process. This likely points to a bug - elsewhere in this code. - ValueError: If other is not completely contained by self. - - """ - if not self.version == other.version: - raise IPTypeError("%s and %s aren't of the same version" % ( - str(self), str(other))) - - if other not in self: - raise ValueError('%s not contained in %s' % (str(other), - str(self))) - - ret_addrs = [] - - # Make sure we're comparing the network of other. - other = IP(other.network_ext + '/' + str(other.prefixlen)) - - s1, s2 = self.subnet() - while s1 != other and s2 != other: - if other in s1: - ret_addrs.append(s2) - s1, s2 = s1.subnet() - elif other in s2: - ret_addrs.append(s1) - s1, s2 = s2.subnet() - else: - # If we got here, there's a bug somewhere. - raise IPAddressExclusionError('Error performing exclusion: ' - 's1: %s s2: %s other: %s' % - (str(s1), str(s2), str(other))) - if s1 == other: - ret_addrs.append(s2) - elif s2 == other: - ret_addrs.append(s1) - else: - # If we got here, there's a bug somewhere. - raise IPAddressExclusionError('Error performing exclusion: ' - 's1: %s s2: %s other: %s' % - (str(s1), str(s2), str(other))) - - return sorted(ret_addrs, key=BaseIP._get_networks_key) - - def compare_networks(self, other): - """Compare two IP objects. - - This is only concerned about the comparison of the integer - representation of the network addresses. This means that the - host bits aren't considered at all in this method. If you want - to compare host bits, you can easily enough do a - 'HostA.ip < HostB.ip' - - Args: - other: An IP object. - - Returns: - If the IP versions of self and other are the same, returns: - - -1 if self < other: - eg: IPv4('1.1.1.0/24') < IPv4('1.1.2.0/24') - IPv6('1080::200C:417A') < IPv6('1080::200B:417B') - 0 if self == other - eg: IPv4('1.1.1.1/24') == IPv4('1.1.1.2/24') - IPv6('1080::200C:417A/96') == IPv6('1080::200C:417B/96') - 1 if self > other - eg: IPv4('1.1.1.0/24') > IPv4('1.1.0.0/24') - IPv6('1080::1:200C:417A/112') > - IPv6('1080::0:200C:417A/112') - - If the IP versions of self and other are different, returns: - - -1 if self.version < other.version - eg: IPv4('10.0.0.1/24') < IPv6('::1/128') - 1 if self.version > other.version - eg: IPv6('::1/128') > IPv4('255.255.255.0/24') - - """ - if self.version < other.version: - return -1 - if self.version > other.version: - return 1 - # self.version == other.version below here: - if self.network < other.network: - return -1 - if self.network > other.network: - return 1 - # self.network == other.network below here: - if self.netmask < other.netmask: - return -1 - if self.netmask > other.netmask: - return 1 - # self.network == other.network and self.netmask == other.netmask - return 0 - - def _get_networks_key(self): - """Network-only key function. - - Returns an object that identifies this address' network and - netmask. This function is a suitable "key" argument for sorted() - and list.sort(). - - """ - return (self.version, self.network, self.netmask) - - prefixlen = property( - fget=lambda self: self._prefixlen, - fset=lambda self, prefixlen: self._set_prefix(prefixlen)) - - def __str__(self): - return '%s/%s' % (self._string_from_ip_int(self.ip), - str(self.prefixlen)) - - def __hash__(self): - return hash(self.ip ^ self.netmask) - - def __contains__(self, other): - return self.network <= other.ip and self.broadcast >= other.broadcast - - @property - def ip_ext(self): - """Dotted decimal or colon string version of the IP address.""" - return self._string_from_ip_int(self.ip) - - @property - def ip_ext_full(self): - """Canonical string version of the IP address.""" - return self.ip_ext - - @property - def broadcast(self): - """Integer representation of the broadcast address.""" - return self.ip | self.hostmask - - @property - def broadcast_ext(self): - """Dotted decimal or colon string version of the broadcast.""" - return self._string_from_ip_int(self.broadcast) - - @property - def hostmask(self): - """Integer representation of the hostmask.""" - return self.netmask ^ self._ALL_ONES - - @property - def hostmask_ext(self): - """Dotted decimal or colon string version of the hostmask.""" - return self._string_from_ip_int(self.hostmask) - - @property - def network(self): - """Integer representation of the network.""" - return self.ip & self.netmask - - @property - def network_ext(self): - """Dotted decimal or colon string version of the network.""" - return self._string_from_ip_int(self.network) - - @property - def netmask_ext(self): - """Dotted decimal or colon string version of the netmask.""" - return self._string_from_ip_int(self.netmask) - - @property - def numhosts(self): - """Number of hosts in the current subnet.""" - return self.broadcast - self.network + 1 - - @property - def version(self): - raise NotImplementedError('BaseIP has no version') - - def _ip_int_from_prefix(self, prefixlen=None): - """Turn the prefix length netmask into a int for comparison. - - Args: - prefixlen: An integer, the prefix length. - - Returns: - An integer. - - """ - if not prefixlen and prefixlen != 0: - prefixlen = self.prefixlen - return self._ALL_ONES ^ (self._ALL_ONES >> prefixlen) - - def _prefix_from_ip_int(self, ip_int, mask=32): - """Return prefix length from the decimal netmask. - - Args: - ip_int: An integer, the IP address. - mask: The netmask. Defaults to 32. - - Returns: - An integer, the prefix length. - - """ - while mask: - if ip_int & 1 == 1: - break - ip_int >>= 1 - mask -= 1 - - return mask - - def _ip_string_from_prefix(self, prefixlen=None): - """Turn a prefix length into a dotted decimal string. - - Args: - prefixlen: An integer, the netmask prefix length. - - Returns: - A string, the dotted decimal netmask string. - - """ - if not prefixlen: - prefixlen = self.prefixlen - return self._string_from_ip_int(self._ip_int_from_prefix(prefixlen)) - - -class IPv4(BaseIP): - - """This class represents and manipulates 32-bit IPv4 addresses. - - Attributes: [examples for IPv4('1.2.3.4/27')] - .ip: 16909060 - .ip_ext: '1.2.3.4' - .ip_ext_full: '1.2.3.4' - .network: 16909056L - .network_ext: '1.2.3.0' - .hostmask: 31L (0x1F) - .hostmask_ext: '0.0.0.31' - .broadcast: 16909087L (0x102031F) - .broadcast_ext: '1.2.3.31' - .netmask: 4294967040L (0xFFFFFFE0) - .netmask_ext: '255.255.255.224' - .prefixlen: 27 - - """ - - # Equivalent to 255.255.255.255 or 32 bits of 1's. - _ALL_ONES = 0xffffffff - _version = 4 - - def __init__(self, ipaddr): - """Instantiate a new IPv4 object. - - Args: - ipaddr: A string or integer representing the IP [& network]. - '192.168.1.1/32' - '192.168.1.1/255.255.255.255' - '192.168.1.1/0.0.0.255' - '192.168.1.1' - are all functionally the same in IPv4. That is to say, - failing to provide a subnetmask will create an object with - a mask of /32. A netmask of '255.255.255.255' is assumed - to be /32 and '0.0.0.0' is assumed to be /0, even though - other netmasks can be expressed both as host- and - net-masks. (255.0.0.0 == 0.255.255.255) - - Additionally, an integer can be passed, so - IPv4('192.168.1.1') == IPv4(3232235777). - or, more generally - IPv4(IPv4('192.168.1.1').ip) == IPv4('192.168.1.1') - - Raises: - IPv4IpValidationError: If ipaddr isn't a valid IPv4 address. - IPv4NetmaskValidationError: If the netmask isn't valid for - an IPv4 address. - - """ - BaseIP.__init__(self) - - # Efficient constructor from integer. - if isinstance(ipaddr, int) or isinstance(ipaddr, long): - self.ip = ipaddr - self._prefixlen = 32 - self.netmask = self._ALL_ONES - if ipaddr < 0 or ipaddr > self._ALL_ONES: - raise IPv4IpValidationError(ipaddr) - return - - # Assume input argument to be string or any object representation - # which converts into a formatted IP prefix string. - addr = str(ipaddr).split('/') - - if len(addr) > 2: - raise IPv4IpValidationError(ipaddr) - - if not self._is_valid_ip(addr[0]): - raise IPv4IpValidationError(addr[0]) - - self.ip = self._ip_int_from_string(addr[0]) - - if len(addr) == 2: - mask = addr[1].split('.') - if len(mask) == 4: - # We have dotted decimal netmask. - if not self._is_valid_netmask(addr[1]): - raise IPv4NetmaskValidationError(addr[1]) - if self._is_hostmask(addr[1]): - self.netmask = ( - self._ip_int_from_string(addr[1]) ^ self._ALL_ONES) - else: - self.netmask = self._ip_int_from_string(addr[1]) - self._prefixlen = self._prefix_from_ip_int(self.netmask) - else: - # We have a netmask in prefix length form. - if not self._is_valid_netmask(addr[1]): - raise IPv4NetmaskValidationError(addr[1]) - self._prefixlen = int(addr[1]) - self.netmask = self._ip_int_from_prefix(self._prefixlen) - else: - self._prefixlen = 32 - self.netmask = self._ip_int_from_prefix(self._prefixlen) - - def _set_prefix(self, prefixlen): - """Change the prefix length. - - Args: - prefixlen: An integer, the new prefix length. - - Raises: - IPv4NetmaskValidationError: If prefixlen is out of bounds. - - """ - if not 0 <= prefixlen <= 32: - raise IPv4NetmaskValidationError(prefixlen) - self._prefixlen = prefixlen - self.netmask = self._ip_int_from_prefix(self._prefixlen) - - def subnet(self, prefixlen_diff=1): - """The subnets which join to make the current subnet. - - In the case that self contains only one IP - (self._prefixlen == 32), return a list with just ourself. - - Args: - prefixlen_diff: An integer, the amount the prefix length - should be increased by. Given a /24 network and a - prefixlen_diff of 3, for example, 8 subnets of size /27 - will be returned. The default value of 1 splits the - current network into two halves. - - Returns: - A list of IPv4 objects. - - Raises: - PrefixlenDiffInvalidError: The prefixlen_diff is too small - or too large. - - """ - if self._prefixlen == 32: - return [self] - - if prefixlen_diff < 0: - raise PrefixlenDiffInvalidError('prefix length diff must be > 0') - new_prefixlen = self.prefixlen + prefixlen_diff - - if not self._is_valid_netmask(str(new_prefixlen)): - raise PrefixlenDiffInvalidError( - 'prefix length diff %d is invalid for netblock %s' % ( - new_prefixlen, str(self))) - - first = IPv4( - self._string_from_ip_int(self.network) + '/' + - str(self._prefixlen + prefixlen_diff)) - subnets = [first] - current = first - while True: - broadcast = current.broadcast - if broadcast == self.broadcast: - break - current = IPv4(self._string_from_ip_int(broadcast + 1) + '/' + - str(new_prefixlen)) - subnets.append(current) - - return subnets - - def supernet(self, prefixlen_diff=1): - """The supernet containing the current network. - - Args: - prefixlen_diff: An integer, the amount the prefix length of - the network should be decreased by. For example, given a - /24 network and a prefixlen_diff of 3, a supernet with a - /21 netmask is returned. - - Returns: - An IPv4 object. - - Raises: - PrefixlenDiffInvalidError: If - self.prefixlen - prefixlen_diff < 0. I.e., you have a - negative prefix length. - - """ - if self.prefixlen == 0: - return self - if self.prefixlen - prefixlen_diff < 0: - raise PrefixlenDiffInvalidError( - 'current prefixlen is %d, cannot have a prefixlen_diff of %d' % - (self.prefixlen, prefixlen_diff)) - return IPv4(self.ip_ext + '/' + str(self.prefixlen - prefixlen_diff)) - - @property - def is_private(self): - """Test if this address is allocated for private networks. - - Returns: - A boolean, True if the address is reserved per RFC 1918. - - """ - for network in _IPV4_RFC1918_NETWORKS: - if self in network: - return True - return False - - @property - def is_multicast(self): - """Test if the address is reserved for multicast use. - - Returns: - A boolean, True if the address is multicast. - See RFC 3171 for details. - - """ - return self in _IPV4_RFC3171_MULTICAST - - @property - def is_loopback(self): - """Test if the address is a loopback adddress. - - Returns: - A boolean, True if the address is a loopback per RFC 3330. - - """ - return self in _IPV4_RFC3330_LOOPBACK - - @property - def is_link_local(self): - """Test if the address is reserved for link-local. - - Returns: - A boolean, True if the address is link-local per RFC 3927. - - """ - return self in _IPV4_RFC3927_LINK_LOCAL - - @property - def version(self): - return self._version - - @property - def packed(self): - """The binary representation of this address.""" - return struct.pack('!I', self.ip) - - def _is_hostmask(self, ip_str): - """Test if the IP string is a hostmask (rather than a netmask). - - Args: - ip_str: A string, the potential hostmask. - - Returns: - A boolean, True if the IP string is a hostmask. - - """ - parts = [int(x) for x in ip_str.split('.')] - if parts[0] < parts[-1]: - return True - return False - - def _ip_int_from_string(self, ip_str): - """Turn the given IP string into an integer for comparison. - - Args: - ip_str: A string, the IP address. - - Returns: - The IP address as an integer. - - """ - packed_ip = 0 - for oc in ip_str.split('.'): - packed_ip = (packed_ip << 8) | int(oc) - return packed_ip - - def _string_from_ip_int(self, ip_int): - """Turns a 32-bit integer into dotted decimal notation. - - Args: - ip_int: An integer, the IP address. - - Returns: - The IP address as a string in dotted decimal notation. - - """ - octets = [] - for _ in xrange(4): - octets.insert(0, str(ip_int & 0xFF)) - ip_int >>= 8 - return '.'.join(octets) - - def _is_valid_ip(self, ip_str): - """Validate the dotted decimal notation IP/netmask string. - - Args: - ip_str: A string, the IP address. - - Returns: - A boolean, True if the string is a valid dotted decimal IP - string. - - """ - octets = ip_str.split('.') - if len(octets) == 1: - # We have an integer rather than a dotted decimal IP. - try: - return int(ip_str) >= 0 and int(ip_str) <= self._ALL_ONES - except ValueError: - return False - - if len(octets) != 4: - return False - - for octet in octets: - try: - if not 0 <= int(octet) <= 255: - return False - except ValueError: - return False - return True - - def _is_valid_netmask(self, netmask): - """Verify that the netmask is valid. - - Args: - netmask: A string, either a prefix or dotted decimal - netmask. - - Returns: - A boolean, True if the prefix represents a valid IPv4 - netmask. - - """ - if len(netmask.split('.')) == 4: - return self._is_valid_ip(netmask) - try: - netmask = int(netmask) - except ValueError: - return False - return 0 <= netmask <= 32 - - -class IPv6(BaseIP): - - """This class respresents and manipulates 128-bit IPv6 addresses. - - Attributes: [examples for IPv6('2001:658:22A:CAFE:200::1/64')] - .ip: 42540616829182469433547762482097946625L - .ip_ext: '2001:658:22a:cafe:200::1' - .ip_ext_full: '2001:0658:022a:cafe:0200:0000:0000:0001' - .network: 42540616829182469433403647294022090752L - .network_ext: '2001:658:22a:cafe::' - .hostmask: 18446744073709551615L - .hostmask_ext: '::ffff:ffff:ffff:ffff' - .broadcast: 42540616829182469451850391367731642367L - .broadcast_ext: '2001:658:22a:cafe:ffff:ffff:ffff:ffff' - .netmask: 340282366920938463444927863358058659840L - .netmask_ext: 64 - .prefixlen: 64 - - """ - - _ALL_ONES = (2**128) - 1 - _version = 6 - - def __init__(self, ipaddr): - """Instantiate a new IPv6 object. - - Args: - ipaddr: A string or integer representing the IP or the IP - and prefix/netmask. - '2001:4860::/128' - '2001:4860:0000:0000:0000:0000:0000:0000/128' - '2001:4860::' - are all functionally the same in IPv6. That is to say, - failing to provide a subnetmask will create an object with - a mask of /128. - - Additionally, an integer can be passed, so - IPv6('2001:4860::') == - IPv6(42541956101370907050197289607612071936L). - or, more generally - IPv6(IPv6('2001:4860::').ip) == IPv6('2001:4860::') - - Raises: - IPv6IpValidationError: If ipaddr isn't a valid IPv6 address. - IPv6NetmaskValidationError: If the netmask isn't valid for - an IPv6 address. - - """ - BaseIP.__init__(self) - - # Efficient constructor from integer. - if isinstance(ipaddr, long) or isinstance(ipaddr, int): - self.ip = ipaddr - self._prefixlen = 128 - self.netmask = self._ALL_ONES - if ipaddr < 0 or ipaddr > self._ALL_ONES: - raise IPv6IpValidationError(ipaddr) - return - - # Assume input argument to be string or any object representation - # which converts into a formatted IP prefix string. - addr_str = str(ipaddr) - if not addr_str: - raise IPv6IpValidationError('') - addr = addr_str.split('/') - if len(addr) > 1: - if self._is_valid_netmask(addr[1]): - self._prefixlen = int(addr[1]) - else: - raise IPv6NetmaskValidationError(addr[1]) - else: - self._prefixlen = 128 - - self.netmask = self._ip_int_from_prefix(self._prefixlen) - - if not self._is_valid_ip(addr[0]): - raise IPv6IpValidationError(addr[0]) - - self.ip = self._ip_int_from_string(addr[0]) - - @property - def ip_ext_full(self): - """Returns the expanded version of the IPv6 string.""" - return self._explode_shorthand_ip_string(self.ip_ext) - - def _set_prefix(self, prefixlen): - """Change the prefix length. - - Args: - prefixlen: An integer, the new prefix length. - - Raises: - IPv6NetmaskValidationError: If prefixlen is out of bounds. - - """ - if not 0 <= prefixlen <= 128: - raise IPv6NetmaskValidationError(prefixlen) - self._prefixlen = prefixlen - self.netmask = self._ip_int_from_prefix(self.prefixlen) - - def subnet(self, prefixlen_diff=1): - """The subnets which join to make the current subnet. - - In the case that self contains only one IP - (self._prefixlen == 128), return a list with just ourself. - - Args: - prefixlen_diff: An integer, the amount the prefix length - should be increased by. - - Returns: - A list of IPv6 objects. - - Raises: - PrefixlenDiffInvalidError: The prefixlen_diff is too small - or too large. - - """ - # Preserve original functionality (return [self] if - # self.prefixlen == 128). - if self.prefixlen == 128: - return [self] - - if prefixlen_diff < 0: - raise PrefixlenDiffInvalidError('Prefix length diff must be > 0') - new_prefixlen = self.prefixlen + prefixlen_diff - if not self._is_valid_netmask(str(new_prefixlen)): - raise PrefixlenDiffInvalidError( - 'Prefix length diff %d is invalid for netblock %s' % ( - new_prefixlen, str(self))) - first = IPv6( - self._string_from_ip_int(self.network) + '/' + - str(self._prefixlen + prefixlen_diff)) - subnets = [first] - current = first - while True: - broadcast = current.broadcast - if current.broadcast == self.broadcast: - break - current = IPv6(self._string_from_ip_int(broadcast + 1) + '/' + - str(new_prefixlen)) - subnets.append(current) - - return subnets - - def supernet(self, prefixlen_diff=1): - """The supernet containing the current network. - - Args: - prefixlen_diff: An integer, the amount the prefix length of the - network should be decreased by. For example, given a /96 - network and a prefixlen_diff of 3, a supernet with a /93 - netmask is returned. - - Returns: - An IPv6 object. - - Raises: - PrefixlenDiffInvalidError: If - self._prefixlen - prefixlen_diff < 0. I.e., you have a - negative prefix length. - - """ - if self.prefixlen == 0: - return self - if self.prefixlen - prefixlen_diff < 0: - raise PrefixlenDiffInvalidError( - 'current prefixlen is %d, cannot have a prefixlen_diff of %d' % - (self.prefixlen, prefixlen_diff)) - return IPv6(self.ip_ext + '/' + str(self.prefixlen - prefixlen_diff)) - - @property - def is_multicast(self): - """Test if the address is reserved for multicast use. - - Returns: - A boolean, True if the address is a multicast address. - See RFC 2373 2.7 for details. - - """ - return self in _IPV6_RFC2373_MULTICAST - - @property - def is_unspecified(self): - """Test if the address is unspecified. - - Returns: - A boolean, True if this is the unspecified address as defined in - RFC 2373 2.5.2. - - """ - return self == _IPV6_RFC2373_UNSPECIFIED - - @property - def is_loopback(self): - """Test if the address is a loopback adddress. - - Returns: - A boolean, True if the address is a loopback address as defined in - RFC 2373 2.5.3. - - """ - return self == _IPV6_RFC2373_LOOPBACK - - @property - def is_link_local(self): - """Test if the address is reserved for link-local. - - Returns: - A boolean, True if the address is reserved per RFC 4291. - - """ - return self in _IPV6_RFC4291_LINK_LOCAL - - @property - def is_site_local(self): - """Test if the address is reserved for site-local. - - Note that the site-local address space has been deprecated by RFC 3879. - Use is_private to test if this address is in the space of unique local - addresses as defined by RFC 4193. - - Returns: - A boolean, True if the address is reserved per RFC 3513 2.5.6. - - """ - return self in _IPV6_RFC3513_SITE_LOCAL - - @property - def is_private(self): - """Test if this address is allocated for private networks. - - Returns: - A boolean, True if the address is reserved per RFC 4193. - - """ - return self in _IPV6_RFC4193_PRIVATE - - @property - def version(self): - return self._version - - @property - def packed(self): - """The binary representation of this address.""" - return struct.pack('!QQ', self.ip >> 64, self.ip & (2**64 - 1)) - - def _is_shorthand_ip(self, ip_str=None): - """Determine if the address is shortened. - - Args: - ip_str: A string, the IPv6 address. - - Returns: - A boolean, True if the address is shortened. - - """ - if ip_str.count('::') == 1: - return True - return False - - def _explode_shorthand_ip_string(self, ip_str): - """Expand a shortened IPv6 address. - - Args: - ip_str: A string, the IPv6 address. - - Returns: - A string, the expanded IPv6 address. - - """ - if self._is_shorthand_ip(ip_str): - new_ip = [] - hextet = ip_str.split('::') - sep = len(hextet[0].split(':')) + len(hextet[1].split(':')) - new_ip = hextet[0].split(':') - - for _ in xrange(8 - sep): - new_ip.append('0000') - new_ip += hextet[1].split(':') - - # Now need to make sure every hextet is 4 lower case characters. - # If a hextet is < 4 characters, we've got missing leading 0's. - ret_ip = [] - for hextet in new_ip: - ret_ip.append(('0' * (4 - len(hextet)) + hextet).lower()) - return ':'.join(ret_ip) - # We've already got a longhand ip_str. - return ip_str - - def _is_valid_ip(self, ip_str=None): - """Ensure we have a valid IPv6 address. - - Probably not as exhaustive as it should be. - - Args: - ip_str: A string, the IPv6 address. - - Returns: - A boolean, True if this is a valid IPv6 address. - - """ - if not ip_str: - ip_str = self.ip_ext - - # We need to have at least one ':'. - if ':' not in ip_str: - return False - - # We can only have one '::' shortener. - if ip_str.count('::') > 1: - return False - - # '::' should be encompassed by start, digits or end. - if ':::' in ip_str: - return False - - # A single colon can neither start nor end an address. - if ((ip_str.startswith(':') and not ip_str.startswith('::')) or - (ip_str.endswith(':') and not ip_str.endswith('::'))): - return False - - # If we have no concatenation, we need to have 8 fields with 7 ':'. - if '::' not in ip_str and ip_str.count(':') != 7: - # We might have an IPv4 mapped address. - if ip_str.count('.') != 3: - return False - - ip_str = self._explode_shorthand_ip_string(ip_str) - - # Now that we have that all squared away, let's check that each of the - # hextets are between 0x0 and 0xFFFF. - for hextet in ip_str.split(':'): - if hextet.count('.') == 3: - # If we have an IPv4 mapped address, the IPv4 portion has to be - # at the end of the IPv6 portion. - if not ip_str.split(':')[-1] == hextet: - return False - try: - IPv4(hextet) - except IPv4IpValidationError: - return False - elif int(hextet, 16) < 0x0 or int(hextet, 16) > 0xFFFF: - return False - return True - - def _is_valid_netmask(self, prefixlen): - """Verify that the netmask/prefixlen is valid. - - Args: - prefixlen: A string, the netmask in prefix length format. - - Returns: - A boolean, True if the prefix represents a valid IPv6 - netmask. - - """ - try: - prefixlen = int(prefixlen) - except ValueError: - return False - return 0 <= prefixlen <= 128 - - def _ip_int_from_string(self, ip_str=None): - """Turn an IPv6 address into an integer. - - Args: - ip_str: A string, the IPv6 address. - - Returns: - A long, the IPv6 address. - - """ - if not ip_str: - ip_str = self.ip_ext - - ip_int = 0 - - fields = self._explode_shorthand_ip_string(ip_str).split(':') - - # Do we have an IPv4 mapped (::ffff:a.b.c.d) or compact (::a.b.c.d) - # address? - if fields[-1].count('.') == 3: - ipv4_string = fields.pop() - ipv4_int = IPv4(ipv4_string).ip - octets = [] - for _ in xrange(2): - octets.append(hex(ipv4_int & 0xFFFF).lstrip('0x').rstrip('L')) - ipv4_int >>= 16 - fields.extend(reversed(octets)) - - for field in fields: - ip_int = (ip_int << 16) + int(field, 16) - - return ip_int - - def _compress_hextets(self, hextets): - """Compresses a list of hextets. - - Compresses a list of strings, replacing the longest continuous - sequence of "0" in the list with "" and adding empty strings at - the beginning or at the end of the string such that subsequently - calling ":".join(hextets) will produce the compressed version of - the IPv6 address. - - Args: - hextets: A list of strings, the hextets to compress. - - Returns: - A list of strings. - - """ - best_doublecolon_start = -1 - best_doublecolon_len = 0 - doublecolon_start = -1 - doublecolon_len = 0 - for index in range(len(hextets)): - if hextets[index] == '0': - doublecolon_len += 1 - if doublecolon_start == -1: - # Start of a sequence of zeros. - doublecolon_start = index - if doublecolon_len > best_doublecolon_len: - # This is the longest sequence of zeros so far. - best_doublecolon_len = doublecolon_len - best_doublecolon_start = doublecolon_start - else: - doublecolon_len = 0 - doublecolon_start = -1 - - if best_doublecolon_len > 1: - best_doublecolon_end = (best_doublecolon_start + - best_doublecolon_len) - # For zeros at the end of the address. - if best_doublecolon_end == len(hextets): - hextets += [''] - hextets[best_doublecolon_start:best_doublecolon_end] = [''] - # For zeros at the beginning of the address. - if best_doublecolon_start == 0: - hextets = [''] + hextets - - return hextets - - def _string_from_ip_int(self, ip_int=None): - """Turns a 128-bit integer into hexadecimal notation. - - Args: - ip_int: An integer, the IP address. - - Returns: - A string, the hexadecimal representation of the address. - - Raises: - ValueError: The address is bigger than 128 bits of all ones. - - """ - if not ip_int and ip_int != 0: - ip_int = self.ip - - if ip_int > self._ALL_ONES: - raise ValueError('IPv6 address is too large') - - hex_str = '%032x' % ip_int - hextets = [] - for x in range(0, 32, 4): - hextets.append('%x' % int(hex_str[x:x+4], 16)) - - hextets = self._compress_hextets(hextets) - return ':'.join(hextets) - - @property - def netmask_ext(self): - """IPv6 extended netmask. - - We don't deal with netmasks in IPv6 like we do in IPv4. This is - here strictly for IPv4 compatibility. We simply return the - prefix length. - - Returns: - An integer. - - """ - return self.prefixlen - - -# IPv4 constants. -_IPV4_RFC1918_NETWORKS = (IPv4('10.0.0.0/8'), - IPv4('172.16.0.0/12'), - IPv4('192.168.0.0/16')) -_IPV4_RFC3171_MULTICAST = IPv4('224.0.0.0/4') -_IPV4_RFC3330_LOOPBACK = IPv4('127.0.0.0/8') -_IPV4_RFC3927_LINK_LOCAL = IPv4('169.254.0.0/16') - -# IPv6 constants. -_IPV6_RFC2373_MULTICAST = IPv6('ff00::/8') -_IPV6_RFC2373_UNSPECIFIED = IPv6('::') -_IPV6_RFC2373_LOOPBACK = IPv6('::1') -_IPV6_RFC4291_LINK_LOCAL = IPv6('fe80::/10') -_IPV6_RFC3513_SITE_LOCAL = IPv6('fec0::/10') # Deprecated by RFC3879. -_IPV6_RFC4193_PRIVATE = IPv6('fc00::/7') Modified: python/branches/tk_and_idle_maintenance/Lib/json/tests/test_decode.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/json/tests/test_decode.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/json/tests/test_decode.py Wed Aug 5 15:32:47 2009 @@ -8,12 +8,12 @@ class TestDecode(TestCase): def test_decimal(self): rval = json.loads('1.1', parse_float=decimal.Decimal) - self.assert_(isinstance(rval, decimal.Decimal)) + self.assertTrue(isinstance(rval, decimal.Decimal)) self.assertEquals(rval, decimal.Decimal('1.1')) def test_float(self): rval = json.loads('1', parse_int=float) - self.assert_(isinstance(rval, float)) + self.assertTrue(isinstance(rval, float)) self.assertEquals(rval, 1.0) def test_decoder_optimizations(self): Modified: python/branches/tk_and_idle_maintenance/Lib/json/tests/test_speedups.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/json/tests/test_speedups.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/json/tests/test_speedups.py Wed Aug 5 15:32:47 2009 @@ -7,9 +7,9 @@ class TestSpeedups(TestCase): def test_scanstring(self): self.assertEquals(decoder.scanstring.__module__, "_json") - self.assert_(decoder.scanstring is decoder.c_scanstring) + self.assertTrue(decoder.scanstring is decoder.c_scanstring) def test_encode_basestring_ascii(self): self.assertEquals(encoder.encode_basestring_ascii.__module__, "_json") - self.assert_(encoder.encode_basestring_ascii is + self.assertTrue(encoder.encode_basestring_ascii is encoder.c_encode_basestring_ascii) Modified: python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_tkinter/test_text.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_tkinter/test_text.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_tkinter/test_text.py Wed Aug 5 15:32:47 2009 @@ -155,18 +155,18 @@ text = self.text # pattern and index are obligatory arguments. - self.failUnlessRaises(Tkinter.TclError, text.search, None, '1.0') - self.failUnlessRaises(Tkinter.TclError, text.search, 'a', None) - self.failUnlessRaises(Tkinter.TclError, text.search, None, None) + self.assertRaises(Tkinter.TclError, text.search, None, '1.0') + self.assertRaises(Tkinter.TclError, text.search, 'a', None) + self.assertRaises(Tkinter.TclError, text.search, None, None) # Invalid text index. - self.failUnlessRaises(Tkinter.TclError, text.search, '', 0) + self.assertRaises(Tkinter.TclError, text.search, '', 0) # Check if we are getting the indices as strings -- you are likely # to get Tcl_Obj under Tk 8.5 if Tkinter doesn't convert it. text.insert('1.0', 'hi-test') - self.failUnlessEqual(text.search('-test', '1.0', 'end'), '1.2') - self.failUnlessEqual(text.search('test', '1.0', 'end'), '1.3') + self.assertEqual(text.search('-test', '1.0', 'end'), '1.2') + self.assertEqual(text.search('test', '1.0', 'end'), '1.3') def test_see(self): pass Modified: python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_extensions.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_extensions.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_extensions.py Wed Aug 5 15:32:47 2009 @@ -22,16 +22,16 @@ x = ttk.LabeledScale() var = x._variable._name x.destroy() - self.failUnlessRaises(Tkinter.TclError, x.tk.globalgetvar, var) + self.assertRaises(Tkinter.TclError, x.tk.globalgetvar, var) # manually created variable myvar = Tkinter.DoubleVar() name = myvar._name x = ttk.LabeledScale(variable=myvar) x.destroy() - self.failUnlessEqual(x.tk.globalgetvar(name), myvar.get()) + self.assertEqual(x.tk.globalgetvar(name), myvar.get()) del myvar - self.failUnlessRaises(Tkinter.TclError, x.tk.globalgetvar, name) + self.assertRaises(Tkinter.TclError, x.tk.globalgetvar, name) # checking that the tracing callback is properly removed myvar = Tkinter.IntVar() @@ -45,17 +45,17 @@ # it tries calling instance attributes not yet defined. ttk.LabeledScale(variable=myvar) if hasattr(sys, 'last_type'): - self.failIf(sys.last_type == Tkinter.TclError) + self.assertFalse(sys.last_type == Tkinter.TclError) def test_initialization(self): # master passing x = ttk.LabeledScale() - self.failUnlessEqual(x.master, Tkinter._default_root) + self.assertEqual(x.master, Tkinter._default_root) x.destroy() master = Tkinter.Frame() x = ttk.LabeledScale(master) - self.failUnlessEqual(x.master, master) + self.assertEqual(x.master, master) x.destroy() # variable initialization/passing @@ -63,29 +63,29 @@ (-1, -1), (sys.maxint + 1, sys.maxint + 1)) for pair in passed_expected: x = ttk.LabeledScale(from_=pair[0]) - self.failUnlessEqual(x.value, pair[1]) + self.assertEqual(x.value, pair[1]) x.destroy() x = ttk.LabeledScale(from_='2.5') - self.failUnlessRaises(ValueError, x._variable.get) + self.assertRaises(ValueError, x._variable.get) x.destroy() x = ttk.LabeledScale(from_=None) - self.failUnlessRaises(ValueError, x._variable.get) + self.assertRaises(ValueError, x._variable.get) x.destroy() # variable should have its default value set to the from_ value myvar = Tkinter.DoubleVar(value=20) x = ttk.LabeledScale(variable=myvar) - self.failUnlessEqual(x.value, 0) + self.assertEqual(x.value, 0) x.destroy() # check that it is really using a DoubleVar x = ttk.LabeledScale(variable=myvar, from_=0.5) - self.failUnlessEqual(x.value, 0.5) - self.failUnlessEqual(x._variable._name, myvar._name) + self.assertEqual(x.value, 0.5) + self.assertEqual(x._variable._name, myvar._name) x.destroy() # widget positionment def check_positions(scale, scale_pos, label, label_pos): - self.failUnlessEqual(scale.pack_info()['side'], scale_pos) - self.failUnlessEqual(label.place_info()['anchor'], label_pos) + self.assertEqual(scale.pack_info()['side'], scale_pos) + self.assertEqual(label.place_info()['anchor'], label_pos) x = ttk.LabeledScale(compound='top') check_positions(x.scale, 'bottom', x.label, 'n') x.destroy() @@ -100,7 +100,7 @@ x.destroy() # extra, and invalid, kwargs - self.failUnlessRaises(Tkinter.TclError, ttk.LabeledScale, a='b') + self.assertRaises(Tkinter.TclError, ttk.LabeledScale, a='b') def test_horizontal_range(self): @@ -111,7 +111,7 @@ linfo_1 = lscale.label.place_info() prev_xcoord = lscale.scale.coords()[0] - self.failUnlessEqual(prev_xcoord, int(linfo_1['x'])) + self.assertEqual(prev_xcoord, int(linfo_1['x'])) # change range to: from -5 to 5. This should change the x coord of # the scale widget, since 0 is at the middle of the new # range. @@ -120,15 +120,15 @@ # at the same time this shouldn't affect test outcome lscale.update() curr_xcoord = lscale.scale.coords()[0] - self.failUnless(prev_xcoord != curr_xcoord) + self.assertTrue(prev_xcoord != curr_xcoord) # the label widget should have been repositioned too linfo_2 = lscale.label.place_info() - self.failUnlessEqual(lscale.label['text'], 0) - self.failUnlessEqual(curr_xcoord, int(linfo_2['x'])) + self.assertEqual(lscale.label['text'], 0) + self.assertEqual(curr_xcoord, int(linfo_2['x'])) # change the range back lscale.scale.configure(from_=0, to=10) - self.failUnless(prev_xcoord != curr_xcoord) - self.failUnlessEqual(prev_xcoord, int(linfo_1['x'])) + self.assertTrue(prev_xcoord != curr_xcoord) + self.assertEqual(prev_xcoord, int(linfo_1['x'])) lscale.destroy() @@ -145,16 +145,16 @@ # The following update is needed since the test doesn't use mainloop, # at the same time this shouldn't affect test outcome x.update() - self.failUnlessEqual(x.label['text'], newval) - self.failUnless(x.scale.coords()[0] > curr_xcoord) - self.failUnlessEqual(x.scale.coords()[0], + self.assertEqual(x.label['text'], newval) + self.assertTrue(x.scale.coords()[0] > curr_xcoord) + self.assertEqual(x.scale.coords()[0], int(x.label.place_info()['x'])) # value outside range x.value = x.scale['to'] + 1 # no changes shouldn't happen x.update() - self.failUnlessEqual(x.label['text'], newval) - self.failUnlessEqual(x.scale.coords()[0], + self.assertEqual(x.label['text'], newval) + self.assertEqual(x.scale.coords()[0], int(x.label.place_info()['x'])) x.destroy() @@ -172,7 +172,7 @@ x.value = 3 x.update() x.master.wm_geometry("%dx%d" % (width_new, height_new)) - self.failUnlessEqual(int(x.label.place_info()['x']), + self.assertEqual(int(x.label.place_info()['x']), x.scale.coords()[0]) # Reset geometry @@ -197,20 +197,20 @@ name = var._name optmenu.update_idletasks() optmenu.destroy() - self.failUnlessEqual(optmenu.tk.globalgetvar(name), var.get()) + self.assertEqual(optmenu.tk.globalgetvar(name), var.get()) del var - self.failUnlessRaises(Tkinter.TclError, optmenu.tk.globalgetvar, name) + self.assertRaises(Tkinter.TclError, optmenu.tk.globalgetvar, name) def test_initialization(self): - self.failUnlessRaises(Tkinter.TclError, + self.assertRaises(Tkinter.TclError, ttk.OptionMenu, None, self.textvar, invalid='thing') optmenu = ttk.OptionMenu(None, self.textvar, 'b', 'a', 'b') - self.failUnlessEqual(optmenu._variable.get(), 'b') + self.assertEqual(optmenu._variable.get(), 'b') - self.failUnless(optmenu['menu']) - self.failUnless(optmenu['textvariable']) + self.assertTrue(optmenu['menu']) + self.assertTrue(optmenu['textvariable']) optmenu.destroy() @@ -222,10 +222,10 @@ found_default = False for i in range(len(items)): value = optmenu['menu'].entrycget(i, 'value') - self.failUnlessEqual(value, items[i]) + self.assertEqual(value, items[i]) if value == default: found_default = True - self.failUnless(found_default) + self.assertTrue(found_default) optmenu.destroy() # default shouldn't be in menu if it is not part of values @@ -238,26 +238,26 @@ if last == curr: # no more menu entries break - self.failIf(curr == default) + self.assertFalse(curr == default) i += 1 - self.failUnlessEqual(i, len(items)) + self.assertEqual(i, len(items)) # check that variable is updated correctly optmenu.pack() optmenu.wait_visibility() optmenu['menu'].invoke(0) - self.failUnlessEqual(optmenu._variable.get(), items[0]) + self.assertEqual(optmenu._variable.get(), items[0]) # changing to an invalid index shouldn't change the variable - self.failUnlessRaises(Tkinter.TclError, optmenu['menu'].invoke, -1) - self.failUnlessEqual(optmenu._variable.get(), items[0]) + self.assertRaises(Tkinter.TclError, optmenu['menu'].invoke, -1) + self.assertEqual(optmenu._variable.get(), items[0]) optmenu.destroy() # specifying a callback success = [] def cb_test(item): - self.failUnlessEqual(item, items[1]) + self.assertEqual(item, items[1]) success.append(True) optmenu = ttk.OptionMenu(None, self.textvar, 'a', command=cb_test, *items) Modified: python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_functions.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_functions.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_functions.py Wed Aug 5 15:32:47 2009 @@ -28,12 +28,12 @@ def test_format_optdict(self): def check_against(fmt_opts, result): for i in range(0, len(fmt_opts), 2): - self.failUnlessEqual(result.pop(fmt_opts[i]), fmt_opts[i + 1]) + self.assertEqual(result.pop(fmt_opts[i]), fmt_opts[i + 1]) if result: self.fail("result still got elements: %s" % result) # passing an empty dict should return an empty object (tuple here) - self.failIf(ttk._format_optdict({})) + self.assertFalse(ttk._format_optdict({})) # check list formatting check_against( @@ -63,7 +63,7 @@ # check if giving unicode keys is fine check_against(ttk._format_optdict(opts), {u'-??????': True, u'-??': False}) # opts should remain unchanged - self.failUnlessEqual(opts, orig_opts) + self.assertEqual(opts, orig_opts) # passing values with spaces inside a tuple/list check_against( @@ -73,113 +73,113 @@ # ignore an option amount_opts = len(ttk._format_optdict(opts, ignore=(u'??'))) / 2 - self.failUnlessEqual(amount_opts, len(opts) - 1) + self.assertEqual(amount_opts, len(opts) - 1) # ignore non-existing options amount_opts = len(ttk._format_optdict(opts, ignore=(u'??', 'b'))) / 2 - self.failUnlessEqual(amount_opts, len(opts) - 1) + self.assertEqual(amount_opts, len(opts) - 1) # ignore every option - self.failIf(ttk._format_optdict(opts, ignore=opts.keys())) + self.assertFalse(ttk._format_optdict(opts, ignore=opts.keys())) def test_format_mapdict(self): opts = {'a': [('b', 'c', 'val'), ('d', 'otherval'), ('', 'single')]} result = ttk._format_mapdict(opts) - self.failUnlessEqual(len(result), len(opts.keys()) * 2) - self.failUnlessEqual(result, ('-a', '{b c} val d otherval {} single')) - self.failUnlessEqual(ttk._format_mapdict(opts, script=True), + self.assertEqual(len(result), len(opts.keys()) * 2) + self.assertEqual(result, ('-a', '{b c} val d otherval {} single')) + self.assertEqual(ttk._format_mapdict(opts, script=True), ('-a', '{{b c} val d otherval {} single}')) - self.failUnlessEqual(ttk._format_mapdict({2: []}), ('-2', '')) + self.assertEqual(ttk._format_mapdict({2: []}), ('-2', '')) opts = {u'??????????d??': [(u'??', u'v??l')]} result = ttk._format_mapdict(opts) - self.failUnlessEqual(result, (u'-??????????d??', u'?? v??l')) + self.assertEqual(result, (u'-??????????d??', u'?? v??l')) # empty states valid = {'opt': [('', u'', 'hi')]} - self.failUnlessEqual(ttk._format_mapdict(valid), ('-opt', '{ } hi')) + self.assertEqual(ttk._format_mapdict(valid), ('-opt', '{ } hi')) # when passing multiple states, they all must be strings invalid = {'opt': [(1, 2, 'valid val')]} - self.failUnlessRaises(TypeError, ttk._format_mapdict, invalid) + self.assertRaises(TypeError, ttk._format_mapdict, invalid) invalid = {'opt': [([1], '2', 'valid val')]} - self.failUnlessRaises(TypeError, ttk._format_mapdict, invalid) + self.assertRaises(TypeError, ttk._format_mapdict, invalid) # but when passing a single state, it can be anything valid = {'opt': [[1, 'value']]} - self.failUnlessEqual(ttk._format_mapdict(valid), ('-opt', '1 value')) + self.assertEqual(ttk._format_mapdict(valid), ('-opt', '1 value')) # special attention to single states which evalute to False for stateval in (None, 0, False, '', set()): # just some samples valid = {'opt': [(stateval, 'value')]} - self.failUnlessEqual(ttk._format_mapdict(valid), + self.assertEqual(ttk._format_mapdict(valid), ('-opt', '{} value')) # values must be iterable opts = {'a': None} - self.failUnlessRaises(TypeError, ttk._format_mapdict, opts) + self.assertRaises(TypeError, ttk._format_mapdict, opts) # items in the value must have size >= 2 - self.failUnlessRaises(IndexError, ttk._format_mapdict, + self.assertRaises(IndexError, ttk._format_mapdict, {'a': [('invalid', )]}) def test_format_elemcreate(self): - self.failUnless(ttk._format_elemcreate(None), (None, ())) + self.assertTrue(ttk._format_elemcreate(None), (None, ())) ## Testing type = image # image type expects at least an image name, so this should raise # IndexError since it tries to access the index 0 of an empty tuple - self.failUnlessRaises(IndexError, ttk._format_elemcreate, 'image') + self.assertRaises(IndexError, ttk._format_elemcreate, 'image') # don't format returned values as a tcl script # minimum acceptable for image type - self.failUnlessEqual(ttk._format_elemcreate('image', False, 'test'), + self.assertEqual(ttk._format_elemcreate('image', False, 'test'), ("test ", ())) # specifiyng a state spec - self.failUnlessEqual(ttk._format_elemcreate('image', False, 'test', + self.assertEqual(ttk._format_elemcreate('image', False, 'test', ('', 'a')), ("test {} a", ())) # state spec with multiple states - self.failUnlessEqual(ttk._format_elemcreate('image', False, 'test', + self.assertEqual(ttk._format_elemcreate('image', False, 'test', ('a', 'b', 'c')), ("test {a b} c", ())) # state spec and options - self.failUnlessEqual(ttk._format_elemcreate('image', False, 'test', + self.assertEqual(ttk._format_elemcreate('image', False, 'test', ('a', 'b'), a='x', b='y'), ("test a b", ("-a", "x", "-b", "y"))) # format returned values as a tcl script # state spec with multiple states and an option with a multivalue - self.failUnlessEqual(ttk._format_elemcreate('image', True, 'test', + self.assertEqual(ttk._format_elemcreate('image', True, 'test', ('a', 'b', 'c', 'd'), x=[2, 3]), ("{test {a b c} d}", "-x {2 3}")) ## Testing type = vsapi # vsapi type expects at least a class name and a part_id, so this # should raise an ValueError since it tries to get two elements from # an empty tuple - self.failUnlessRaises(ValueError, ttk._format_elemcreate, 'vsapi') + self.assertRaises(ValueError, ttk._format_elemcreate, 'vsapi') # don't format returned values as a tcl script # minimum acceptable for vsapi - self.failUnlessEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b'), + self.assertEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b'), ("a b ", ())) # now with a state spec with multiple states - self.failUnlessEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b', + self.assertEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b', ('a', 'b', 'c')), ("a b {a b} c", ())) # state spec and option - self.failUnlessEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b', + self.assertEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b', ('a', 'b'), opt='x'), ("a b a b", ("-opt", "x"))) # format returned values as a tcl script # state spec with a multivalue and an option - self.failUnlessEqual(ttk._format_elemcreate('vsapi', True, 'a', 'b', + self.assertEqual(ttk._format_elemcreate('vsapi', True, 'a', 'b', ('a', 'b', [1, 2]), opt='x'), ("{a b {a b} {1 2}}", "-opt x")) # Testing type = from # from type expects at least a type name - self.failUnlessRaises(IndexError, ttk._format_elemcreate, 'from') + self.assertRaises(IndexError, ttk._format_elemcreate, 'from') - self.failUnlessEqual(ttk._format_elemcreate('from', False, 'a'), + self.assertEqual(ttk._format_elemcreate('from', False, 'a'), ('a', ())) - self.failUnlessEqual(ttk._format_elemcreate('from', False, 'a', 'b'), + self.assertEqual(ttk._format_elemcreate('from', False, 'a', 'b'), ('a', ('b', ))) - self.failUnlessEqual(ttk._format_elemcreate('from', True, 'a', 'b'), + self.assertEqual(ttk._format_elemcreate('from', True, 'a', 'b'), ('{a}', 'b')) @@ -208,75 +208,75 @@ spaces(2 * indent_size), spaces(indent_size), spaces())) # empty layout - self.failUnlessEqual(ttk._format_layoutlist([])[0], '') + self.assertEqual(ttk._format_layoutlist([])[0], '') # smallest (after an empty one) acceptable layout smallest = ttk._format_layoutlist([('a', None)], indent=0) - self.failUnlessEqual(smallest, + self.assertEqual(smallest, ttk._format_layoutlist([('a', '')], indent=0)) - self.failUnlessEqual(smallest[0], 'a') + self.assertEqual(smallest[0], 'a') # testing indentation levels - self.failUnlessEqual(sample(), sample_expected()) + self.assertEqual(sample(), sample_expected()) for i in range(4): - self.failUnlessEqual(sample(i), sample_expected(i)) - self.failUnlessEqual(sample(i, i), sample_expected(i, i)) + self.assertEqual(sample(i), sample_expected(i)) + self.assertEqual(sample(i, i), sample_expected(i, i)) # invalid layout format, different kind of exceptions will be # raised # plain wrong format - self.failUnlessRaises(ValueError, ttk._format_layoutlist, + self.assertRaises(ValueError, ttk._format_layoutlist, ['bad', 'format']) - self.failUnlessRaises(TypeError, ttk._format_layoutlist, None) + self.assertRaises(TypeError, ttk._format_layoutlist, None) # _format_layoutlist always expects the second item (in every item) # to act like a dict (except when the value evalutes to False). - self.failUnlessRaises(AttributeError, + self.assertRaises(AttributeError, ttk._format_layoutlist, [('a', 'b')]) # bad children formatting - self.failUnlessRaises(ValueError, ttk._format_layoutlist, + self.assertRaises(ValueError, ttk._format_layoutlist, [('name', {'children': {'a': None}})]) def test_script_from_settings(self): # empty options - self.failIf(ttk._script_from_settings({'name': + self.assertFalse(ttk._script_from_settings({'name': {'configure': None, 'map': None, 'element create': None}})) # empty layout - self.failUnlessEqual( + self.assertEqual( ttk._script_from_settings({'name': {'layout': None}}), "ttk::style layout name {\nnull\n}") configdict = {u'??????': True, u'??': False} - self.failUnless( + self.assertTrue( ttk._script_from_settings({'name': {'configure': configdict}})) mapdict = {u'??????????d??': [(u'??', u'v??l')]} - self.failUnless( + self.assertTrue( ttk._script_from_settings({'name': {'map': mapdict}})) # invalid image element - self.failUnlessRaises(IndexError, + self.assertRaises(IndexError, ttk._script_from_settings, {'name': {'element create': ['image']}}) # minimal valid image - self.failUnless(ttk._script_from_settings({'name': + self.assertTrue(ttk._script_from_settings({'name': {'element create': ['image', 'name']}})) image = {'thing': {'element create': ['image', 'name', ('state1', 'state2', 'val')]}} - self.failUnlessEqual(ttk._script_from_settings(image), + self.assertEqual(ttk._script_from_settings(image), "ttk::style element create thing image {name {state1 state2} val} ") image['thing']['element create'].append({'opt': 30}) - self.failUnlessEqual(ttk._script_from_settings(image), + self.assertEqual(ttk._script_from_settings(image), "ttk::style element create thing image {name {state1 state2} val} " "-opt 30") image['thing']['element create'][-1]['opt'] = [MockTclObj(3), MockTclObj('2m')] - self.failUnlessEqual(ttk._script_from_settings(image), + self.assertEqual(ttk._script_from_settings(image), "ttk::style element create thing image {name {state1 state2} val} " "-opt {3 2m}") @@ -284,28 +284,28 @@ def test_dict_from_tcltuple(self): fakettuple = ('-a', '{1 2 3}', '-something', 'foo') - self.failUnlessEqual(ttk._dict_from_tcltuple(fakettuple, False), + self.assertEqual(ttk._dict_from_tcltuple(fakettuple, False), {'-a': '{1 2 3}', '-something': 'foo'}) - self.failUnlessEqual(ttk._dict_from_tcltuple(fakettuple), + self.assertEqual(ttk._dict_from_tcltuple(fakettuple), {'a': '{1 2 3}', 'something': 'foo'}) # passing a tuple with a single item should return an empty dict, # since it tries to break the tuple by pairs. - self.failIf(ttk._dict_from_tcltuple(('single', ))) + self.assertFalse(ttk._dict_from_tcltuple(('single', ))) sspec = MockStateSpec('a', 'b') - self.failUnlessEqual(ttk._dict_from_tcltuple(('-a', (sspec, 'val'))), + self.assertEqual(ttk._dict_from_tcltuple(('-a', (sspec, 'val'))), {'a': [('a', 'b', 'val')]}) - self.failUnlessEqual(ttk._dict_from_tcltuple((MockTclObj('-padding'), + self.assertEqual(ttk._dict_from_tcltuple((MockTclObj('-padding'), [MockTclObj('1'), 2, MockTclObj('3m')])), {'padding': [1, 2, '3m']}) def test_list_from_statespec(self): def test_it(sspec, value, res_value, states): - self.failUnlessEqual(ttk._list_from_statespec( + self.assertEqual(ttk._list_from_statespec( (sspec, value)), [states + (res_value, )]) states_even = tuple('state%d' % i for i in range(6)) @@ -322,19 +322,19 @@ def test_list_from_layouttuple(self): # empty layout tuple - self.failIf(ttk._list_from_layouttuple(())) + self.assertFalse(ttk._list_from_layouttuple(())) # shortest layout tuple - self.failUnlessEqual(ttk._list_from_layouttuple(('name', )), + self.assertEqual(ttk._list_from_layouttuple(('name', )), [('name', {})]) # not so interesting ltuple sample_ltuple = ('name', '-option', 'value') - self.failUnlessEqual(ttk._list_from_layouttuple(sample_ltuple), + self.assertEqual(ttk._list_from_layouttuple(sample_ltuple), [('name', {'option': 'value'})]) # empty children - self.failUnlessEqual(ttk._list_from_layouttuple( + self.assertEqual(ttk._list_from_layouttuple( ('something', '-children', ())), [('something', {'children': []})] ) @@ -347,7 +347,7 @@ ) ) ) - self.failUnlessEqual(ttk._list_from_layouttuple(ltuple), + self.assertEqual(ttk._list_from_layouttuple(ltuple), [('name', {'option': 'niceone', 'children': [('otherone', {'otheropt': 'othervalue', 'children': [('child', {})] @@ -356,13 +356,13 @@ ) # bad tuples - self.failUnlessRaises(ValueError, ttk._list_from_layouttuple, + self.assertRaises(ValueError, ttk._list_from_layouttuple, ('name', 'no_minus')) - self.failUnlessRaises(ValueError, ttk._list_from_layouttuple, + self.assertRaises(ValueError, ttk._list_from_layouttuple, ('name', 'no_minus', 'value')) - self.failUnlessRaises(ValueError, ttk._list_from_layouttuple, + self.assertRaises(ValueError, ttk._list_from_layouttuple, ('something', '-children')) # no children - self.failUnlessRaises(ValueError, ttk._list_from_layouttuple, + self.assertRaises(ValueError, ttk._list_from_layouttuple, ('something', '-children', 'value')) # invalid children @@ -373,10 +373,10 @@ return (opt, val) options = {'test': None} - self.failUnlessEqual(ttk._val_or_dict(options, func), "test val") + self.assertEqual(ttk._val_or_dict(options, func), "test val") options = {'test': 3} - self.failUnlessEqual(ttk._val_or_dict(options, func), options) + self.assertEqual(ttk._val_or_dict(options, func), options) def test_convert_stringval(self): @@ -385,10 +385,10 @@ (None, 'None') ) for orig, expected in tests: - self.failUnlessEqual(ttk._convert_stringval(orig), expected) + self.assertEqual(ttk._convert_stringval(orig), expected) if sys.getdefaultencoding() == 'ascii': - self.failUnlessRaises(UnicodeDecodeError, + self.assertRaises(UnicodeDecodeError, ttk._convert_stringval, '??') @@ -396,27 +396,27 @@ def test_unicode(self): adict = {'opt': u'v??l????'} - self.failUnlessEqual(ttk.tclobjs_to_py(adict), {'opt': u'v??l????'}) + self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': u'v??l????'}) adict['opt'] = MockTclObj(adict['opt']) - self.failUnlessEqual(ttk.tclobjs_to_py(adict), {'opt': u'v??l????'}) + self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': u'v??l????'}) def test_multivalues(self): adict = {'opt': [1, 2, 3, 4]} - self.failUnlessEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 2, 3, 4]}) + self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 2, 3, 4]}) adict['opt'] = [1, 'xm', 3] - self.failUnlessEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 'xm', 3]}) + self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 'xm', 3]}) adict['opt'] = (MockStateSpec('a', 'b'), u'v??l????') - self.failUnlessEqual(ttk.tclobjs_to_py(adict), + self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': [('a', 'b', u'v??l????')]}) - self.failUnlessEqual(ttk.tclobjs_to_py({'x': ['y z']}), + self.assertEqual(ttk.tclobjs_to_py({'x': ['y z']}), {'x': ['y z']}) def test_nosplit(self): - self.failUnlessEqual(ttk.tclobjs_to_py({'text': 'some text'}), + self.assertEqual(ttk.tclobjs_to_py({'text': 'some text'}), {'text': 'some text'}) tests_nogui = (InternalFunctionsTest, TclObjsToPyTest) Modified: python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_style.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_style.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_style.py Wed Aug 5 15:32:47 2009 @@ -16,17 +16,17 @@ def test_configure(self): style = self.style style.configure('TButton', background='yellow') - self.failUnlessEqual(style.configure('TButton', 'background'), + self.assertEqual(style.configure('TButton', 'background'), 'yellow') - self.failUnless(isinstance(style.configure('TButton'), dict)) + self.assertTrue(isinstance(style.configure('TButton'), dict)) def test_map(self): style = self.style style.map('TButton', background=[('active', 'background', 'blue')]) - self.failUnlessEqual(style.map('TButton', 'background'), + self.assertEqual(style.map('TButton', 'background'), [('active', 'background', 'blue')]) - self.failUnless(isinstance(style.map('TButton'), dict)) + self.assertTrue(isinstance(style.map('TButton'), dict)) def test_lookup(self): @@ -34,38 +34,38 @@ style.configure('TButton', background='yellow') style.map('TButton', background=[('active', 'background', 'blue')]) - self.failUnlessEqual(style.lookup('TButton', 'background'), 'yellow') - self.failUnlessEqual(style.lookup('TButton', 'background', + self.assertEqual(style.lookup('TButton', 'background'), 'yellow') + self.assertEqual(style.lookup('TButton', 'background', ['active', 'background']), 'blue') - self.failUnlessEqual(style.lookup('TButton', 'optionnotdefined', + self.assertEqual(style.lookup('TButton', 'optionnotdefined', default='iknewit'), 'iknewit') def test_layout(self): style = self.style - self.failUnlessRaises(Tkinter.TclError, style.layout, 'NotALayout') + self.assertRaises(Tkinter.TclError, style.layout, 'NotALayout') tv_style = style.layout('Treeview') # "erase" Treeview layout style.layout('Treeview', '') - self.failUnlessEqual(style.layout('Treeview'), + self.assertEqual(style.layout('Treeview'), [('null', {'sticky': 'nswe'})] ) # restore layout style.layout('Treeview', tv_style) - self.failUnlessEqual(style.layout('Treeview'), tv_style) + self.assertEqual(style.layout('Treeview'), tv_style) # should return a list - self.failUnless(isinstance(style.layout('TButton'), list)) + self.assertTrue(isinstance(style.layout('TButton'), list)) # correct layout, but "option" doesn't exist as option - self.failUnlessRaises(Tkinter.TclError, style.layout, 'Treeview', + self.assertRaises(Tkinter.TclError, style.layout, 'Treeview', [('name', {'option': 'inexistent'})]) def test_theme_use(self): - self.failUnlessRaises(Tkinter.TclError, self.style.theme_use, + self.assertRaises(Tkinter.TclError, self.style.theme_use, 'nonexistingname') curr_theme = self.style.theme_use() @@ -79,8 +79,8 @@ # just one theme available, can't go on with tests return - self.failIf(curr_theme == new_theme) - self.failIf(new_theme != self.style.theme_use()) + self.assertFalse(curr_theme == new_theme) + self.assertFalse(new_theme != self.style.theme_use()) self.style.theme_use(curr_theme) Modified: python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_widgets.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_widgets.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib-tk/test/test_ttk/test_widgets.py Wed Aug 5 15:32:47 2009 @@ -24,48 +24,48 @@ def test_identify(self): self.widget.update_idletasks() - self.failUnlessEqual(self.widget.identify(5, 5), "label") - self.failUnlessEqual(self.widget.identify(-1, -1), "") + self.assertEqual(self.widget.identify(5, 5), "label") + self.assertEqual(self.widget.identify(-1, -1), "") - self.failUnlessRaises(Tkinter.TclError, self.widget.identify, None, 5) - self.failUnlessRaises(Tkinter.TclError, self.widget.identify, 5, None) - self.failUnlessRaises(Tkinter.TclError, self.widget.identify, 5, '') + self.assertRaises(Tkinter.TclError, self.widget.identify, None, 5) + self.assertRaises(Tkinter.TclError, self.widget.identify, 5, None) + self.assertRaises(Tkinter.TclError, self.widget.identify, 5, '') def test_widget_state(self): # XXX not sure about the portability of all these tests - self.failUnlessEqual(self.widget.state(), ()) - self.failUnlessEqual(self.widget.instate(['!disabled']), True) + self.assertEqual(self.widget.state(), ()) + self.assertEqual(self.widget.instate(['!disabled']), True) # changing from !disabled to disabled - self.failUnlessEqual(self.widget.state(['disabled']), ('!disabled', )) + self.assertEqual(self.widget.state(['disabled']), ('!disabled', )) # no state change - self.failUnlessEqual(self.widget.state(['disabled']), ()) + self.assertEqual(self.widget.state(['disabled']), ()) # change back to !disable but also active - self.failUnlessEqual(self.widget.state(['!disabled', 'active']), + self.assertEqual(self.widget.state(['!disabled', 'active']), ('!active', 'disabled')) # no state changes, again - self.failUnlessEqual(self.widget.state(['!disabled', 'active']), ()) - self.failUnlessEqual(self.widget.state(['active', '!disabled']), ()) + self.assertEqual(self.widget.state(['!disabled', 'active']), ()) + self.assertEqual(self.widget.state(['active', '!disabled']), ()) def test_cb(arg1, **kw): return arg1, kw - self.failUnlessEqual(self.widget.instate(['!disabled'], + self.assertEqual(self.widget.instate(['!disabled'], test_cb, "hi", **{"msg": "there"}), ('hi', {'msg': 'there'})) # attempt to set invalid statespec currstate = self.widget.state() - self.failUnlessRaises(Tkinter.TclError, self.widget.instate, + self.assertRaises(Tkinter.TclError, self.widget.instate, ['badstate']) - self.failUnlessRaises(Tkinter.TclError, self.widget.instate, + self.assertRaises(Tkinter.TclError, self.widget.instate, ['disabled', 'badstate']) # verify that widget didn't change its state - self.failUnlessEqual(currstate, self.widget.state()) + self.assertEqual(currstate, self.widget.state()) # ensuring that passing None as state doesn't modify current state self.widget.state(['active', '!disabled']) - self.failUnlessEqual(self.widget.state(), ('active', )) + self.assertEqual(self.widget.state(), ('active', )) class ButtonTest(unittest.TestCase): @@ -74,7 +74,7 @@ success = [] btn = ttk.Button(command=lambda: success.append(1)) btn.invoke() - self.failUnless(success) + self.assertTrue(success) class CheckbuttonTest(unittest.TestCase): @@ -88,21 +88,21 @@ cbtn = ttk.Checkbutton(command=cb_test) # the variable automatically created by ttk.Checkbutton is actually # undefined till we invoke the Checkbutton - self.failUnlessEqual(cbtn.state(), ('alternate', )) - self.failUnlessRaises(Tkinter.TclError, cbtn.tk.globalgetvar, + self.assertEqual(cbtn.state(), ('alternate', )) + self.assertRaises(Tkinter.TclError, cbtn.tk.globalgetvar, cbtn['variable']) res = cbtn.invoke() - self.failUnlessEqual(res, "cb test called") - self.failUnlessEqual(cbtn['onvalue'], + self.assertEqual(res, "cb test called") + self.assertEqual(cbtn['onvalue'], cbtn.tk.globalgetvar(cbtn['variable'])) - self.failUnless(success) + self.assertTrue(success) cbtn['command'] = '' res = cbtn.invoke() - self.failUnlessEqual(res, '') - self.failIf(len(success) > 1) - self.failUnlessEqual(cbtn['offvalue'], + self.assertEqual(res, '') + self.assertFalse(len(success) > 1) + self.assertEqual(cbtn['offvalue'], cbtn.tk.globalgetvar(cbtn['variable'])) @@ -138,7 +138,7 @@ self.combo.event_generate('') self.combo.update() - self.failUnless(success) + self.assertTrue(success) def test_postcommand(self): @@ -149,18 +149,18 @@ self.combo.wait_visibility() self._show_drop_down_listbox() - self.failUnless(success) + self.assertTrue(success) # testing postcommand removal self.combo['postcommand'] = '' self._show_drop_down_listbox() - self.failUnlessEqual(len(success), 1) + self.assertEqual(len(success), 1) def test_values(self): def check_get_current(getval, currval): - self.failUnlessEqual(self.combo.get(), getval) - self.failUnlessEqual(self.combo.current(), currval) + self.assertEqual(self.combo.get(), getval) + self.assertEqual(self.combo.current(), currval) check_get_current('', -1) @@ -182,17 +182,17 @@ # testing values with empty string set through configure self.combo.configure(values=[1, '', 2]) - self.failUnlessEqual(self.combo['values'], ('1', '', '2')) + self.assertEqual(self.combo['values'], ('1', '', '2')) # out of range - self.failUnlessRaises(Tkinter.TclError, self.combo.current, + self.assertRaises(Tkinter.TclError, self.combo.current, len(self.combo['values'])) # it expects an integer (or something that can be converted to int) - self.failUnlessRaises(Tkinter.TclError, self.combo.current, '') + self.assertRaises(Tkinter.TclError, self.combo.current, '') # testing creating combobox with empty string in values combo2 = ttk.Combobox(values=[1, 2, '']) - self.failUnlessEqual(combo2['values'], ('1', '2', '')) + self.assertEqual(combo2['values'], ('1', '2', '')) combo2.destroy() @@ -208,12 +208,12 @@ def test_bbox(self): - self.failUnlessEqual(len(self.entry.bbox(0)), 4) + self.assertEqual(len(self.entry.bbox(0)), 4) for item in self.entry.bbox(0): - self.failUnless(isinstance(item, int)) + self.assertTrue(isinstance(item, int)) - self.failUnlessRaises(Tkinter.TclError, self.entry.bbox, 'noindex') - self.failUnlessRaises(Tkinter.TclError, self.entry.bbox, None) + self.assertRaises(Tkinter.TclError, self.entry.bbox, 'noindex') + self.assertRaises(Tkinter.TclError, self.entry.bbox, None) def test_identify(self): @@ -221,12 +221,12 @@ self.entry.wait_visibility() self.entry.update_idletasks() - self.failUnlessEqual(self.entry.identify(5, 5), "textarea") - self.failUnlessEqual(self.entry.identify(-1, -1), "") + self.assertEqual(self.entry.identify(5, 5), "textarea") + self.assertEqual(self.entry.identify(-1, -1), "") - self.failUnlessRaises(Tkinter.TclError, self.entry.identify, None, 5) - self.failUnlessRaises(Tkinter.TclError, self.entry.identify, 5, None) - self.failUnlessRaises(Tkinter.TclError, self.entry.identify, 5, '') + self.assertRaises(Tkinter.TclError, self.entry.identify, None, 5) + self.assertRaises(Tkinter.TclError, self.entry.identify, 5, None) + self.assertRaises(Tkinter.TclError, self.entry.identify, 5, '') def test_validation_options(self): @@ -238,23 +238,23 @@ self.entry['invalidcommand'] = test_invalid self.entry.validate() - self.failUnless(success) + self.assertTrue(success) self.entry['invalidcommand'] = '' self.entry.validate() - self.failUnlessEqual(len(success), 1) + self.assertEqual(len(success), 1) self.entry['invalidcommand'] = test_invalid self.entry['validatecommand'] = lambda: True self.entry.validate() - self.failUnlessEqual(len(success), 1) + self.assertEqual(len(success), 1) self.entry['validatecommand'] = '' self.entry.validate() - self.failUnlessEqual(len(success), 1) + self.assertEqual(len(success), 1) self.entry['validatecommand'] = True - self.failUnlessRaises(Tkinter.TclError, self.entry.validate) + self.assertRaises(Tkinter.TclError, self.entry.validate) def test_validation(self): @@ -271,8 +271,8 @@ self.entry.insert('end', 1) self.entry.insert('end', 'a') - self.failUnlessEqual(validation, [False, True]) - self.failUnlessEqual(self.entry.get(), 'a') + self.assertEqual(validation, [False, True]) + self.assertEqual(self.entry.get(), 'a') def test_revalidation(self): @@ -285,19 +285,19 @@ self.entry['validatecommand'] = self.entry.register(validate), '%P' self.entry.insert('end', 'avocado') - self.failUnlessEqual(self.entry.validate(), True) - self.failUnlessEqual(self.entry.state(), ()) + self.assertEqual(self.entry.validate(), True) + self.assertEqual(self.entry.state(), ()) self.entry.delete(0, 'end') - self.failUnlessEqual(self.entry.get(), '') + self.assertEqual(self.entry.get(), '') self.entry.insert('end', 'a1b') - self.failUnlessEqual(self.entry.validate(), False) - self.failUnlessEqual(self.entry.state(), ('invalid', )) + self.assertEqual(self.entry.validate(), False) + self.assertEqual(self.entry.state(), ('invalid', )) self.entry.delete(1) - self.failUnlessEqual(self.entry.validate(), True) - self.failUnlessEqual(self.entry.state(), ()) + self.assertEqual(self.entry.validate(), True) + self.assertEqual(self.entry.state(), ()) class PanedwindowTest(unittest.TestCase): @@ -315,108 +315,108 @@ # attempt to add a child that is not a direct child of the paned window label = ttk.Label(self.paned) child = ttk.Label(label) - self.failUnlessRaises(Tkinter.TclError, self.paned.add, child) + self.assertRaises(Tkinter.TclError, self.paned.add, child) label.destroy() child.destroy() # another attempt label = ttk.Label() child = ttk.Label(label) - self.failUnlessRaises(Tkinter.TclError, self.paned.add, child) + self.assertRaises(Tkinter.TclError, self.paned.add, child) child.destroy() label.destroy() good_child = ttk.Label() self.paned.add(good_child) # re-adding a child is not accepted - self.failUnlessRaises(Tkinter.TclError, self.paned.add, good_child) + self.assertRaises(Tkinter.TclError, self.paned.add, good_child) other_child = ttk.Label(self.paned) self.paned.add(other_child) - self.failUnlessEqual(self.paned.pane(0), self.paned.pane(1)) - self.failUnlessRaises(Tkinter.TclError, self.paned.pane, 2) + self.assertEqual(self.paned.pane(0), self.paned.pane(1)) + self.assertRaises(Tkinter.TclError, self.paned.pane, 2) good_child.destroy() other_child.destroy() - self.failUnlessRaises(Tkinter.TclError, self.paned.pane, 0) + self.assertRaises(Tkinter.TclError, self.paned.pane, 0) def test_forget(self): - self.failUnlessRaises(Tkinter.TclError, self.paned.forget, None) - self.failUnlessRaises(Tkinter.TclError, self.paned.forget, 0) + self.assertRaises(Tkinter.TclError, self.paned.forget, None) + self.assertRaises(Tkinter.TclError, self.paned.forget, 0) self.paned.add(ttk.Label()) self.paned.forget(0) - self.failUnlessRaises(Tkinter.TclError, self.paned.forget, 0) + self.assertRaises(Tkinter.TclError, self.paned.forget, 0) def test_insert(self): - self.failUnlessRaises(Tkinter.TclError, self.paned.insert, None, 0) - self.failUnlessRaises(Tkinter.TclError, self.paned.insert, 0, None) - self.failUnlessRaises(Tkinter.TclError, self.paned.insert, 0, 0) + self.assertRaises(Tkinter.TclError, self.paned.insert, None, 0) + self.assertRaises(Tkinter.TclError, self.paned.insert, 0, None) + self.assertRaises(Tkinter.TclError, self.paned.insert, 0, 0) child = ttk.Label() child2 = ttk.Label() child3 = ttk.Label() - self.failUnlessRaises(Tkinter.TclError, self.paned.insert, 0, child) + self.assertRaises(Tkinter.TclError, self.paned.insert, 0, child) self.paned.insert('end', child2) self.paned.insert(0, child) - self.failUnlessEqual(self.paned.panes(), (str(child), str(child2))) + self.assertEqual(self.paned.panes(), (str(child), str(child2))) self.paned.insert(0, child2) - self.failUnlessEqual(self.paned.panes(), (str(child2), str(child))) + self.assertEqual(self.paned.panes(), (str(child2), str(child))) self.paned.insert('end', child3) - self.failUnlessEqual(self.paned.panes(), + self.assertEqual(self.paned.panes(), (str(child2), str(child), str(child3))) # reinserting a child should move it to its current position panes = self.paned.panes() self.paned.insert('end', child3) - self.failUnlessEqual(panes, self.paned.panes()) + self.assertEqual(panes, self.paned.panes()) # moving child3 to child2 position should result in child2 ending up # in previous child position and child ending up in previous child3 # position self.paned.insert(child2, child3) - self.failUnlessEqual(self.paned.panes(), + self.assertEqual(self.paned.panes(), (str(child3), str(child2), str(child))) def test_pane(self): - self.failUnlessRaises(Tkinter.TclError, self.paned.pane, 0) + self.assertRaises(Tkinter.TclError, self.paned.pane, 0) child = ttk.Label() self.paned.add(child) - self.failUnless(isinstance(self.paned.pane(0), dict)) - self.failUnlessEqual(self.paned.pane(0, weight=None), 0) + self.assertTrue(isinstance(self.paned.pane(0), dict)) + self.assertEqual(self.paned.pane(0, weight=None), 0) # newer form for querying a single option - self.failUnlessEqual(self.paned.pane(0, 'weight'), 0) - self.failUnlessEqual(self.paned.pane(0), self.paned.pane(str(child))) + self.assertEqual(self.paned.pane(0, 'weight'), 0) + self.assertEqual(self.paned.pane(0), self.paned.pane(str(child))) - self.failUnlessRaises(Tkinter.TclError, self.paned.pane, 0, + self.assertRaises(Tkinter.TclError, self.paned.pane, 0, badoption='somevalue') def test_sashpos(self): - self.failUnlessRaises(Tkinter.TclError, self.paned.sashpos, None) - self.failUnlessRaises(Tkinter.TclError, self.paned.sashpos, '') - self.failUnlessRaises(Tkinter.TclError, self.paned.sashpos, 0) + self.assertRaises(Tkinter.TclError, self.paned.sashpos, None) + self.assertRaises(Tkinter.TclError, self.paned.sashpos, '') + self.assertRaises(Tkinter.TclError, self.paned.sashpos, 0) child = ttk.Label(self.paned, text='a') self.paned.add(child, weight=1) - self.failUnlessRaises(Tkinter.TclError, self.paned.sashpos, 0) + self.assertRaises(Tkinter.TclError, self.paned.sashpos, 0) child2 = ttk.Label(self.paned, text='b') self.paned.add(child2) - self.failUnlessRaises(Tkinter.TclError, self.paned.sashpos, 1) + self.assertRaises(Tkinter.TclError, self.paned.sashpos, 1) self.paned.pack(expand=True, fill='both') self.paned.wait_visibility() curr_pos = self.paned.sashpos(0) self.paned.sashpos(0, 1000) - self.failUnless(curr_pos != self.paned.sashpos(0)) - self.failUnless(isinstance(self.paned.sashpos(0), int)) + self.assertTrue(curr_pos != self.paned.sashpos(0)) + self.assertTrue(isinstance(self.paned.sashpos(0), int)) class RadiobuttonTest(unittest.TestCase): @@ -432,21 +432,21 @@ cbtn2 = ttk.Radiobutton(command=cb_test, variable=myvar, value=1) res = cbtn.invoke() - self.failUnlessEqual(res, "cb test called") - self.failUnlessEqual(cbtn['value'], myvar.get()) - self.failUnlessEqual(myvar.get(), + self.assertEqual(res, "cb test called") + self.assertEqual(cbtn['value'], myvar.get()) + self.assertEqual(myvar.get(), cbtn.tk.globalgetvar(cbtn['variable'])) - self.failUnless(success) + self.assertTrue(success) cbtn2['command'] = '' res = cbtn2.invoke() - self.failUnlessEqual(res, '') - self.failIf(len(success) > 1) - self.failUnlessEqual(cbtn2['value'], myvar.get()) - self.failUnlessEqual(myvar.get(), + self.assertEqual(res, '') + self.assertFalse(len(success) > 1) + self.assertEqual(cbtn2['value'], myvar.get()) + self.assertEqual(myvar.get(), cbtn.tk.globalgetvar(cbtn['variable'])) - self.failUnlessEqual(str(cbtn['variable']), str(cbtn2['variable'])) + self.assertEqual(str(cbtn['variable']), str(cbtn2['variable'])) @@ -472,27 +472,27 @@ self.scale['from_'] = 10 self.scale['to'] = 3 - self.failIf(failure) + self.assertFalse(failure) failure = [1, 1, 1] self.scale.configure(from_=2, to=5) self.scale.configure(from_=0, to=-2) self.scale.configure(to=10) - self.failIf(failure) + self.assertFalse(failure) def test_get(self): scale_width = self.scale.winfo_width() - self.failUnlessEqual(self.scale.get(scale_width, 0), self.scale['to']) + self.assertEqual(self.scale.get(scale_width, 0), self.scale['to']) - self.failUnlessEqual(self.scale.get(0, 0), self.scale['from']) - self.failUnlessEqual(self.scale.get(), self.scale['value']) + self.assertEqual(self.scale.get(0, 0), self.scale['from']) + self.assertEqual(self.scale.get(), self.scale['value']) self.scale['value'] = 30 - self.failUnlessEqual(self.scale.get(), self.scale['value']) + self.assertEqual(self.scale.get(), self.scale['value']) - self.failUnlessRaises(Tkinter.TclError, self.scale.get, '', 0) - self.failUnlessRaises(Tkinter.TclError, self.scale.get, 0, '') + self.assertRaises(Tkinter.TclError, self.scale.get, '', 0) + self.assertRaises(Tkinter.TclError, self.scale.get, 0, '') def test_set(self): @@ -500,30 +500,30 @@ max = self.scale['to'] new_max = max + 10 self.scale.set(new_max) - self.failUnlessEqual(self.scale.get(), max) + self.assertEqual(self.scale.get(), max) min = self.scale['from'] self.scale.set(min - 1) - self.failUnlessEqual(self.scale.get(), min) + self.assertEqual(self.scale.get(), min) # changing directly the variable doesn't impose this limitation tho var = Tkinter.DoubleVar() self.scale['variable'] = var var.set(max + 5) - self.failUnlessEqual(self.scale.get(), var.get()) - self.failUnlessEqual(self.scale.get(), max + 5) + self.assertEqual(self.scale.get(), var.get()) + self.assertEqual(self.scale.get(), max + 5) del var # the same happens with the value option self.scale['value'] = max + 10 - self.failUnlessEqual(self.scale.get(), max + 10) - self.failUnlessEqual(self.scale.get(), self.scale['value']) + self.assertEqual(self.scale.get(), max + 10) + self.assertEqual(self.scale.get(), self.scale['value']) # nevertheless, note that the max/min values we can get specifying # x, y coords are the ones according to the current range - self.failUnlessEqual(self.scale.get(0, 0), min) - self.failUnlessEqual(self.scale.get(self.scale.winfo_width(), 0), max) + self.assertEqual(self.scale.get(0, 0), min) + self.assertEqual(self.scale.get(self.scale.winfo_width(), 0), max) - self.failUnlessRaises(Tkinter.TclError, self.scale.set, None) + self.assertRaises(Tkinter.TclError, self.scale.set, None) class NotebookTest(unittest.TestCase): @@ -546,18 +546,18 @@ def test_tab_identifiers(self): self.nb.forget(0) self.nb.hide(self.child2) - self.failUnlessRaises(Tkinter.TclError, self.nb.tab, self.child1) - self.failUnlessEqual(self.nb.index('end'), 1) + self.assertRaises(Tkinter.TclError, self.nb.tab, self.child1) + self.assertEqual(self.nb.index('end'), 1) self.nb.add(self.child2) - self.failUnlessEqual(self.nb.index('end'), 1) + self.assertEqual(self.nb.index('end'), 1) self.nb.select(self.child2) - self.failUnless(self.nb.tab('current')) + self.assertTrue(self.nb.tab('current')) self.nb.add(self.child1, text='a') self.nb.pack() self.nb.wait_visibility() - self.failUnlessEqual(self.nb.tab('@5,5'), self.nb.tab('current')) + self.assertEqual(self.nb.tab('@5,5'), self.nb.tab('current')) for i in range(5, 100, 5): if self.nb.tab('@%d, 5' % i, text=None) == 'a': @@ -567,17 +567,17 @@ def test_add_and_hidden(self): - self.failUnlessRaises(Tkinter.TclError, self.nb.hide, -1) - self.failUnlessRaises(Tkinter.TclError, self.nb.hide, 'hi') - self.failUnlessRaises(Tkinter.TclError, self.nb.hide, None) - self.failUnlessRaises(Tkinter.TclError, self.nb.add, None) - self.failUnlessRaises(Tkinter.TclError, self.nb.add, ttk.Label(), + self.assertRaises(Tkinter.TclError, self.nb.hide, -1) + self.assertRaises(Tkinter.TclError, self.nb.hide, 'hi') + self.assertRaises(Tkinter.TclError, self.nb.hide, None) + self.assertRaises(Tkinter.TclError, self.nb.add, None) + self.assertRaises(Tkinter.TclError, self.nb.add, ttk.Label(), unknown='option') tabs = self.nb.tabs() self.nb.hide(self.child1) self.nb.add(self.child1) - self.failUnlessEqual(self.nb.tabs(), tabs) + self.assertEqual(self.nb.tabs(), tabs) child = ttk.Label() self.nb.add(child, text='c') @@ -588,70 +588,70 @@ child2_index = self.nb.index(self.child2) self.nb.hide(self.child2) self.nb.add(self.child2) - self.failUnlessEqual(self.nb.tabs(), tabs) - self.failUnlessEqual(self.nb.index(self.child2), child2_index) - self.failUnless(str(self.child2) == self.nb.tabs()[child2_index]) + self.assertEqual(self.nb.tabs(), tabs) + self.assertEqual(self.nb.index(self.child2), child2_index) + self.assertTrue(str(self.child2) == self.nb.tabs()[child2_index]) # but the tab next to it (not hidden) is the one selected now - self.failUnlessEqual(self.nb.index('current'), curr + 1) + self.assertEqual(self.nb.index('current'), curr + 1) def test_forget(self): - self.failUnlessRaises(Tkinter.TclError, self.nb.forget, -1) - self.failUnlessRaises(Tkinter.TclError, self.nb.forget, 'hi') - self.failUnlessRaises(Tkinter.TclError, self.nb.forget, None) + self.assertRaises(Tkinter.TclError, self.nb.forget, -1) + self.assertRaises(Tkinter.TclError, self.nb.forget, 'hi') + self.assertRaises(Tkinter.TclError, self.nb.forget, None) tabs = self.nb.tabs() child1_index = self.nb.index(self.child1) self.nb.forget(self.child1) - self.failIf(str(self.child1) in self.nb.tabs()) - self.failUnlessEqual(len(tabs) - 1, len(self.nb.tabs())) + self.assertFalse(str(self.child1) in self.nb.tabs()) + self.assertEqual(len(tabs) - 1, len(self.nb.tabs())) self.nb.add(self.child1) - self.failUnlessEqual(self.nb.index(self.child1), 1) - self.failIf(child1_index == self.nb.index(self.child1)) + self.assertEqual(self.nb.index(self.child1), 1) + self.assertFalse(child1_index == self.nb.index(self.child1)) def test_index(self): - self.failUnlessRaises(Tkinter.TclError, self.nb.index, -1) - self.failUnlessRaises(Tkinter.TclError, self.nb.index, None) + self.assertRaises(Tkinter.TclError, self.nb.index, -1) + self.assertRaises(Tkinter.TclError, self.nb.index, None) - self.failUnless(isinstance(self.nb.index('end'), int)) - self.failUnlessEqual(self.nb.index(self.child1), 0) - self.failUnlessEqual(self.nb.index(self.child2), 1) - self.failUnlessEqual(self.nb.index('end'), 2) + self.assertTrue(isinstance(self.nb.index('end'), int)) + self.assertEqual(self.nb.index(self.child1), 0) + self.assertEqual(self.nb.index(self.child2), 1) + self.assertEqual(self.nb.index('end'), 2) def test_insert(self): # moving tabs tabs = self.nb.tabs() self.nb.insert(1, tabs[0]) - self.failUnlessEqual(self.nb.tabs(), (tabs[1], tabs[0])) + self.assertEqual(self.nb.tabs(), (tabs[1], tabs[0])) self.nb.insert(self.child1, self.child2) - self.failUnlessEqual(self.nb.tabs(), tabs) + self.assertEqual(self.nb.tabs(), tabs) self.nb.insert('end', self.child1) - self.failUnlessEqual(self.nb.tabs(), (tabs[1], tabs[0])) + self.assertEqual(self.nb.tabs(), (tabs[1], tabs[0])) self.nb.insert('end', 0) - self.failUnlessEqual(self.nb.tabs(), tabs) + self.assertEqual(self.nb.tabs(), tabs) # bad moves - self.failUnlessRaises(Tkinter.TclError, self.nb.insert, 2, tabs[0]) - self.failUnlessRaises(Tkinter.TclError, self.nb.insert, -1, tabs[0]) + self.assertRaises(Tkinter.TclError, self.nb.insert, 2, tabs[0]) + self.assertRaises(Tkinter.TclError, self.nb.insert, -1, tabs[0]) # new tab child3 = ttk.Label() self.nb.insert(1, child3) - self.failUnlessEqual(self.nb.tabs(), (tabs[0], str(child3), tabs[1])) + self.assertEqual(self.nb.tabs(), (tabs[0], str(child3), tabs[1])) self.nb.forget(child3) - self.failUnlessEqual(self.nb.tabs(), tabs) + self.assertEqual(self.nb.tabs(), tabs) self.nb.insert(self.child1, child3) - self.failUnlessEqual(self.nb.tabs(), (str(child3), ) + tabs) + self.assertEqual(self.nb.tabs(), (str(child3), ) + tabs) self.nb.forget(child3) - self.failUnlessRaises(Tkinter.TclError, self.nb.insert, 2, child3) - self.failUnlessRaises(Tkinter.TclError, self.nb.insert, -1, child3) + self.assertRaises(Tkinter.TclError, self.nb.insert, 2, child3) + self.assertRaises(Tkinter.TclError, self.nb.insert, -1, child3) # bad inserts - self.failUnlessRaises(Tkinter.TclError, self.nb.insert, 'end', None) - self.failUnlessRaises(Tkinter.TclError, self.nb.insert, None, 0) - self.failUnlessRaises(Tkinter.TclError, self.nb.insert, None, None) + self.assertRaises(Tkinter.TclError, self.nb.insert, 'end', None) + self.assertRaises(Tkinter.TclError, self.nb.insert, None, 0) + self.assertRaises(Tkinter.TclError, self.nb.insert, None, None) def test_select(self): @@ -665,36 +665,36 @@ self.nb.bind('<>', lambda evt: tab_changed.append(True)) - self.failUnlessEqual(self.nb.select(), str(self.child1)) + self.assertEqual(self.nb.select(), str(self.child1)) self.nb.select(self.child2) - self.failUnless(success) - self.failUnlessEqual(self.nb.select(), str(self.child2)) + self.assertTrue(success) + self.assertEqual(self.nb.select(), str(self.child2)) self.nb.update() - self.failUnless(tab_changed) + self.assertTrue(tab_changed) def test_tab(self): - self.failUnlessRaises(Tkinter.TclError, self.nb.tab, -1) - self.failUnlessRaises(Tkinter.TclError, self.nb.tab, 'notab') - self.failUnlessRaises(Tkinter.TclError, self.nb.tab, None) + self.assertRaises(Tkinter.TclError, self.nb.tab, -1) + self.assertRaises(Tkinter.TclError, self.nb.tab, 'notab') + self.assertRaises(Tkinter.TclError, self.nb.tab, None) - self.failUnless(isinstance(self.nb.tab(self.child1), dict)) - self.failUnlessEqual(self.nb.tab(self.child1, text=None), 'a') + self.assertTrue(isinstance(self.nb.tab(self.child1), dict)) + self.assertEqual(self.nb.tab(self.child1, text=None), 'a') # newer form for querying a single option - self.failUnlessEqual(self.nb.tab(self.child1, 'text'), 'a') + self.assertEqual(self.nb.tab(self.child1, 'text'), 'a') self.nb.tab(self.child1, text='abc') - self.failUnlessEqual(self.nb.tab(self.child1, text=None), 'abc') - self.failUnlessEqual(self.nb.tab(self.child1, 'text'), 'abc') + self.assertEqual(self.nb.tab(self.child1, text=None), 'abc') + self.assertEqual(self.nb.tab(self.child1, 'text'), 'abc') def test_tabs(self): - self.failUnlessEqual(len(self.nb.tabs()), 2) + self.assertEqual(len(self.nb.tabs()), 2) self.nb.forget(self.child1) self.nb.forget(self.child2) - self.failUnlessEqual(self.nb.tabs(), ()) + self.assertEqual(self.nb.tabs(), ()) def test_traversal(self): @@ -705,16 +705,16 @@ support.simulate_mouse_click(self.nb, 5, 5) self.nb.event_generate('') - self.failUnlessEqual(self.nb.select(), str(self.child2)) + self.assertEqual(self.nb.select(), str(self.child2)) self.nb.event_generate('') - self.failUnlessEqual(self.nb.select(), str(self.child1)) + self.assertEqual(self.nb.select(), str(self.child1)) self.nb.event_generate('') - self.failUnlessEqual(self.nb.select(), str(self.child2)) + self.assertEqual(self.nb.select(), str(self.child2)) self.nb.tab(self.child1, text='a', underline=0) self.nb.enable_traversal() self.nb.event_generate('') - self.failUnlessEqual(self.nb.select(), str(self.child1)) + self.assertEqual(self.nb.select(), str(self.child1)) class TreeviewTest(unittest.TestCase): @@ -730,17 +730,17 @@ def test_bbox(self): self.tv.pack() - self.failUnlessEqual(self.tv.bbox(''), '') + self.assertEqual(self.tv.bbox(''), '') self.tv.wait_visibility() self.tv.update() item_id = self.tv.insert('', 'end') children = self.tv.get_children() - self.failUnless(children) + self.assertTrue(children) bbox = self.tv.bbox(children[0]) - self.failUnlessEqual(len(bbox), 4) - self.failUnless(isinstance(bbox, tuple)) + self.assertEqual(len(bbox), 4) + self.assertTrue(isinstance(bbox, tuple)) for item in bbox: if not isinstance(item, int): self.fail("Invalid bounding box: %s" % bbox) @@ -751,86 +751,86 @@ self.tv.column('test', width=50) bbox_column0 = self.tv.bbox(children[0], 0) root_width = self.tv.column('#0', width=None) - self.failUnlessEqual(bbox_column0[0], bbox[0] + root_width) + self.assertEqual(bbox_column0[0], bbox[0] + root_width) # verify that bbox of a closed item is the empty string child1 = self.tv.insert(item_id, 'end') - self.failUnlessEqual(self.tv.bbox(child1), '') + self.assertEqual(self.tv.bbox(child1), '') def test_children(self): # no children yet, should get an empty tuple - self.failUnlessEqual(self.tv.get_children(), ()) + self.assertEqual(self.tv.get_children(), ()) item_id = self.tv.insert('', 'end') - self.failUnless(isinstance(self.tv.get_children(), tuple)) - self.failUnlessEqual(self.tv.get_children()[0], item_id) + self.assertTrue(isinstance(self.tv.get_children(), tuple)) + self.assertEqual(self.tv.get_children()[0], item_id) # add item_id and child3 as children of child2 child2 = self.tv.insert('', 'end') child3 = self.tv.insert('', 'end') self.tv.set_children(child2, item_id, child3) - self.failUnlessEqual(self.tv.get_children(child2), (item_id, child3)) + self.assertEqual(self.tv.get_children(child2), (item_id, child3)) # child3 has child2 as parent, thus trying to set child2 as a children # of child3 should result in an error - self.failUnlessRaises(Tkinter.TclError, + self.assertRaises(Tkinter.TclError, self.tv.set_children, child3, child2) # remove child2 children self.tv.set_children(child2) - self.failUnlessEqual(self.tv.get_children(child2), ()) + self.assertEqual(self.tv.get_children(child2), ()) # remove root's children self.tv.set_children('') - self.failUnlessEqual(self.tv.get_children(), ()) + self.assertEqual(self.tv.get_children(), ()) def test_column(self): # return a dict with all options/values - self.failUnless(isinstance(self.tv.column('#0'), dict)) + self.assertTrue(isinstance(self.tv.column('#0'), dict)) # return a single value of the given option - self.failUnless(isinstance(self.tv.column('#0', width=None), int)) + self.assertTrue(isinstance(self.tv.column('#0', width=None), int)) # set a new value for an option self.tv.column('#0', width=10) # testing new way to get option value - self.failUnlessEqual(self.tv.column('#0', 'width'), 10) - self.failUnlessEqual(self.tv.column('#0', width=None), 10) + self.assertEqual(self.tv.column('#0', 'width'), 10) + self.assertEqual(self.tv.column('#0', width=None), 10) # check read-only option - self.failUnlessRaises(Tkinter.TclError, self.tv.column, '#0', id='X') + self.assertRaises(Tkinter.TclError, self.tv.column, '#0', id='X') - self.failUnlessRaises(Tkinter.TclError, self.tv.column, 'invalid') + self.assertRaises(Tkinter.TclError, self.tv.column, 'invalid') invalid_kws = [ {'unknown_option': 'some value'}, {'stretch': 'wrong'}, {'anchor': 'wrong'}, {'width': 'wrong'}, {'minwidth': 'wrong'} ] for kw in invalid_kws: - self.failUnlessRaises(Tkinter.TclError, self.tv.column, '#0', + self.assertRaises(Tkinter.TclError, self.tv.column, '#0', **kw) def test_delete(self): - self.failUnlessRaises(Tkinter.TclError, self.tv.delete, '#0') + self.assertRaises(Tkinter.TclError, self.tv.delete, '#0') item_id = self.tv.insert('', 'end') item2 = self.tv.insert(item_id, 'end') - self.failUnlessEqual(self.tv.get_children(), (item_id, )) - self.failUnlessEqual(self.tv.get_children(item_id), (item2, )) + self.assertEqual(self.tv.get_children(), (item_id, )) + self.assertEqual(self.tv.get_children(item_id), (item2, )) self.tv.delete(item_id) - self.failIf(self.tv.get_children()) + self.assertFalse(self.tv.get_children()) # reattach should fail - self.failUnlessRaises(Tkinter.TclError, + self.assertRaises(Tkinter.TclError, self.tv.reattach, item_id, '', 'end') # test multiple item delete item1 = self.tv.insert('', 'end') item2 = self.tv.insert('', 'end') - self.failUnlessEqual(self.tv.get_children(), (item1, item2)) + self.assertEqual(self.tv.get_children(), (item1, item2)) self.tv.delete(item1, item2) - self.failIf(self.tv.get_children()) + self.assertFalse(self.tv.get_children()) def test_detach_reattach(self): @@ -840,81 +840,81 @@ # calling detach without items is valid, although it does nothing prev = self.tv.get_children() self.tv.detach() # this should do nothing - self.failUnlessEqual(prev, self.tv.get_children()) + self.assertEqual(prev, self.tv.get_children()) - self.failUnlessEqual(self.tv.get_children(), (item_id, )) - self.failUnlessEqual(self.tv.get_children(item_id), (item2, )) + self.assertEqual(self.tv.get_children(), (item_id, )) + self.assertEqual(self.tv.get_children(item_id), (item2, )) # detach item with children self.tv.detach(item_id) - self.failIf(self.tv.get_children()) + self.assertFalse(self.tv.get_children()) # reattach item with children self.tv.reattach(item_id, '', 'end') - self.failUnlessEqual(self.tv.get_children(), (item_id, )) - self.failUnlessEqual(self.tv.get_children(item_id), (item2, )) + self.assertEqual(self.tv.get_children(), (item_id, )) + self.assertEqual(self.tv.get_children(item_id), (item2, )) # move a children to the root self.tv.move(item2, '', 'end') - self.failUnlessEqual(self.tv.get_children(), (item_id, item2)) - self.failUnlessEqual(self.tv.get_children(item_id), ()) + self.assertEqual(self.tv.get_children(), (item_id, item2)) + self.assertEqual(self.tv.get_children(item_id), ()) # bad values - self.failUnlessRaises(Tkinter.TclError, + self.assertRaises(Tkinter.TclError, self.tv.reattach, 'nonexistent', '', 'end') - self.failUnlessRaises(Tkinter.TclError, + self.assertRaises(Tkinter.TclError, self.tv.detach, 'nonexistent') - self.failUnlessRaises(Tkinter.TclError, + self.assertRaises(Tkinter.TclError, self.tv.reattach, item2, 'otherparent', 'end') - self.failUnlessRaises(Tkinter.TclError, + self.assertRaises(Tkinter.TclError, self.tv.reattach, item2, '', 'invalid') # multiple detach self.tv.detach(item_id, item2) - self.failUnlessEqual(self.tv.get_children(), ()) - self.failUnlessEqual(self.tv.get_children(item_id), ()) + self.assertEqual(self.tv.get_children(), ()) + self.assertEqual(self.tv.get_children(item_id), ()) def test_exists(self): - self.failUnlessEqual(self.tv.exists('something'), False) - self.failUnlessEqual(self.tv.exists(''), True) - self.failUnlessEqual(self.tv.exists({}), False) + self.assertEqual(self.tv.exists('something'), False) + self.assertEqual(self.tv.exists(''), True) + self.assertEqual(self.tv.exists({}), False) # the following will make a tk.call equivalent to # tk.call(treeview, "exists") which should result in an error # in the tcl interpreter since tk requires an item. - self.failUnlessRaises(Tkinter.TclError, self.tv.exists, None) + self.assertRaises(Tkinter.TclError, self.tv.exists, None) def test_focus(self): # nothing is focused right now - self.failUnlessEqual(self.tv.focus(), '') + self.assertEqual(self.tv.focus(), '') item1 = self.tv.insert('', 'end') self.tv.focus(item1) - self.failUnlessEqual(self.tv.focus(), item1) + self.assertEqual(self.tv.focus(), item1) self.tv.delete(item1) - self.failUnlessEqual(self.tv.focus(), '') + self.assertEqual(self.tv.focus(), '') # try focusing inexistent item - self.failUnlessRaises(Tkinter.TclError, self.tv.focus, 'hi') + self.assertRaises(Tkinter.TclError, self.tv.focus, 'hi') def test_heading(self): # check a dict is returned - self.failUnless(isinstance(self.tv.heading('#0'), dict)) + self.assertTrue(isinstance(self.tv.heading('#0'), dict)) # check a value is returned self.tv.heading('#0', text='hi') - self.failUnlessEqual(self.tv.heading('#0', 'text'), 'hi') - self.failUnlessEqual(self.tv.heading('#0', text=None), 'hi') + self.assertEqual(self.tv.heading('#0', 'text'), 'hi') + self.assertEqual(self.tv.heading('#0', text=None), 'hi') # invalid option - self.failUnlessRaises(Tkinter.TclError, self.tv.heading, '#0', + self.assertRaises(Tkinter.TclError, self.tv.heading, '#0', background=None) # invalid value - self.failUnlessRaises(Tkinter.TclError, self.tv.heading, '#0', + self.assertRaises(Tkinter.TclError, self.tv.heading, '#0', anchor=1) @@ -940,7 +940,7 @@ success = [] commands = self.tv.master._tclCommands self.tv.heading('#0', command=str(self.tv.heading('#0', command=None))) - self.failUnlessEqual(commands, self.tv.master._tclCommands) + self.assertEqual(commands, self.tv.master._tclCommands) simulate_heading_click(5, 5) if not success: self.fail("The command associated to the treeview heading wasn't " @@ -954,92 +954,92 @@ def test_index(self): # item 'what' doesn't exist - self.failUnlessRaises(Tkinter.TclError, self.tv.index, 'what') + self.assertRaises(Tkinter.TclError, self.tv.index, 'what') - self.failUnlessEqual(self.tv.index(''), 0) + self.assertEqual(self.tv.index(''), 0) item1 = self.tv.insert('', 'end') item2 = self.tv.insert('', 'end') c1 = self.tv.insert(item1, 'end') c2 = self.tv.insert(item1, 'end') - self.failUnlessEqual(self.tv.index(item1), 0) - self.failUnlessEqual(self.tv.index(c1), 0) - self.failUnlessEqual(self.tv.index(c2), 1) - self.failUnlessEqual(self.tv.index(item2), 1) + self.assertEqual(self.tv.index(item1), 0) + self.assertEqual(self.tv.index(c1), 0) + self.assertEqual(self.tv.index(c2), 1) + self.assertEqual(self.tv.index(item2), 1) self.tv.move(item2, '', 0) - self.failUnlessEqual(self.tv.index(item2), 0) - self.failUnlessEqual(self.tv.index(item1), 1) + self.assertEqual(self.tv.index(item2), 0) + self.assertEqual(self.tv.index(item1), 1) # check that index still works even after its parent and siblings # have been detached self.tv.detach(item1) - self.failUnlessEqual(self.tv.index(c2), 1) + self.assertEqual(self.tv.index(c2), 1) self.tv.detach(c1) - self.failUnlessEqual(self.tv.index(c2), 0) + self.assertEqual(self.tv.index(c2), 0) # but it fails after item has been deleted self.tv.delete(item1) - self.failUnlessRaises(Tkinter.TclError, self.tv.index, c2) + self.assertRaises(Tkinter.TclError, self.tv.index, c2) def test_insert_item(self): # parent 'none' doesn't exist - self.failUnlessRaises(Tkinter.TclError, self.tv.insert, 'none', 'end') + self.assertRaises(Tkinter.TclError, self.tv.insert, 'none', 'end') # open values - self.failUnlessRaises(Tkinter.TclError, self.tv.insert, '', 'end', + self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'end', open='') - self.failUnlessRaises(Tkinter.TclError, self.tv.insert, '', 'end', + self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'end', open='please') - self.failIf(self.tv.delete(self.tv.insert('', 'end', open=True))) - self.failIf(self.tv.delete(self.tv.insert('', 'end', open=False))) + self.assertFalse(self.tv.delete(self.tv.insert('', 'end', open=True))) + self.assertFalse(self.tv.delete(self.tv.insert('', 'end', open=False))) # invalid index - self.failUnlessRaises(Tkinter.TclError, self.tv.insert, '', 'middle') + self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'middle') # trying to duplicate item id is invalid itemid = self.tv.insert('', 'end', 'first-item') - self.failUnlessEqual(itemid, 'first-item') - self.failUnlessRaises(Tkinter.TclError, self.tv.insert, '', 'end', + self.assertEqual(itemid, 'first-item') + self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'end', 'first-item') - self.failUnlessRaises(Tkinter.TclError, self.tv.insert, '', 'end', + self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'end', MockTclObj('first-item')) # unicode values value = u'\xe1ba' item = self.tv.insert('', 'end', values=(value, )) - self.failUnlessEqual(self.tv.item(item, 'values'), (value, )) - self.failUnlessEqual(self.tv.item(item, values=None), (value, )) + self.assertEqual(self.tv.item(item, 'values'), (value, )) + self.assertEqual(self.tv.item(item, values=None), (value, )) self.tv.item(item, values=list(self.tv.item(item, values=None))) - self.failUnlessEqual(self.tv.item(item, values=None), (value, )) + self.assertEqual(self.tv.item(item, values=None), (value, )) - self.failUnless(isinstance(self.tv.item(item), dict)) + self.assertTrue(isinstance(self.tv.item(item), dict)) # erase item values self.tv.item(item, values='') - self.failIf(self.tv.item(item, values=None)) + self.assertFalse(self.tv.item(item, values=None)) # item tags item = self.tv.insert('', 'end', tags=[1, 2, value]) - self.failUnlessEqual(self.tv.item(item, tags=None), ('1', '2', value)) + self.assertEqual(self.tv.item(item, tags=None), ('1', '2', value)) self.tv.item(item, tags=[]) - self.failIf(self.tv.item(item, tags=None)) + self.assertFalse(self.tv.item(item, tags=None)) self.tv.item(item, tags=(1, 2)) - self.failUnlessEqual(self.tv.item(item, tags=None), ('1', '2')) + self.assertEqual(self.tv.item(item, tags=None), ('1', '2')) # values with spaces item = self.tv.insert('', 'end', values=('a b c', '%s %s' % (value, value))) - self.failUnlessEqual(self.tv.item(item, values=None), + self.assertEqual(self.tv.item(item, values=None), ('a b c', '%s %s' % (value, value))) # text - self.failUnlessEqual(self.tv.item( + self.assertEqual(self.tv.item( self.tv.insert('', 'end', text="Label here"), text=None), "Label here") - self.failUnlessEqual(self.tv.item( + self.assertEqual(self.tv.item( self.tv.insert('', 'end', text=value), text=None), value) @@ -1047,29 +1047,29 @@ def test_set(self): self.tv['columns'] = ['A', 'B'] item = self.tv.insert('', 'end', values=['a', 'b']) - self.failUnlessEqual(self.tv.set(item), {'A': 'a', 'B': 'b'}) + self.assertEqual(self.tv.set(item), {'A': 'a', 'B': 'b'}) self.tv.set(item, 'B', 'a') - self.failUnlessEqual(self.tv.item(item, values=None), ('a', 'a')) + self.assertEqual(self.tv.item(item, values=None), ('a', 'a')) self.tv['columns'] = ['B'] - self.failUnlessEqual(self.tv.set(item), {'B': 'a'}) + self.assertEqual(self.tv.set(item), {'B': 'a'}) self.tv.set(item, 'B', 'b') - self.failUnlessEqual(self.tv.set(item, column='B'), 'b') - self.failUnlessEqual(self.tv.item(item, values=None), ('b', 'a')) + self.assertEqual(self.tv.set(item, column='B'), 'b') + self.assertEqual(self.tv.item(item, values=None), ('b', 'a')) self.tv.set(item, 'B', 123) - self.failUnlessEqual(self.tv.set(item, 'B'), 123) - self.failUnlessEqual(self.tv.item(item, values=None), (123, 'a')) - self.failUnlessEqual(self.tv.set(item), {'B': 123}) + self.assertEqual(self.tv.set(item, 'B'), 123) + self.assertEqual(self.tv.item(item, values=None), (123, 'a')) + self.assertEqual(self.tv.set(item), {'B': 123}) # inexistent column - self.failUnlessRaises(Tkinter.TclError, self.tv.set, item, 'A') - self.failUnlessRaises(Tkinter.TclError, self.tv.set, item, 'A', 'b') + self.assertRaises(Tkinter.TclError, self.tv.set, item, 'A') + self.assertRaises(Tkinter.TclError, self.tv.set, item, 'A', 'b') # inexistent item - self.failUnlessRaises(Tkinter.TclError, self.tv.set, 'notme') + self.assertRaises(Tkinter.TclError, self.tv.set, 'notme') def test_tag_bind(self): @@ -1095,28 +1095,28 @@ pos_y.add(i) found.add(item_id) - self.failUnlessEqual(len(pos_y), 2) # item1 and item2 y pos + self.assertEqual(len(pos_y), 2) # item1 and item2 y pos for y in pos_y: support.simulate_mouse_click(self.tv, 0, y) # by now there should be 4 things in the events list, since each # item had a bind for two events that were simulated above - self.failUnlessEqual(len(events), 4) + self.assertEqual(len(events), 4) for evt in zip(events[::2], events[1::2]): - self.failUnlessEqual(evt, (1, 2)) + self.assertEqual(evt, (1, 2)) def test_tag_configure(self): # Just testing parameter passing for now - self.failUnlessRaises(TypeError, self.tv.tag_configure) - self.failUnlessRaises(Tkinter.TclError, self.tv.tag_configure, + self.assertRaises(TypeError, self.tv.tag_configure) + self.assertRaises(Tkinter.TclError, self.tv.tag_configure, 'test', sky='blue') self.tv.tag_configure('test', foreground='blue') - self.failUnlessEqual(self.tv.tag_configure('test', 'foreground'), + self.assertEqual(self.tv.tag_configure('test', 'foreground'), 'blue') - self.failUnlessEqual(self.tv.tag_configure('test', foreground=None), + self.assertEqual(self.tv.tag_configure('test', foreground=None), 'blue') - self.failUnless(isinstance(self.tv.tag_configure('test'), dict)) + self.assertTrue(isinstance(self.tv.tag_configure('test'), dict)) tests_gui = ( Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixer_base.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixer_base.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixer_base.py Wed Aug 5 15:32:47 2009 @@ -33,6 +33,8 @@ explicit = False # Is this ignored by refactor.py -f all? run_order = 5 # Fixers will be sorted by run order before execution # Lower numbers will be run first. + _accept_type = None # [Advanced and not public] This tells RefactoringTool + # which node type to accept when there's not a pattern. # Shortcut for access to Python grammar symbols syms = pygram.python_symbols Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_dict.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_dict.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_dict.py Wed Aug 5 15:32:47 2009 @@ -66,7 +66,7 @@ new = pytree.Node(syms.power, args) if not special: new.prefix = u"" - new = Call(Name(isiter and u"iter" or u"list"), [new]) + new = Call(Name(u"iter" if isiter else u"list"), [new]) if tail: new = pytree.Node(syms.power, [new] + tail) new.prefix = node.prefix Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_import.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_import.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_import.py Wed Aug 5 15:32:47 2009 @@ -12,7 +12,7 @@ # Local imports from .. import fixer_base -from os.path import dirname, join, exists, pathsep +from os.path import dirname, join, exists, sep from ..fixer_util import FromImport, syms, token @@ -84,7 +84,7 @@ # so can't be a relative import. if not exists(join(dirname(base_path), '__init__.py')): return False - for ext in ['.py', pathsep, '.pyc', '.so', '.sl', '.pyd']: + for ext in ['.py', sep, '.pyc', '.so', '.sl', '.pyd']: if exists(base_path + ext): return True return False Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_imports.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_imports.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_imports.py Wed Aug 5 15:32:47 2009 @@ -84,8 +84,6 @@ class FixImports(fixer_base.BaseFix): - order = "pre" # Pre-order tree traversal - # This is overridden in fix_imports2. mapping = MAPPING Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_long.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_long.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_long.py Wed Aug 5 15:32:47 2009 @@ -5,18 +5,15 @@ """ # Local imports -from .. import fixer_base -from ..fixer_util import Name, Number, is_probably_builtin +from lib2to3 import fixer_base +from lib2to3.fixer_util import is_probably_builtin class FixLong(fixer_base.BaseFix): PATTERN = "'long'" - static_int = Name(u"int") - def transform(self, node, results): if is_probably_builtin(node): - new = self.static_int.clone() - new.prefix = node.prefix - return new + node.value = u"int" + node.changed() Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_ne.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_ne.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_ne.py Wed Aug 5 15:32:47 2009 @@ -12,9 +12,11 @@ class FixNe(fixer_base.BaseFix): # This is so simple that we don't need the pattern compiler. + _accept_type = token.NOTEQUAL + def match(self, node): # Override - return node.type == token.NOTEQUAL and node.value == u"<>" + return node.value == u"<>" def transform(self, node, results): new = pytree.Leaf(token.NOTEQUAL, u"!=", prefix=node.prefix) Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_numliterals.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_numliterals.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_numliterals.py Wed Aug 5 15:32:47 2009 @@ -12,10 +12,11 @@ class FixNumliterals(fixer_base.BaseFix): # This is so simple that we don't need the pattern compiler. + _accept_type = token.NUMBER + def match(self, node): # Override - return (node.type == token.NUMBER and - (node.value.startswith(u"0") or node.value[-1] in u"Ll")) + return (node.value.startswith(u"0") or node.value[-1] in u"Ll") def transform(self, node, results): val = node.value Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_print.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_print.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_print.py Wed Aug 5 15:32:47 2009 @@ -26,20 +26,15 @@ ) -class FixPrint(fixer_base.ConditionalFix): +class FixPrint(fixer_base.BaseFix): PATTERN = """ simple_stmt< any* bare='print' any* > | print_stmt """ - skip_on = '__future__.print_function' - def transform(self, node, results): assert results - if self.should_skip(node): - return - bare_print = results.get("bare") if bare_print: Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_urllib.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_urllib.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/fixes/fix_urllib.py Wed Aug 5 15:32:47 2009 @@ -12,13 +12,13 @@ MAPPING = {'urllib': [ ('urllib.request', ['URLOpener', 'FancyURLOpener', 'urlretrieve', - '_urlopener', 'urlopen', 'urlcleanup']), + '_urlopener', 'urlopen', 'urlcleanup', + 'pathname2url', 'url2pathname']), ('urllib.parse', ['quote', 'quote_plus', 'unquote', 'unquote_plus', - 'urlencode', 'pathname2url', 'url2pathname', 'splitattr', - 'splithost', 'splitnport', 'splitpasswd', 'splitport', - 'splitquery', 'splittag', 'splittype', 'splituser', - 'splitvalue', ]), + 'urlencode', 'splitattr', 'splithost', 'splitnport', + 'splitpasswd', 'splitport', 'splitquery', 'splittag', + 'splittype', 'splituser', 'splitvalue', ]), ('urllib.error', ['ContentTooShortError'])], 'urllib2' : [ Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/main.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/main.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/main.py Wed Aug 5 15:32:47 2009 @@ -4,19 +4,31 @@ import sys import os +import difflib import logging import shutil import optparse from . import refactor + +def diff_texts(a, b, filename): + """Return a unified diff of two strings.""" + a = a.splitlines() + b = b.splitlines() + return difflib.unified_diff(a, b, filename, filename, + "(original)", "(refactored)", + lineterm="") + + class StdoutRefactoringTool(refactor.MultiprocessRefactoringTool): """ Prints output to stdout. """ - def __init__(self, fixers, options, explicit, nobackups): + def __init__(self, fixers, options, explicit, nobackups, show_diffs): self.nobackups = nobackups + self.show_diffs = show_diffs super(StdoutRefactoringTool, self).__init__(fixers, options, explicit) def log_error(self, msg, *args, **kwargs): @@ -42,9 +54,18 @@ if not self.nobackups: shutil.copymode(backup, filename) - def print_output(self, lines): - for line in lines: - print line + def print_output(self, old, new, filename, equal): + if equal: + self.log_message("No changes to %s", filename) + else: + self.log_message("Refactored %s", filename) + if self.show_diffs: + for line in diff_texts(old, new, filename): + print line + + +def warn(msg): + print >> sys.stderr, "WARNING: %s" % (msg,) def main(fixer_pkg, args=None): @@ -70,9 +91,12 @@ parser.add_option("-l", "--list-fixes", action="store_true", help="List available transformations (fixes/fix_*.py)") parser.add_option("-p", "--print-function", action="store_true", - help="Modify the grammar so that print() is a function") + help="DEPRECATED Modify the grammar so that print() is " + "a function") parser.add_option("-v", "--verbose", action="store_true", help="More verbose logging") + parser.add_option("--no-diffs", action="store_true", + help="Don't show diffs of the refactoring") parser.add_option("-w", "--write", action="store_true", help="Write back modified files") parser.add_option("-n", "--nobackups", action="store_true", default=False, @@ -81,6 +105,11 @@ # Parse command line arguments refactor_stdin = False options, args = parser.parse_args(args) + if not options.write and options.no_diffs: + warn("not writing files and not printing diffs; that's not very useful") + if options.print_function: + warn("-p is deprecated; " + "detection of from __future__ import print_function is automatic") if not options.write and options.nobackups: parser.error("Can't use -n without -w") if options.list_fixes: @@ -90,13 +119,13 @@ if not args: return 0 if not args: - print >>sys.stderr, "At least one file or directory argument required." - print >>sys.stderr, "Use --help to show usage." + print >> sys.stderr, "At least one file or directory argument required." + print >> sys.stderr, "Use --help to show usage." return 2 if "-" in args: refactor_stdin = True if options.write: - print >>sys.stderr, "Can't write to stdin." + print >> sys.stderr, "Can't write to stdin." return 2 # Set up logging handler @@ -104,7 +133,6 @@ logging.basicConfig(format='%(name)s: %(message)s', level=level) # Initialize the refactoring tool - rt_opts = {"print_function" : options.print_function} avail_fixes = set(refactor.get_fixers_from_package(fixer_pkg)) unwanted_fixes = set(fixer_pkg + ".fix_" + fix for fix in options.nofix) explicit = set() @@ -119,8 +147,8 @@ else: requested = avail_fixes.union(explicit) fixer_names = requested.difference(unwanted_fixes) - rt = StdoutRefactoringTool(sorted(fixer_names), rt_opts, sorted(explicit), - options.nobackups) + rt = StdoutRefactoringTool(sorted(fixer_names), None, sorted(explicit), + options.nobackups, not options.no_diffs) # Refactor all files and directories passed as arguments if not rt.errors: Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/patcomp.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/patcomp.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/patcomp.py Wed Aug 5 15:32:47 2009 @@ -14,7 +14,7 @@ import os # Fairly local imports -from .pgen2 import driver, literals, token, tokenize, parse +from .pgen2 import driver, literals, token, tokenize, parse, grammar # Really local imports from . import pytree @@ -138,7 +138,7 @@ node = nodes[0] if node.type == token.STRING: value = unicode(literals.evalString(node.value)) - return pytree.LeafPattern(content=value) + return pytree.LeafPattern(_type_of_literal(value), value) elif node.type == token.NAME: value = node.value if value.isupper(): @@ -179,6 +179,15 @@ "TOKEN": None} +def _type_of_literal(value): + if value[0].isalpha(): + return token.NAME + elif value in grammar.opmap: + return grammar.opmap[value] + else: + return None + + def pattern_convert(grammar, raw_node_info): """Converts raw node information to a Node or Leaf instance.""" type, value, context, children = raw_node_info Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/pgen2/grammar.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/pgen2/grammar.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/pgen2/grammar.py Wed Aug 5 15:32:47 2009 @@ -97,6 +97,19 @@ f.close() self.__dict__.update(d) + def copy(self): + """ + Copy the grammar. + """ + new = self.__class__() + for dict_attr in ("symbol2number", "number2symbol", "dfas", "keywords", + "tokens", "symbol2label"): + setattr(new, dict_attr, getattr(self, dict_attr).copy()) + new.labels = self.labels[:] + new.states = self.states[:] + new.start = self.start + return new + def report(self): """Dump the grammar tables to standard output, for debugging.""" from pprint import pprint Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/pygram.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/pygram.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/pygram.py Wed Aug 5 15:32:47 2009 @@ -28,4 +28,8 @@ python_grammar = driver.load_grammar(_GRAMMAR_FILE) + python_symbols = Symbols(python_grammar) + +python_grammar_no_print_statement = python_grammar.copy() +del python_grammar_no_print_statement.keywords["print"] Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/refactor.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/refactor.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/refactor.py Wed Aug 5 15:32:47 2009 @@ -14,14 +14,15 @@ # Python imports import os import sys -import difflib import logging import operator -from collections import defaultdict +import collections +import StringIO +import warnings from itertools import chain # Local imports -from .pgen2 import driver, tokenize +from .pgen2 import driver, tokenize, token from . import pytree, pygram @@ -37,7 +38,12 @@ fix_names.append(name[:-3]) return fix_names -def get_head_types(pat): + +class _EveryNode(Exception): + pass + + +def _get_head_types(pat): """ Accepts a pytree Pattern Node and returns a set of the pattern types which will match first. """ @@ -45,34 +51,50 @@ # NodePatters must either have no type and no content # or a type and content -- so they don't get any farther # Always return leafs + if pat.type is None: + raise _EveryNode return set([pat.type]) if isinstance(pat, pytree.NegatedPattern): if pat.content: - return get_head_types(pat.content) - return set([None]) # Negated Patterns don't have a type + return _get_head_types(pat.content) + raise _EveryNode # Negated Patterns don't have a type if isinstance(pat, pytree.WildcardPattern): # Recurse on each node in content r = set() for p in pat.content: for x in p: - r.update(get_head_types(x)) + r.update(_get_head_types(x)) return r raise Exception("Oh no! I don't understand pattern %s" %(pat)) -def get_headnode_dict(fixer_list): + +def _get_headnode_dict(fixer_list): """ Accepts a list of fixers and returns a dictionary of head node type --> fixer list. """ - head_nodes = defaultdict(list) + head_nodes = collections.defaultdict(list) + every = [] for fixer in fixer_list: - if not fixer.pattern: - head_nodes[None].append(fixer) - continue - for t in get_head_types(fixer.pattern): - head_nodes[t].append(fixer) - return head_nodes + if fixer.pattern: + try: + heads = _get_head_types(fixer.pattern) + except _EveryNode: + every.append(fixer) + else: + for node_type in heads: + head_nodes[node_type].append(fixer) + else: + if fixer._accept_type is not None: + head_nodes[fixer._accept_type].append(fixer) + else: + every.append(fixer) + for node_type in chain(pygram.python_grammar.symbol2number.itervalues(), + pygram.python_grammar.tokens): + head_nodes[node_type].extend(every) + return dict(head_nodes) + def get_fixers_from_package(pkg_name): """ @@ -101,13 +123,56 @@ _to_system_newlines = _identity +def _detect_future_print(source): + have_docstring = False + gen = tokenize.generate_tokens(StringIO.StringIO(source).readline) + def advance(): + tok = next(gen) + return tok[0], tok[1] + ignore = frozenset((token.NEWLINE, tokenize.NL, token.COMMENT)) + try: + while True: + tp, value = advance() + if tp in ignore: + continue + elif tp == token.STRING: + if have_docstring: + break + have_docstring = True + elif tp == token.NAME: + if value == u"from": + tp, value = advance() + if tp != token.NAME and value != u"__future__": + break + tp, value = advance() + if tp != token.NAME and value != u"import": + break + tp, value = advance() + if tp == token.OP and value == u"(": + tp, value = advance() + while tp == token.NAME: + if value == u"print_function": + return True + tp, value = advance() + if tp != token.OP and value != u",": + break + tp, value = advance() + else: + break + else: + break + except StopIteration: + pass + return False + + class FixerError(Exception): """A fixer could not be loaded.""" class RefactoringTool(object): - _default_options = {"print_function": False} + _default_options = {} CLASS_PREFIX = "Fix" # The prefix for fixer classes FILE_PREFIX = "fix_" # The prefix for modules with a fixer within @@ -124,20 +189,21 @@ self.explicit = explicit or [] self.options = self._default_options.copy() if options is not None: + if "print_function" in options: + warnings.warn("the 'print_function' option is deprecated", + DeprecationWarning) self.options.update(options) self.errors = [] self.logger = logging.getLogger("RefactoringTool") self.fixer_log = [] self.wrote = False - if self.options["print_function"]: - del pygram.python_grammar.keywords["print"] self.driver = driver.Driver(pygram.python_grammar, convert=pytree.convert, logger=self.logger) self.pre_order, self.post_order = self.get_fixers() - self.pre_order_heads = get_headnode_dict(self.pre_order) - self.post_order_heads = get_headnode_dict(self.post_order) + self.pre_order_heads = _get_headnode_dict(self.pre_order) + self.post_order_heads = _get_headnode_dict(self.post_order) self.files = [] # List of files that were or should be modified @@ -196,8 +262,9 @@ msg = msg % args self.logger.debug(msg) - def print_output(self, lines): - """Called with lines of output to give to the user.""" + def print_output(self, old_text, new_text, filename, equal): + """Called with the old version, new version, and filename of a + refactored file.""" pass def refactor(self, items, write=False, doctests_only=False): @@ -220,7 +287,8 @@ dirnames.sort() filenames.sort() for name in filenames: - if not name.startswith(".") and name.endswith("py"): + if not name.startswith(".") and \ + os.path.splitext(name)[1].endswith("py"): fullname = os.path.join(dirpath, name) self.refactor_file(fullname, write, doctests_only) # Modify dirnames in-place to remove subdirs with leading dots @@ -276,12 +344,16 @@ An AST corresponding to the refactored input stream; None if there were errors during the parse. """ + if _detect_future_print(data): + self.driver.grammar = pygram.python_grammar_no_print_statement try: tree = self.driver.parse_string(data) except Exception, err: self.log_error("Can't parse %s: %s: %s", name, err.__class__.__name__, err) return + finally: + self.driver.grammar = pygram.python_grammar self.log_debug("Refactoring %s", name) self.refactor_tree(tree, name) return tree @@ -298,7 +370,7 @@ else: tree = self.refactor_string(input, "") if tree and tree.was_changed: - self.processed_file(str(tree), "", input) + self.processed_file(unicode(tree), "", input) else: self.log_debug("No changes in stdin") @@ -338,12 +410,11 @@ if not fixers: return for node in traversal: - for fixer in fixers[node.type] + fixers[None]: + for fixer in fixers[node.type]: results = fixer.match(node) if results: new = fixer.transform(node, results) - if new is not None and (new != node or - str(new) != str(node)): + if new is not None: node.replace(new) node = new @@ -357,10 +428,11 @@ old_text = self._read_python_source(filename)[0] if old_text is None: return - if old_text == new_text: + equal = old_text == new_text + self.print_output(old_text, new_text, filename, equal) + if equal: self.log_debug("No changes to %s", filename) return - self.print_output(diff_texts(old_text, new_text, filename)) if write: self.write_file(new_text, filename, old_text, encoding) else: @@ -451,7 +523,7 @@ filename, lineno, err.__class__.__name__, err) return block if self.refactor_tree(tree, filename): - new = str(tree).splitlines(True) + new = unicode(tree).splitlines(True) # Undo the adjustment of the line numbers in wrap_toks() below. clipped, new = new[:lineno-1], new[lineno-1:] assert clipped == [u"\n"] * (lineno-1), clipped @@ -582,12 +654,3 @@ else: return super(MultiprocessRefactoringTool, self).refactor_file( *args, **kwargs) - - -def diff_texts(a, b, filename): - """Return a unified diff of two strings.""" - a = a.splitlines() - b = b.splitlines() - return difflib.unified_diff(a, b, filename, filename, - "(original)", "(refactored)", - lineterm="") Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/data/different_encoding.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/data/different_encoding.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/data/different_encoding.py Wed Aug 5 15:32:47 2009 @@ -1,3 +1,6 @@ #!/usr/bin/env python -# -*- coding: iso-8859-1 -*- -print u'??????????????????????????????????????????????????????????????' +# -*- coding: utf-8 -*- +print u'????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????' + +def f(x): + print '%s\t-> ??(%2i):%s ??(%s)' Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_fixers.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_fixers.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_fixers.py Wed Aug 5 15:32:47 2009 @@ -18,8 +18,6 @@ def setUp(self, fix_list=None, fixer_pkg="lib2to3", options=None): if fix_list is None: fix_list = [self.fixer] - if options is None: - options = {"print_function" : False} self.refactor = support.get_refactorer(fixer_pkg, fix_list, options) self.fixer_log = [] self.filename = u"" @@ -32,20 +30,20 @@ before = support.reformat(before) after = support.reformat(after) tree = self.refactor.refactor_string(before, self.filename) - self.failUnlessEqual(after, unicode(tree)) + self.assertEqual(after, unicode(tree)) return tree def check(self, before, after, ignore_warnings=False): tree = self._check(before, after) - self.failUnless(tree.was_changed) + self.assertTrue(tree.was_changed) if not ignore_warnings: - self.failUnlessEqual(self.fixer_log, []) + self.assertEqual(self.fixer_log, []) def warns(self, before, after, message, unchanged=False): tree = self._check(before, after) - self.failUnless(message in "".join(self.fixer_log)) + self.assertTrue(message in "".join(self.fixer_log)) if not unchanged: - self.failUnless(tree.was_changed) + self.assertTrue(tree.was_changed) def warns_unchanged(self, before, message): self.warns(before, before, message, unchanged=True) @@ -53,13 +51,12 @@ def unchanged(self, before, ignore_warnings=False): self._check(before, before) if not ignore_warnings: - self.failUnlessEqual(self.fixer_log, []) + self.assertEqual(self.fixer_log, []) def assert_runs_after(self, *names): fixes = [self.fixer] fixes.extend(names) - options = {"print_function" : False} - r = support.get_refactorer("lib2to3", fixes, options) + r = support.get_refactorer("lib2to3", fixes) (pre, post) = r.get_fixers() n = "fix_" + self.fixer if post and post[-1].__class__.__module__.endswith(n): @@ -379,18 +376,15 @@ self.unchanged(s) def test_idempotency_print_as_function(self): - print_stmt = pygram.python_grammar.keywords.pop("print") - try: - s = """print(1, 1+1, 1+1+1)""" - self.unchanged(s) + self.refactor.driver.grammar = pygram.python_grammar_no_print_statement + s = """print(1, 1+1, 1+1+1)""" + self.unchanged(s) - s = """print()""" - self.unchanged(s) + s = """print()""" + self.unchanged(s) - s = """print('')""" - self.unchanged(s) - finally: - pygram.python_grammar.keywords["print"] = print_stmt + s = """print('')""" + self.unchanged(s) def test_1(self): b = """print 1, 1+1, 1+1+1""" @@ -462,31 +456,15 @@ a = """print(file=sys.stderr)""" self.check(b, a) - # With from __future__ import print_function def test_with_future_print_function(self): - # XXX: These tests won't actually do anything until the parser - # is fixed so it won't crash when it sees print(x=y). - # When #2412 is fixed, the try/except block can be taken - # out and the tests can be run like normal. - # MvL: disable entirely for now, so that it doesn't print to stdout - return - try: - s = "from __future__ import print_function\n"\ - "print('Hai!', end=' ')" - self.unchanged(s) + s = "from __future__ import print_function\n" \ + "print('Hai!', end=' ')" + self.unchanged(s) - b = "print 'Hello, world!'" - a = "print('Hello, world!')" - self.check(b, a) + b = "print 'Hello, world!'" + a = "print('Hello, world!')" + self.check(b, a) - s = "from __future__ import *\n"\ - "print('Hai!', end=' ')" - self.unchanged(s) - except: - return - else: - self.assertFalse(True, "#2421 has been fixed -- printing tests "\ - "need to be updated!") class Test_exec(FixerTestCase): fixer = "exec" @@ -1705,6 +1683,11 @@ for key in ('dbhash', 'dumbdbm', 'dbm', 'gdbm'): self.modules[key] = mapping1[key] + def test_after_local_imports_refactoring(self): + for fix in ("imports", "imports2"): + self.fixer = fix + self.assert_runs_after("import") + class Test_urllib(FixerTestCase): fixer = "urllib" @@ -3504,6 +3487,7 @@ s = "from itertools import foo" self.unchanged(s) + class Test_import(FixerTestCase): fixer = "import" @@ -3538,8 +3522,7 @@ self.always_exists = False self.present_files = set(['__init__.py']) - expected_extensions = ('.py', os.path.pathsep, '.pyc', '.so', - '.sl', '.pyd') + expected_extensions = ('.py', os.path.sep, '.pyc', '.so', '.sl', '.pyd') names_to_test = (p("/spam/eggs.py"), "ni.py", p("../../shrubbery.py")) for name in names_to_test: @@ -3569,6 +3552,13 @@ self.present_files = set(["__init__.py", "bar.py"]) self.check(b, a) + def test_import_from_package(self): + b = "import bar" + a = "from . import bar" + self.always_exists = False + self.present_files = set(["__init__.py", "bar" + os.path.sep]) + self.check(b, a) + def test_comments_and_indent(self): b = "import bar # Foo" a = "from . import bar # Foo" @@ -4095,3 +4085,26 @@ b = """os.getcwdu ( )""" a = """os.getcwd ( )""" self.check(b, a) + + +class Test_operator(FixerTestCase): + + fixer = "operator" + + def test_operator_isCallable(self): + b = "operator.isCallable(x)" + a = "hasattr(x, '__call__')" + self.check(b, a) + + def test_operator_sequenceIncludes(self): + b = "operator.sequenceIncludes(x, y)" + a = "operator.contains(x, y)" + self.check(b, a) + + def test_bare_isCallable(self): + s = "isCallable(x)" + self.warns_unchanged(s, "You should use hasattr(x, '__call__') here.") + + def test_bare_sequenceIncludes(self): + s = "sequenceIncludes(x, y)" + self.warns_unchanged(s, "You should use operator.contains here.") Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_pytree.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_pytree.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_pytree.py Wed Aug 5 15:32:47 2009 @@ -31,6 +31,7 @@ def test_deprecated_prefix_methods(self): l = pytree.Leaf(100, "foo") with warnings.catch_warnings(record=True) as w: + warnings.simplefilter("always", DeprecationWarning) self.assertEqual(l.get_prefix(), "") l.set_prefix("hi") self.assertEqual(l.prefix, "hi") @@ -81,10 +82,10 @@ def test_leaf_prefix(self): l1 = pytree.Leaf(100, "foo") self.assertEqual(l1.prefix, "") - self.failIf(l1.was_changed) + self.assertFalse(l1.was_changed) l1.prefix = " ##\n\n" self.assertEqual(l1.prefix, " ##\n\n") - self.failUnless(l1.was_changed) + self.assertTrue(l1.was_changed) def test_node(self): l1 = pytree.Leaf(100, "foo") @@ -154,13 +155,13 @@ l3 = pytree.Leaf(100, "bar") n1 = pytree.Node(1000, [l1, l2, l3]) self.assertEqual(n1.children, [l1, l2, l3]) - self.failUnless(isinstance(n1.children, list)) - self.failIf(n1.was_changed) + self.assertTrue(isinstance(n1.children, list)) + self.assertFalse(n1.was_changed) l2new = pytree.Leaf(100, "-") l2.replace(l2new) self.assertEqual(n1.children, [l1, l2new, l3]) - self.failUnless(isinstance(n1.children, list)) - self.failUnless(n1.was_changed) + self.assertTrue(isinstance(n1.children, list)) + self.assertTrue(n1.was_changed) def test_replace_with_list(self): l1 = pytree.Leaf(100, "foo") @@ -170,7 +171,7 @@ l2.replace([pytree.Leaf(100, "*"), pytree.Leaf(100, "*")]) self.assertEqual(str(n1), "foo**bar") - self.failUnless(isinstance(n1.children, list)) + self.assertTrue(isinstance(n1.children, list)) def test_post_order(self): l1 = pytree.Leaf(100, "foo") @@ -186,34 +187,34 @@ def test_changed(self): l1 = pytree.Leaf(100, "f") - self.failIf(l1.was_changed) + self.assertFalse(l1.was_changed) l1.changed() - self.failUnless(l1.was_changed) + self.assertTrue(l1.was_changed) l1 = pytree.Leaf(100, "f") n1 = pytree.Node(1000, [l1]) - self.failIf(n1.was_changed) + self.assertFalse(n1.was_changed) n1.changed() - self.failUnless(n1.was_changed) + self.assertTrue(n1.was_changed) l1 = pytree.Leaf(100, "foo") l2 = pytree.Leaf(100, "+") l3 = pytree.Leaf(100, "bar") n1 = pytree.Node(1000, [l1, l2, l3]) n2 = pytree.Node(1000, [n1]) - self.failIf(l1.was_changed) - self.failIf(n1.was_changed) - self.failIf(n2.was_changed) + self.assertFalse(l1.was_changed) + self.assertFalse(n1.was_changed) + self.assertFalse(n2.was_changed) n1.changed() - self.failUnless(n1.was_changed) - self.failUnless(n2.was_changed) - self.failIf(l1.was_changed) + self.assertTrue(n1.was_changed) + self.assertTrue(n2.was_changed) + self.assertFalse(l1.was_changed) def test_leaf_constructor_prefix(self): for prefix in ("xyz_", ""): l1 = pytree.Leaf(100, "self", prefix=prefix) - self.failUnless(str(l1), prefix + "self") + self.assertTrue(str(l1), prefix + "self") self.assertEqual(l1.prefix, prefix) def test_node_constructor_prefix(self): @@ -221,7 +222,7 @@ l1 = pytree.Leaf(100, "self") l2 = pytree.Leaf(100, "foo", prefix="_") n1 = pytree.Node(1000, [l1, l2], prefix=prefix) - self.failUnless(str(n1), prefix + "self_foo") + self.assertTrue(str(n1), prefix + "self_foo") self.assertEqual(n1.prefix, prefix) self.assertEqual(l1.prefix, prefix) self.assertEqual(l2.prefix, "_") @@ -237,8 +238,8 @@ self.assertEqual(l1.parent, n1) self.assertEqual(n1.parent, None) self.assertEqual(n2.parent, None) - self.failIf(n1.was_changed) - self.failUnless(n2.was_changed) + self.assertFalse(n1.was_changed) + self.assertTrue(n2.was_changed) self.assertEqual(l2.remove(), 1) self.assertEqual(l1.remove(), 0) @@ -246,8 +247,8 @@ self.assertEqual(l1.parent, None) self.assertEqual(n1.parent, None) self.assertEqual(n2.parent, None) - self.failUnless(n1.was_changed) - self.failUnless(n2.was_changed) + self.assertTrue(n1.was_changed) + self.assertTrue(n2.was_changed) def test_remove_parentless(self): n1 = pytree.Node(1000, []) @@ -316,7 +317,7 @@ n2 = pytree.Node(1000, []) p1 = pytree.Node(1000, [n1, n2]) - self.failUnless(n1.next_sibling is n2) + self.assertTrue(n1.next_sibling is n2) self.assertEqual(n2.next_sibling, None) self.assertEqual(p1.next_sibling, None) @@ -325,7 +326,7 @@ l2 = pytree.Leaf(100, "b") p1 = pytree.Node(1000, [l1, l2]) - self.failUnless(l1.next_sibling is l2) + self.assertTrue(l1.next_sibling is l2) self.assertEqual(l2.next_sibling, None) self.assertEqual(p1.next_sibling, None) @@ -334,7 +335,7 @@ n2 = pytree.Node(1000, []) p1 = pytree.Node(1000, [n1, n2]) - self.failUnless(n2.prev_sibling is n1) + self.assertTrue(n2.prev_sibling is n1) self.assertEqual(n1.prev_sibling, None) self.assertEqual(p1.prev_sibling, None) @@ -343,7 +344,7 @@ l2 = pytree.Leaf(100, "b") p1 = pytree.Node(1000, [l1, l2]) - self.failUnless(l2.prev_sibling is l1) + self.assertTrue(l2.prev_sibling is l1) self.assertEqual(l1.prev_sibling, None) self.assertEqual(p1.prev_sibling, None) @@ -416,7 +417,7 @@ r = {} self.assertTrue(pw.match_seq([l1, l3], r)) self.assertEqual(r, {"pl": l3, "pw": [l1, l3]}) - self.assert_(r["pl"] is l3) + self.assertTrue(r["pl"] is l3) r = {} def test_generate_matches(self): @@ -459,5 +460,5 @@ l3 = pytree.Leaf(8, ")") node = pytree.Node(331, [l1, l2, l3]) r = {} - self.assert_(pattern.match(node, r)) + self.assertTrue(pattern.match(node, r)) self.assertEqual(r["args"], [l2]) Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_refactor.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_refactor.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_refactor.py Wed Aug 5 15:32:47 2009 @@ -7,9 +7,12 @@ import operator import StringIO import tempfile +import shutil import unittest +import warnings from lib2to3 import refactor, pygram, fixer_base +from lib2to3.pgen2 import token from . import support @@ -42,14 +45,12 @@ return refactor.RefactoringTool(fixers, options, explicit) def test_print_function_option(self): - gram = pygram.python_grammar - save = gram.keywords["print"] - try: - rt = self.rt({"print_function" : True}) - self.assertRaises(KeyError, operator.itemgetter("print"), - gram.keywords) - finally: - gram.keywords["print"] = save + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter("always", DeprecationWarning) + refactor.RefactoringTool(_DEFAULT_FIXERS, {"print_function" : True}) + self.assertEqual(len(w), 1) + msg, = w + self.assertTrue(msg.category is DeprecationWarning) def test_fixer_loading_helpers(self): contents = ["explicit", "first", "last", "parrot", "preorder"] @@ -61,19 +62,63 @@ self.assertEqual(full_names, ["myfixes.fix_" + name for name in contents]) + def test_detect_future_print(self): + run = refactor._detect_future_print + self.assertFalse(run("")) + self.assertTrue(run("from __future__ import print_function")) + self.assertFalse(run("from __future__ import generators")) + self.assertFalse(run("from __future__ import generators, feature")) + input = "from __future__ import generators, print_function" + self.assertTrue(run(input)) + input ="from __future__ import print_function, generators" + self.assertTrue(run(input)) + input = "from __future__ import (print_function,)" + self.assertTrue(run(input)) + input = "from __future__ import (generators, print_function)" + self.assertTrue(run(input)) + input = "from __future__ import (generators, nested_scopes)" + self.assertFalse(run(input)) + input = """from __future__ import generators +from __future__ import print_function""" + self.assertTrue(run(input)) + self.assertFalse(run("from")) + self.assertFalse(run("from 4")) + self.assertFalse(run("from x")) + self.assertFalse(run("from x 5")) + self.assertFalse(run("from x im")) + self.assertFalse(run("from x import")) + self.assertFalse(run("from x import 4")) + input = "'docstring'\nfrom __future__ import print_function" + self.assertTrue(run(input)) + input = "'docstring'\n'somng'\nfrom __future__ import print_function" + self.assertFalse(run(input)) + input = "# comment\nfrom __future__ import print_function" + self.assertTrue(run(input)) + input = "# comment\n'doc'\nfrom __future__ import print_function" + self.assertTrue(run(input)) + input = "class x: pass\nfrom __future__ import print_function" + self.assertFalse(run(input)) + def test_get_headnode_dict(self): class NoneFix(fixer_base.BaseFix): - PATTERN = None + pass class FileInputFix(fixer_base.BaseFix): PATTERN = "file_input< any * >" + class SimpleFix(fixer_base.BaseFix): + PATTERN = "'name'" + no_head = NoneFix({}, []) with_head = FileInputFix({}, []) - d = refactor.get_headnode_dict([no_head, with_head]) - expected = {None: [no_head], - pygram.python_symbols.file_input : [with_head]} - self.assertEqual(d, expected) + simple = SimpleFix({}, []) + d = refactor._get_headnode_dict([no_head, with_head, simple]) + top_fixes = d.pop(pygram.python_symbols.file_input) + self.assertEqual(top_fixes, [with_head, no_head]) + name_fixes = d.pop(token.NAME) + self.assertEqual(name_fixes, [simple, no_head]) + for fixes in d.itervalues(): + self.assertEqual(fixes, [no_head]) def test_fixer_loading(self): from myfixes.fix_first import FixFirst @@ -106,10 +151,10 @@ class MyRT(refactor.RefactoringTool): - def print_output(self, lines): - diff_lines.extend(lines) + def print_output(self, old_text, new_text, filename, equal): + results.extend([old_text, new_text, filename, equal]) - diff_lines = [] + results = [] rt = MyRT(_DEFAULT_FIXERS) save = sys.stdin sys.stdin = StringIO.StringIO("def parrot(): pass\n\n") @@ -117,12 +162,10 @@ rt.refactor_stdin() finally: sys.stdin = save - expected = """--- (original) -+++ (refactored) -@@ -1,2 +1,2 @@ --def parrot(): pass -+def cheese(): pass""".splitlines() - self.assertEqual(diff_lines[:-1], expected) + expected = ["def parrot(): pass\n\n", + "def cheese(): pass\n\n", + "", False] + self.assertEqual(results, expected) def check_file_refactoring(self, test_file, fixers=_2TO3_FIXERS): def read_file(): @@ -145,6 +188,37 @@ test_file = os.path.join(FIXER_DIR, "parrot_example.py") self.check_file_refactoring(test_file, _DEFAULT_FIXERS) + def test_refactor_dir(self): + def check(structure, expected): + def mock_refactor_file(self, f, *args): + got.append(f) + save_func = refactor.RefactoringTool.refactor_file + refactor.RefactoringTool.refactor_file = mock_refactor_file + rt = self.rt() + got = [] + dir = tempfile.mkdtemp(prefix="2to3-test_refactor") + try: + os.mkdir(os.path.join(dir, "a_dir")) + for fn in structure: + open(os.path.join(dir, fn), "wb").close() + rt.refactor_dir(dir) + finally: + refactor.RefactoringTool.refactor_file = save_func + shutil.rmtree(dir) + self.assertEqual(got, + [os.path.join(dir, path) for path in expected]) + check([], []) + tree = ["nothing", + "hi.py", + ".dumb", + ".after.py", + "sappy"] + expected = ["hi.py"] + check(tree, expected) + tree = ["hi.py", + os.path.join("a_dir", "stuff.py")] + check(tree, tree) + def test_file_encoding(self): fn = os.path.join(TEST_DATA_DIR, "different_encoding.py") self.check_file_refactoring(fn) Modified: python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_util.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_util.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/lib2to3/tests/test_util.py Wed Aug 5 15:32:47 2009 @@ -1,4 +1,4 @@ -""" Test suite for the code in fixes.util """ +""" Test suite for the code in fixer_util """ # Testing imports from . import support @@ -7,10 +7,10 @@ import os.path # Local imports -from .. import pytree -from .. import fixer_util -from ..fixer_util import Attr, Name - +from lib2to3.pytree import Node, Leaf +from lib2to3 import fixer_util +from lib2to3.fixer_util import Attr, Name, Call, Comma +from lib2to3.pgen2 import token def parse(code, strip_levels=0): # The topmost node is file_input, which we don't care about. @@ -24,7 +24,7 @@ class MacroTestCase(support.TestCase): def assertStr(self, node, string): if isinstance(node, (tuple, list)): - node = pytree.Node(fixer_util.syms.simple_stmt, node) + node = Node(fixer_util.syms.simple_stmt, node) self.assertEqual(str(node), string) @@ -33,15 +33,15 @@ return fixer_util.is_tuple(parse(string, strip_levels=2)) def test_valid(self): - self.failUnless(self.is_tuple("(a, b)")) - self.failUnless(self.is_tuple("(a, (b, c))")) - self.failUnless(self.is_tuple("((a, (b, c)),)")) - self.failUnless(self.is_tuple("(a,)")) - self.failUnless(self.is_tuple("()")) + self.assertTrue(self.is_tuple("(a, b)")) + self.assertTrue(self.is_tuple("(a, (b, c))")) + self.assertTrue(self.is_tuple("((a, (b, c)),)")) + self.assertTrue(self.is_tuple("(a,)")) + self.assertTrue(self.is_tuple("()")) def test_invalid(self): - self.failIf(self.is_tuple("(a)")) - self.failIf(self.is_tuple("('foo') % (b, c)")) + self.assertFalse(self.is_tuple("(a)")) + self.assertFalse(self.is_tuple("('foo') % (b, c)")) class Test_is_list(support.TestCase): @@ -49,14 +49,14 @@ return fixer_util.is_list(parse(string, strip_levels=2)) def test_valid(self): - self.failUnless(self.is_list("[]")) - self.failUnless(self.is_list("[a]")) - self.failUnless(self.is_list("[a, b]")) - self.failUnless(self.is_list("[a, [b, c]]")) - self.failUnless(self.is_list("[[a, [b, c]],]")) + self.assertTrue(self.is_list("[]")) + self.assertTrue(self.is_list("[a]")) + self.assertTrue(self.is_list("[a, b]")) + self.assertTrue(self.is_list("[a, [b, c]]")) + self.assertTrue(self.is_list("[[a, [b, c]],]")) def test_invalid(self): - self.failIf(self.is_list("[]+[]")) + self.assertFalse(self.is_list("[]+[]")) class Test_Attr(MacroTestCase): @@ -78,6 +78,31 @@ self.assertStr(Name("a", prefix="b"), "ba") +class Test_Call(MacroTestCase): + def _Call(self, name, args=None, prefix=None): + """Help the next test""" + children = [] + if isinstance(args, list): + for arg in args: + children.append(arg) + children.append(Comma()) + children.pop() + return Call(Name(name), children, prefix) + + def test(self): + kids = [None, + [Leaf(token.NUMBER, 1), Leaf(token.NUMBER, 2), + Leaf(token.NUMBER, 3)], + [Leaf(token.NUMBER, 1), Leaf(token.NUMBER, 3), + Leaf(token.NUMBER, 2), Leaf(token.NUMBER, 4)], + [Leaf(token.STRING, "b"), Leaf(token.STRING, "j", prefix=" ")] + ] + self.assertStr(self._Call("A"), "A()") + self.assertStr(self._Call("b", kids[1]), "b(1,2,3)") + self.assertStr(self._Call("a.b().c", kids[2]), "a.b().c(1,3,2,4)") + self.assertStr(self._Call("d", kids[3], prefix=" "), " d(b, j)") + + class Test_does_tree_import(support.TestCase): def _find_bind_rec(self, name, node): # Search a tree for a binding -- used to find the starting @@ -102,9 +127,9 @@ (None, "a", "import b, c, d")) for package, name, import_ in failing_tests: n = self.does_tree_import(package, name, import_ + "\n" + string) - self.failIf(n) + self.assertFalse(n) n = self.does_tree_import(package, name, string + "\n" + import_) - self.failIf(n) + self.assertFalse(n) passing_tests = (("a", "a", "from a import a"), ("x", "a", "from x import a"), @@ -115,9 +140,9 @@ (None, "a", "import b, c, a, d")) for package, name, import_ in passing_tests: n = self.does_tree_import(package, name, import_ + "\n" + string) - self.failUnless(n) + self.assertTrue(n) n = self.does_tree_import(package, name, string + "\n" + import_) - self.failUnless(n) + self.assertTrue(n) def test_in_function(self): self.try_with("def foo():\n\tbar.baz()\n\tstart=3") @@ -127,226 +152,226 @@ return fixer_util.find_binding(name, parse(string), package) def test_simple_assignment(self): - self.failUnless(self.find_binding("a", "a = b")) - self.failUnless(self.find_binding("a", "a = [b, c, d]")) - self.failUnless(self.find_binding("a", "a = foo()")) - self.failUnless(self.find_binding("a", "a = foo().foo.foo[6][foo]")) - self.failIf(self.find_binding("a", "foo = a")) - self.failIf(self.find_binding("a", "foo = (a, b, c)")) + self.assertTrue(self.find_binding("a", "a = b")) + self.assertTrue(self.find_binding("a", "a = [b, c, d]")) + self.assertTrue(self.find_binding("a", "a = foo()")) + self.assertTrue(self.find_binding("a", "a = foo().foo.foo[6][foo]")) + self.assertFalse(self.find_binding("a", "foo = a")) + self.assertFalse(self.find_binding("a", "foo = (a, b, c)")) def test_tuple_assignment(self): - self.failUnless(self.find_binding("a", "(a,) = b")) - self.failUnless(self.find_binding("a", "(a, b, c) = [b, c, d]")) - self.failUnless(self.find_binding("a", "(c, (d, a), b) = foo()")) - self.failUnless(self.find_binding("a", "(a, b) = foo().foo[6][foo]")) - self.failIf(self.find_binding("a", "(foo, b) = (b, a)")) - self.failIf(self.find_binding("a", "(foo, (b, c)) = (a, b, c)")) + self.assertTrue(self.find_binding("a", "(a,) = b")) + self.assertTrue(self.find_binding("a", "(a, b, c) = [b, c, d]")) + self.assertTrue(self.find_binding("a", "(c, (d, a), b) = foo()")) + self.assertTrue(self.find_binding("a", "(a, b) = foo().foo[6][foo]")) + self.assertFalse(self.find_binding("a", "(foo, b) = (b, a)")) + self.assertFalse(self.find_binding("a", "(foo, (b, c)) = (a, b, c)")) def test_list_assignment(self): - self.failUnless(self.find_binding("a", "[a] = b")) - self.failUnless(self.find_binding("a", "[a, b, c] = [b, c, d]")) - self.failUnless(self.find_binding("a", "[c, [d, a], b] = foo()")) - self.failUnless(self.find_binding("a", "[a, b] = foo().foo[a][foo]")) - self.failIf(self.find_binding("a", "[foo, b] = (b, a)")) - self.failIf(self.find_binding("a", "[foo, [b, c]] = (a, b, c)")) + self.assertTrue(self.find_binding("a", "[a] = b")) + self.assertTrue(self.find_binding("a", "[a, b, c] = [b, c, d]")) + self.assertTrue(self.find_binding("a", "[c, [d, a], b] = foo()")) + self.assertTrue(self.find_binding("a", "[a, b] = foo().foo[a][foo]")) + self.assertFalse(self.find_binding("a", "[foo, b] = (b, a)")) + self.assertFalse(self.find_binding("a", "[foo, [b, c]] = (a, b, c)")) def test_invalid_assignments(self): - self.failIf(self.find_binding("a", "foo.a = 5")) - self.failIf(self.find_binding("a", "foo[a] = 5")) - self.failIf(self.find_binding("a", "foo(a) = 5")) - self.failIf(self.find_binding("a", "foo(a, b) = 5")) + self.assertFalse(self.find_binding("a", "foo.a = 5")) + self.assertFalse(self.find_binding("a", "foo[a] = 5")) + self.assertFalse(self.find_binding("a", "foo(a) = 5")) + self.assertFalse(self.find_binding("a", "foo(a, b) = 5")) def test_simple_import(self): - self.failUnless(self.find_binding("a", "import a")) - self.failUnless(self.find_binding("a", "import b, c, a, d")) - self.failIf(self.find_binding("a", "import b")) - self.failIf(self.find_binding("a", "import b, c, d")) + self.assertTrue(self.find_binding("a", "import a")) + self.assertTrue(self.find_binding("a", "import b, c, a, d")) + self.assertFalse(self.find_binding("a", "import b")) + self.assertFalse(self.find_binding("a", "import b, c, d")) def test_from_import(self): - self.failUnless(self.find_binding("a", "from x import a")) - self.failUnless(self.find_binding("a", "from a import a")) - self.failUnless(self.find_binding("a", "from x import b, c, a, d")) - self.failUnless(self.find_binding("a", "from x.b import a")) - self.failUnless(self.find_binding("a", "from x.b import b, c, a, d")) - self.failIf(self.find_binding("a", "from a import b")) - self.failIf(self.find_binding("a", "from a.d import b")) - self.failIf(self.find_binding("a", "from d.a import b")) + self.assertTrue(self.find_binding("a", "from x import a")) + self.assertTrue(self.find_binding("a", "from a import a")) + self.assertTrue(self.find_binding("a", "from x import b, c, a, d")) + self.assertTrue(self.find_binding("a", "from x.b import a")) + self.assertTrue(self.find_binding("a", "from x.b import b, c, a, d")) + self.assertFalse(self.find_binding("a", "from a import b")) + self.assertFalse(self.find_binding("a", "from a.d import b")) + self.assertFalse(self.find_binding("a", "from d.a import b")) def test_import_as(self): - self.failUnless(self.find_binding("a", "import b as a")) - self.failUnless(self.find_binding("a", "import b as a, c, a as f, d")) - self.failIf(self.find_binding("a", "import a as f")) - self.failIf(self.find_binding("a", "import b, c as f, d as e")) + self.assertTrue(self.find_binding("a", "import b as a")) + self.assertTrue(self.find_binding("a", "import b as a, c, a as f, d")) + self.assertFalse(self.find_binding("a", "import a as f")) + self.assertFalse(self.find_binding("a", "import b, c as f, d as e")) def test_from_import_as(self): - self.failUnless(self.find_binding("a", "from x import b as a")) - self.failUnless(self.find_binding("a", "from x import g as a, d as b")) - self.failUnless(self.find_binding("a", "from x.b import t as a")) - self.failUnless(self.find_binding("a", "from x.b import g as a, d")) - self.failIf(self.find_binding("a", "from a import b as t")) - self.failIf(self.find_binding("a", "from a.d import b as t")) - self.failIf(self.find_binding("a", "from d.a import b as t")) + self.assertTrue(self.find_binding("a", "from x import b as a")) + self.assertTrue(self.find_binding("a", "from x import g as a, d as b")) + self.assertTrue(self.find_binding("a", "from x.b import t as a")) + self.assertTrue(self.find_binding("a", "from x.b import g as a, d")) + self.assertFalse(self.find_binding("a", "from a import b as t")) + self.assertFalse(self.find_binding("a", "from a.d import b as t")) + self.assertFalse(self.find_binding("a", "from d.a import b as t")) def test_simple_import_with_package(self): - self.failUnless(self.find_binding("b", "import b")) - self.failUnless(self.find_binding("b", "import b, c, d")) - self.failIf(self.find_binding("b", "import b", "b")) - self.failIf(self.find_binding("b", "import b, c, d", "c")) + self.assertTrue(self.find_binding("b", "import b")) + self.assertTrue(self.find_binding("b", "import b, c, d")) + self.assertFalse(self.find_binding("b", "import b", "b")) + self.assertFalse(self.find_binding("b", "import b, c, d", "c")) def test_from_import_with_package(self): - self.failUnless(self.find_binding("a", "from x import a", "x")) - self.failUnless(self.find_binding("a", "from a import a", "a")) - self.failUnless(self.find_binding("a", "from x import *", "x")) - self.failUnless(self.find_binding("a", "from x import b, c, a, d", "x")) - self.failUnless(self.find_binding("a", "from x.b import a", "x.b")) - self.failUnless(self.find_binding("a", "from x.b import *", "x.b")) - self.failUnless(self.find_binding("a", "from x.b import b, c, a, d", "x.b")) - self.failIf(self.find_binding("a", "from a import b", "a")) - self.failIf(self.find_binding("a", "from a.d import b", "a.d")) - self.failIf(self.find_binding("a", "from d.a import b", "a.d")) - self.failIf(self.find_binding("a", "from x.y import *", "a.b")) + self.assertTrue(self.find_binding("a", "from x import a", "x")) + self.assertTrue(self.find_binding("a", "from a import a", "a")) + self.assertTrue(self.find_binding("a", "from x import *", "x")) + self.assertTrue(self.find_binding("a", "from x import b, c, a, d", "x")) + self.assertTrue(self.find_binding("a", "from x.b import a", "x.b")) + self.assertTrue(self.find_binding("a", "from x.b import *", "x.b")) + self.assertTrue(self.find_binding("a", "from x.b import b, c, a, d", "x.b")) + self.assertFalse(self.find_binding("a", "from a import b", "a")) + self.assertFalse(self.find_binding("a", "from a.d import b", "a.d")) + self.assertFalse(self.find_binding("a", "from d.a import b", "a.d")) + self.assertFalse(self.find_binding("a", "from x.y import *", "a.b")) def test_import_as_with_package(self): - self.failIf(self.find_binding("a", "import b.c as a", "b.c")) - self.failIf(self.find_binding("a", "import a as f", "f")) - self.failIf(self.find_binding("a", "import a as f", "a")) + self.assertFalse(self.find_binding("a", "import b.c as a", "b.c")) + self.assertFalse(self.find_binding("a", "import a as f", "f")) + self.assertFalse(self.find_binding("a", "import a as f", "a")) def test_from_import_as_with_package(self): # Because it would take a lot of special-case code in the fixers # to deal with from foo import bar as baz, we'll simply always # fail if there is an "from ... import ... as ..." - self.failIf(self.find_binding("a", "from x import b as a", "x")) - self.failIf(self.find_binding("a", "from x import g as a, d as b", "x")) - self.failIf(self.find_binding("a", "from x.b import t as a", "x.b")) - self.failIf(self.find_binding("a", "from x.b import g as a, d", "x.b")) - self.failIf(self.find_binding("a", "from a import b as t", "a")) - self.failIf(self.find_binding("a", "from a import b as t", "b")) - self.failIf(self.find_binding("a", "from a import b as t", "t")) + self.assertFalse(self.find_binding("a", "from x import b as a", "x")) + self.assertFalse(self.find_binding("a", "from x import g as a, d as b", "x")) + self.assertFalse(self.find_binding("a", "from x.b import t as a", "x.b")) + self.assertFalse(self.find_binding("a", "from x.b import g as a, d", "x.b")) + self.assertFalse(self.find_binding("a", "from a import b as t", "a")) + self.assertFalse(self.find_binding("a", "from a import b as t", "b")) + self.assertFalse(self.find_binding("a", "from a import b as t", "t")) def test_function_def(self): - self.failUnless(self.find_binding("a", "def a(): pass")) - self.failUnless(self.find_binding("a", "def a(b, c, d): pass")) - self.failUnless(self.find_binding("a", "def a(): b = 7")) - self.failIf(self.find_binding("a", "def d(b, (c, a), e): pass")) - self.failIf(self.find_binding("a", "def d(a=7): pass")) - self.failIf(self.find_binding("a", "def d(a): pass")) - self.failIf(self.find_binding("a", "def d(): a = 7")) + self.assertTrue(self.find_binding("a", "def a(): pass")) + self.assertTrue(self.find_binding("a", "def a(b, c, d): pass")) + self.assertTrue(self.find_binding("a", "def a(): b = 7")) + self.assertFalse(self.find_binding("a", "def d(b, (c, a), e): pass")) + self.assertFalse(self.find_binding("a", "def d(a=7): pass")) + self.assertFalse(self.find_binding("a", "def d(a): pass")) + self.assertFalse(self.find_binding("a", "def d(): a = 7")) s = """ def d(): def a(): pass""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) def test_class_def(self): - self.failUnless(self.find_binding("a", "class a: pass")) - self.failUnless(self.find_binding("a", "class a(): pass")) - self.failUnless(self.find_binding("a", "class a(b): pass")) - self.failUnless(self.find_binding("a", "class a(b, c=8): pass")) - self.failIf(self.find_binding("a", "class d: pass")) - self.failIf(self.find_binding("a", "class d(a): pass")) - self.failIf(self.find_binding("a", "class d(b, a=7): pass")) - self.failIf(self.find_binding("a", "class d(b, *a): pass")) - self.failIf(self.find_binding("a", "class d(b, **a): pass")) - self.failIf(self.find_binding("a", "class d: a = 7")) + self.assertTrue(self.find_binding("a", "class a: pass")) + self.assertTrue(self.find_binding("a", "class a(): pass")) + self.assertTrue(self.find_binding("a", "class a(b): pass")) + self.assertTrue(self.find_binding("a", "class a(b, c=8): pass")) + self.assertFalse(self.find_binding("a", "class d: pass")) + self.assertFalse(self.find_binding("a", "class d(a): pass")) + self.assertFalse(self.find_binding("a", "class d(b, a=7): pass")) + self.assertFalse(self.find_binding("a", "class d(b, *a): pass")) + self.assertFalse(self.find_binding("a", "class d(b, **a): pass")) + self.assertFalse(self.find_binding("a", "class d: a = 7")) s = """ class d(): class a(): pass""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) def test_for(self): - self.failUnless(self.find_binding("a", "for a in r: pass")) - self.failUnless(self.find_binding("a", "for a, b in r: pass")) - self.failUnless(self.find_binding("a", "for (a, b) in r: pass")) - self.failUnless(self.find_binding("a", "for c, (a,) in r: pass")) - self.failUnless(self.find_binding("a", "for c, (a, b) in r: pass")) - self.failUnless(self.find_binding("a", "for c in r: a = c")) - self.failIf(self.find_binding("a", "for c in a: pass")) + self.assertTrue(self.find_binding("a", "for a in r: pass")) + self.assertTrue(self.find_binding("a", "for a, b in r: pass")) + self.assertTrue(self.find_binding("a", "for (a, b) in r: pass")) + self.assertTrue(self.find_binding("a", "for c, (a,) in r: pass")) + self.assertTrue(self.find_binding("a", "for c, (a, b) in r: pass")) + self.assertTrue(self.find_binding("a", "for c in r: a = c")) + self.assertFalse(self.find_binding("a", "for c in a: pass")) def test_for_nested(self): s = """ for b in r: for a in b: pass""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ for b in r: for a, c in b: pass""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ for b in r: for (a, c) in b: pass""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ for b in r: for (a,) in b: pass""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ for b in r: for c, (a, d) in b: pass""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ for b in r: for c in b: a = 7""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ for b in r: for c in b: d = a""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) s = """ for b in r: for c in a: d = 7""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) def test_if(self): - self.failUnless(self.find_binding("a", "if b in r: a = c")) - self.failIf(self.find_binding("a", "if a in r: d = e")) + self.assertTrue(self.find_binding("a", "if b in r: a = c")) + self.assertFalse(self.find_binding("a", "if a in r: d = e")) def test_if_nested(self): s = """ if b in r: if c in d: a = c""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ if b in r: if c in d: c = a""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) def test_while(self): - self.failUnless(self.find_binding("a", "while b in r: a = c")) - self.failIf(self.find_binding("a", "while a in r: d = e")) + self.assertTrue(self.find_binding("a", "while b in r: a = c")) + self.assertFalse(self.find_binding("a", "while a in r: d = e")) def test_while_nested(self): s = """ while b in r: while c in d: a = c""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ while b in r: while c in d: c = a""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) def test_try_except(self): s = """ @@ -354,14 +379,14 @@ a = 6 except: b = 8""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: b = 8 except: a = 6""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: @@ -370,14 +395,14 @@ pass except: a = 6""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: b = 8 except: b = 6""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) def test_try_except_nested(self): s = """ @@ -388,7 +413,7 @@ pass except: b = 8""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: @@ -398,7 +423,7 @@ a = 6 except: pass""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: @@ -408,7 +433,7 @@ pass except: a = 6""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: @@ -420,7 +445,7 @@ a = 6 except: pass""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: @@ -432,14 +457,14 @@ pass except: a = 6""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: b = 8 except: b = 6""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) s = """ try: @@ -454,7 +479,7 @@ t = 8 except: o = y""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) def test_try_except_finally(self): s = """ @@ -464,21 +489,21 @@ b = 8 finally: a = 9""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: b = 8 finally: a = 6""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: b = 8 finally: b = 6""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) s = """ try: @@ -487,7 +512,7 @@ b = 9 finally: b = 6""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) def test_try_except_finally_nested(self): s = """ @@ -502,7 +527,7 @@ b = 9 finally: c = 9""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: @@ -512,7 +537,7 @@ pass finally: a = 6""" - self.failUnless(self.find_binding("a", s)) + self.assertTrue(self.find_binding("a", s)) s = """ try: @@ -522,7 +547,7 @@ b = 6 finally: b = 7""" - self.failIf(self.find_binding("a", s)) + self.assertFalse(self.find_binding("a", s)) class Test_touch_import(support.TestCase): Modified: python/branches/tk_and_idle_maintenance/Lib/locale.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/locale.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/locale.py Wed Aug 5 15:32:47 2009 @@ -114,12 +114,15 @@ # Iterate over grouping intervals def _grouping_intervals(grouping): + last_interval = None for interval in grouping: # if grouping is -1, we are done if interval == CHAR_MAX: return # 0: re-use last group ad infinitum if interval == 0: + if last_interval is None: + raise ValueError("invalid grouping") while True: yield last_interval yield interval Modified: python/branches/tk_and_idle_maintenance/Lib/logging/__init__.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/logging/__init__.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/logging/__init__.py Wed Aug 5 15:32:47 2009 @@ -174,6 +174,17 @@ finally: _releaseLock() +def _checkLevel(level): + if isinstance(level, int): + rv = level + elif str(level) == level: + if level not in _levelNames: + raise ValueError("Unknown level: %r" % level) + rv = _levelNames[level] + else: + raise TypeError("Level not an integer or a valid string: %r" % level) + return rv + #--------------------------------------------------------------------------- # Thread-related stuff #--------------------------------------------------------------------------- @@ -593,7 +604,7 @@ and the filter list to empty. """ Filterer.__init__(self) - self.level = level + self.level = _checkLevel(level) self.formatter = None #get the module data lock, as we're updating a shared structure. _acquireLock() @@ -631,7 +642,7 @@ """ Set the logging level of this handler. """ - self.level = level + self.level = _checkLevel(level) def format(self, record): """ @@ -1010,7 +1021,7 @@ """ Filterer.__init__(self) self.name = name - self.level = level + self.level = _checkLevel(level) self.parent = None self.propagate = 1 self.handlers = [] @@ -1020,7 +1031,7 @@ """ Set the logging level of this logger. """ - self.level = level + self.level = _checkLevel(level) def debug(self, msg, *args, **kwargs): """ Modified: python/branches/tk_and_idle_maintenance/Lib/multiprocessing/pool.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/multiprocessing/pool.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/multiprocessing/pool.py Wed Aug 5 15:32:47 2009 @@ -207,6 +207,8 @@ chunksize, extra = divmod(len(iterable), len(self._pool) * 4) if extra: chunksize += 1 + if len(iterable) == 0: + chunksize = 0 task_batches = Pool._get_tasks(func, iterable, chunksize) result = MapResult(self._cache, chunksize, len(iterable), callback) Modified: python/branches/tk_and_idle_maintenance/Lib/multiprocessing/process.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/multiprocessing/process.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/multiprocessing/process.py Wed Aug 5 15:32:47 2009 @@ -220,7 +220,8 @@ self._children = set() self._counter = itertools.count(1) try: - os.close(sys.stdin.fileno()) + sys.stdin.close() + sys.stdin = open(os.devnull) except (OSError, ValueError): pass _current_process = self Modified: python/branches/tk_and_idle_maintenance/Lib/platform.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/platform.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/platform.py Wed Aug 5 15:32:47 2009 @@ -34,6 +34,7 @@ # # # +# 1.0.7 - added DEV_NULL # 1.0.6 - added linux_distribution() # 1.0.5 - fixed Java support to allow running the module on Jython # 1.0.4 - added IronPython support @@ -91,7 +92,7 @@ __copyright__ = """ Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:mal at lemburg.com - Copyright (c) 2000-2008, eGenix.com Software GmbH; mailto:info at egenix.com + Copyright (c) 2000-2009, eGenix.com Software GmbH; mailto:info at egenix.com Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee or royalty is hereby granted, @@ -110,10 +111,25 @@ """ -__version__ = '1.0.6' +__version__ = '1.0.7' import sys,string,os,re +### Globals & Constants + +# Determine the platform's /dev/null device +try: + DEV_NULL = os.devnull +except AttributeError: + # os.devnull was added in Python 2.4, so emulate it for earlier + # Python versions + if sys.platform in ('dos','win32','win16','os2'): + # Use the old CP/M NUL as device name + DEV_NULL = 'NUL' + else: + # Standard Unix uses /dev/null + DEV_NULL = '/dev/null' + ### Platform specific APIs _libc_search = re.compile(r'(__libc_init)' @@ -448,7 +464,16 @@ _ver_output = re.compile(r'(?:([\w ]+) ([\w.]+) ' '.*' - 'Version ([\d.]+))') + '\[.* ([\d.]+)\])') + +# Examples of VER command output: +# +# Windows 2000: Microsoft Windows 2000 [Version 5.00.2195] +# Windows XP: Microsoft Windows XP [Version 5.1.2600] +# Windows Vista: Microsoft Windows [Version 6.0.6002] +# +# Note that the "Version" string gets localized on different +# Windows versions. def _syscmd_ver(system='', release='', version='', @@ -580,6 +605,7 @@ version = '%i.%i.%i' % (maj,min,buildno & 0xFFFF) if csd[:13] == 'Service Pack ': csd = 'SP' + csd[13:] + if plat == VER_PLATFORM_WIN32_WINDOWS: regkey = 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion' # Try to guess the release name @@ -594,6 +620,7 @@ release = 'postMe' elif maj == 5: release = '2000' + elif plat == VER_PLATFORM_WIN32_NT: regkey = 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion' if maj <= 4: @@ -622,8 +649,12 @@ release = 'Vista' else: release = '2008Server' + #elif min == 1: + # # Windows 7 release candidate uses version 6.1.7100 + # release = '7RC' else: release = 'post2008Server' + else: if not release: # E.g. Win3.1 with win32s @@ -926,7 +957,7 @@ # XXX Others too ? return default try: - f = os.popen('uname %s 2> /dev/null' % option) + f = os.popen('uname %s 2> %s' % (option, DEV_NULL)) except (AttributeError,os.error): return default output = string.strip(f.read()) @@ -951,7 +982,7 @@ return default target = _follow_symlinks(target) try: - f = os.popen('file "%s" 2> /dev/null' % target) + f = os.popen('file "%s" 2> %s' % (target, DEV_NULL)) except (AttributeError,os.error): return default output = string.strip(f.read()) @@ -1098,7 +1129,7 @@ node = _node() machine = '' - use_syscmd_ver = 01 + use_syscmd_ver = 1 # Try win32_ver() on win32 platforms if system == 'win32': Modified: python/branches/tk_and_idle_maintenance/Lib/pydoc.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/pydoc.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/pydoc.py Wed Aug 5 15:32:47 2009 @@ -55,6 +55,7 @@ import sys, imp, os, re, types, inspect, __builtin__, pkgutil from repr import Repr from string import expandtabs, find, join, lower, split, strip, rfind, rstrip +from traceback import extract_tb try: from collections import deque except ImportError: @@ -299,9 +300,9 @@ elif exc is SyntaxError: # A SyntaxError occurred before we could execute the module. raise ErrorDuringImport(value.filename, info) - elif exc is ImportError and \ - split(lower(str(value)))[:2] == ['no', 'module']: - # The module was not found. + elif exc is ImportError and extract_tb(tb)[-1][2]=='safeimport': + # The import error occurred directly in this function, + # which means there is no such module in the path. return None else: # Some other error occurred during the importing process. Modified: python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/dbapi.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/dbapi.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/dbapi.py Wed Aug 5 15:32:47 2009 @@ -45,39 +45,39 @@ "Warning is not a subclass of StandardError") def CheckError(self): - self.failUnless(issubclass(sqlite.Error, StandardError), + self.assertTrue(issubclass(sqlite.Error, StandardError), "Error is not a subclass of StandardError") def CheckInterfaceError(self): - self.failUnless(issubclass(sqlite.InterfaceError, sqlite.Error), + self.assertTrue(issubclass(sqlite.InterfaceError, sqlite.Error), "InterfaceError is not a subclass of Error") def CheckDatabaseError(self): - self.failUnless(issubclass(sqlite.DatabaseError, sqlite.Error), + self.assertTrue(issubclass(sqlite.DatabaseError, sqlite.Error), "DatabaseError is not a subclass of Error") def CheckDataError(self): - self.failUnless(issubclass(sqlite.DataError, sqlite.DatabaseError), + self.assertTrue(issubclass(sqlite.DataError, sqlite.DatabaseError), "DataError is not a subclass of DatabaseError") def CheckOperationalError(self): - self.failUnless(issubclass(sqlite.OperationalError, sqlite.DatabaseError), + self.assertTrue(issubclass(sqlite.OperationalError, sqlite.DatabaseError), "OperationalError is not a subclass of DatabaseError") def CheckIntegrityError(self): - self.failUnless(issubclass(sqlite.IntegrityError, sqlite.DatabaseError), + self.assertTrue(issubclass(sqlite.IntegrityError, sqlite.DatabaseError), "IntegrityError is not a subclass of DatabaseError") def CheckInternalError(self): - self.failUnless(issubclass(sqlite.InternalError, sqlite.DatabaseError), + self.assertTrue(issubclass(sqlite.InternalError, sqlite.DatabaseError), "InternalError is not a subclass of DatabaseError") def CheckProgrammingError(self): - self.failUnless(issubclass(sqlite.ProgrammingError, sqlite.DatabaseError), + self.assertTrue(issubclass(sqlite.ProgrammingError, sqlite.DatabaseError), "ProgrammingError is not a subclass of DatabaseError") def CheckNotSupportedError(self): - self.failUnless(issubclass(sqlite.NotSupportedError, + self.assertTrue(issubclass(sqlite.NotSupportedError, sqlite.DatabaseError), "NotSupportedError is not a subclass of DatabaseError") @@ -127,16 +127,16 @@ def CheckExceptions(self): # Optional DB-API extension. - self.failUnlessEqual(self.cx.Warning, sqlite.Warning) - self.failUnlessEqual(self.cx.Error, sqlite.Error) - self.failUnlessEqual(self.cx.InterfaceError, sqlite.InterfaceError) - self.failUnlessEqual(self.cx.DatabaseError, sqlite.DatabaseError) - self.failUnlessEqual(self.cx.DataError, sqlite.DataError) - self.failUnlessEqual(self.cx.OperationalError, sqlite.OperationalError) - self.failUnlessEqual(self.cx.IntegrityError, sqlite.IntegrityError) - self.failUnlessEqual(self.cx.InternalError, sqlite.InternalError) - self.failUnlessEqual(self.cx.ProgrammingError, sqlite.ProgrammingError) - self.failUnlessEqual(self.cx.NotSupportedError, sqlite.NotSupportedError) + self.assertEqual(self.cx.Warning, sqlite.Warning) + self.assertEqual(self.cx.Error, sqlite.Error) + self.assertEqual(self.cx.InterfaceError, sqlite.InterfaceError) + self.assertEqual(self.cx.DatabaseError, sqlite.DatabaseError) + self.assertEqual(self.cx.DataError, sqlite.DataError) + self.assertEqual(self.cx.OperationalError, sqlite.OperationalError) + self.assertEqual(self.cx.IntegrityError, sqlite.IntegrityError) + self.assertEqual(self.cx.InternalError, sqlite.InternalError) + self.assertEqual(self.cx.ProgrammingError, sqlite.ProgrammingError) + self.assertEqual(self.cx.NotSupportedError, sqlite.NotSupportedError) class CursorTests(unittest.TestCase): def setUp(self): @@ -228,7 +228,7 @@ self.cu.execute("insert into test(name) values ('foo')") self.cu.execute("select name from test where name=?", ["foo"]) row = self.cu.fetchone() - self.failUnlessEqual(row[0], "foo") + self.assertEqual(row[0], "foo") def CheckExecuteParamSequence(self): class L(object): @@ -241,13 +241,13 @@ self.cu.execute("insert into test(name) values ('foo')") self.cu.execute("select name from test where name=?", L()) row = self.cu.fetchone() - self.failUnlessEqual(row[0], "foo") + self.assertEqual(row[0], "foo") def CheckExecuteDictMapping(self): self.cu.execute("insert into test(name) values ('foo')") self.cu.execute("select name from test where name=:name", {"name": "foo"}) row = self.cu.fetchone() - self.failUnlessEqual(row[0], "foo") + self.assertEqual(row[0], "foo") def CheckExecuteDictMapping_Mapping(self): # Test only works with Python 2.5 or later @@ -261,7 +261,7 @@ self.cu.execute("insert into test(name) values ('foo')") self.cu.execute("select name from test where name=:name", D()) row = self.cu.fetchone() - self.failUnlessEqual(row[0], "foo") + self.assertEqual(row[0], "foo") def CheckExecuteDictMappingTooLittleArgs(self): self.cu.execute("insert into test(name) values ('foo')") @@ -295,7 +295,7 @@ self.cu.execute("insert into test(name) values ('foo')") self.cu.execute("insert into test(name) values ('foo')") self.cu.execute("update test set name='bar'") - self.failUnlessEqual(self.cu.rowcount, 2) + self.assertEqual(self.cu.rowcount, 2) def CheckRowcountSelect(self): """ @@ -304,12 +304,12 @@ has thus to be -1. """ self.cu.execute("select 5 union select 6") - self.failUnlessEqual(self.cu.rowcount, -1) + self.assertEqual(self.cu.rowcount, -1) def CheckRowcountExecutemany(self): self.cu.execute("delete from test") self.cu.executemany("insert into test(name) values (?)", [(1,), (2,), (3,)]) - self.failUnlessEqual(self.cu.rowcount, 3) + self.assertEqual(self.cu.rowcount, 3) def CheckTotalChanges(self): self.cu.execute("insert into test(name) values ('foo')") @@ -382,24 +382,24 @@ lst = [] for row in self.cu: lst.append(row[0]) - self.failUnlessEqual(lst[0], 5) - self.failUnlessEqual(lst[1], 6) + self.assertEqual(lst[0], 5) + self.assertEqual(lst[1], 6) def CheckFetchone(self): self.cu.execute("select name from test") row = self.cu.fetchone() - self.failUnlessEqual(row[0], "foo") + self.assertEqual(row[0], "foo") row = self.cu.fetchone() - self.failUnlessEqual(row, None) + self.assertEqual(row, None) def CheckFetchoneNoStatement(self): cur = self.cx.cursor() row = cur.fetchone() - self.failUnlessEqual(row, None) + self.assertEqual(row, None) def CheckArraySize(self): # must default ot 1 - self.failUnlessEqual(self.cu.arraysize, 1) + self.assertEqual(self.cu.arraysize, 1) # now set to 2 self.cu.arraysize = 2 @@ -412,27 +412,27 @@ self.cu.execute("select name from test") res = self.cu.fetchmany() - self.failUnlessEqual(len(res), 2) + self.assertEqual(len(res), 2) def CheckFetchmany(self): self.cu.execute("select name from test") res = self.cu.fetchmany(100) - self.failUnlessEqual(len(res), 1) + self.assertEqual(len(res), 1) res = self.cu.fetchmany(100) - self.failUnlessEqual(res, []) + self.assertEqual(res, []) def CheckFetchmanyKwArg(self): """Checks if fetchmany works with keyword arguments""" self.cu.execute("select name from test") res = self.cu.fetchmany(size=100) - self.failUnlessEqual(len(res), 1) + self.assertEqual(len(res), 1) def CheckFetchall(self): self.cu.execute("select name from test") res = self.cu.fetchall() - self.failUnlessEqual(len(res), 1) + self.assertEqual(len(res), 1) res = self.cu.fetchall() - self.failUnlessEqual(res, []) + self.assertEqual(res, []) def CheckSetinputsizes(self): self.cu.setinputsizes([3, 4, 5]) @@ -445,7 +445,7 @@ def CheckCursorConnection(self): # Optional DB-API extension. - self.failUnlessEqual(self.cu.connection, self.cx) + self.assertEqual(self.cu.connection, self.cx) def CheckWrongCursorCallable(self): try: @@ -656,7 +656,7 @@ """) cur.execute("select i from a") res = cur.fetchone()[0] - self.failUnlessEqual(res, 5) + self.assertEqual(res, 5) def CheckScriptStringUnicode(self): con = sqlite.connect(":memory:") @@ -670,7 +670,7 @@ """) cur.execute("select i from a") res = cur.fetchone()[0] - self.failUnlessEqual(res, 6) + self.assertEqual(res, 6) def CheckScriptErrorIncomplete(self): con = sqlite.connect(":memory:") @@ -680,7 +680,7 @@ cur.executescript("create table test(sadfsadfdsa") except sqlite.ProgrammingError: raised = True - self.failUnlessEqual(raised, True, "should have raised an exception") + self.assertEqual(raised, True, "should have raised an exception") def CheckScriptErrorNormal(self): con = sqlite.connect(":memory:") @@ -690,26 +690,26 @@ cur.executescript("create table test(sadfsadfdsa); select foo from hurz;") except sqlite.OperationalError: raised = True - self.failUnlessEqual(raised, True, "should have raised an exception") + self.assertEqual(raised, True, "should have raised an exception") def CheckConnectionExecute(self): con = sqlite.connect(":memory:") result = con.execute("select 5").fetchone()[0] - self.failUnlessEqual(result, 5, "Basic test of Connection.execute") + self.assertEqual(result, 5, "Basic test of Connection.execute") def CheckConnectionExecutemany(self): con = sqlite.connect(":memory:") con.execute("create table test(foo)") con.executemany("insert into test(foo) values (?)", [(3,), (4,)]) result = con.execute("select foo from test order by foo").fetchall() - self.failUnlessEqual(result[0][0], 3, "Basic test of Connection.executemany") - self.failUnlessEqual(result[1][0], 4, "Basic test of Connection.executemany") + self.assertEqual(result[0][0], 3, "Basic test of Connection.executemany") + self.assertEqual(result[1][0], 4, "Basic test of Connection.executemany") def CheckConnectionExecutescript(self): con = sqlite.connect(":memory:") con.executescript("create table test(foo); insert into test(foo) values (5);") result = con.execute("select foo from test").fetchone()[0] - self.failUnlessEqual(result, 5, "Basic test of Connection.executescript") + self.assertEqual(result, 5, "Basic test of Connection.executescript") class ClosedTests(unittest.TestCase): def setUp(self): Modified: python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/factory.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/factory.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/factory.py Wed Aug 5 15:32:47 2009 @@ -47,7 +47,7 @@ self.con.close() def CheckIsInstance(self): - self.failUnless(isinstance(self.con, + self.assertTrue(isinstance(self.con, MyConnection), "connection is not instance of MyConnection") @@ -60,7 +60,7 @@ def CheckIsInstance(self): cur = self.con.cursor(factory=MyCursor) - self.failUnless(isinstance(cur, + self.assertTrue(isinstance(cur, MyCursor), "cursor is not instance of MyCursor") @@ -72,7 +72,7 @@ cur = self.con.cursor(factory=MyCursor) cur.execute("select 4+5 as foo") row = cur.fetchone() - self.failUnless(isinstance(row, + self.assertTrue(isinstance(row, dict), "row is not instance of dict") cur.close() @@ -87,28 +87,28 @@ def CheckCustomFactory(self): self.con.row_factory = lambda cur, row: list(row) row = self.con.execute("select 1, 2").fetchone() - self.failUnless(isinstance(row, + self.assertTrue(isinstance(row, list), "row is not instance of list") def CheckSqliteRowIndex(self): self.con.row_factory = sqlite.Row row = self.con.execute("select 1 as a, 2 as b").fetchone() - self.failUnless(isinstance(row, + self.assertTrue(isinstance(row, sqlite.Row), "row is not instance of sqlite.Row") col1, col2 = row["a"], row["b"] - self.failUnless(col1 == 1, "by name: wrong result for column 'a'") - self.failUnless(col2 == 2, "by name: wrong result for column 'a'") + self.assertTrue(col1 == 1, "by name: wrong result for column 'a'") + self.assertTrue(col2 == 2, "by name: wrong result for column 'a'") col1, col2 = row["A"], row["B"] - self.failUnless(col1 == 1, "by name: wrong result for column 'A'") - self.failUnless(col2 == 2, "by name: wrong result for column 'B'") + self.assertTrue(col1 == 1, "by name: wrong result for column 'A'") + self.assertTrue(col2 == 2, "by name: wrong result for column 'B'") col1, col2 = row[0], row[1] - self.failUnless(col1 == 1, "by index: wrong result for column 0") - self.failUnless(col2 == 2, "by index: wrong result for column 1") + self.assertTrue(col1 == 1, "by index: wrong result for column 0") + self.assertTrue(col2 == 2, "by index: wrong result for column 1") def CheckSqliteRowIter(self): """Checks if the row object is iterable""" @@ -128,8 +128,8 @@ self.con.row_factory = sqlite.Row row = self.con.execute("select 1 as a, 2 as b").fetchone() d = dict(row) - self.failUnlessEqual(d["a"], row["a"]) - self.failUnlessEqual(d["b"], row["b"]) + self.assertEqual(d["a"], row["a"]) + self.assertEqual(d["b"], row["b"]) def CheckSqliteRowHashCmp(self): """Checks if the row object compares and hashes correctly""" @@ -138,18 +138,18 @@ row_2 = self.con.execute("select 1 as a, 2 as b").fetchone() row_3 = self.con.execute("select 1 as a, 3 as b").fetchone() - self.failUnless(row_1 == row_1) - self.failUnless(row_1 == row_2) - self.failUnless(row_2 != row_3) - - self.failIf(row_1 != row_1) - self.failIf(row_1 != row_2) - self.failIf(row_2 == row_3) - - self.failUnlessEqual(row_1, row_2) - self.failUnlessEqual(hash(row_1), hash(row_2)) - self.failIfEqual(row_1, row_3) - self.failIfEqual(hash(row_1), hash(row_3)) + self.assertTrue(row_1 == row_1) + self.assertTrue(row_1 == row_2) + self.assertTrue(row_2 != row_3) + + self.assertFalse(row_1 != row_1) + self.assertFalse(row_1 != row_2) + self.assertFalse(row_2 == row_3) + + self.assertEqual(row_1, row_2) + self.assertEqual(hash(row_1), hash(row_2)) + self.assertNotEqual(row_1, row_3) + self.assertNotEqual(hash(row_1), hash(row_3)) def tearDown(self): self.con.close() @@ -161,21 +161,21 @@ def CheckUnicode(self): austria = unicode("?sterreich", "latin1") row = self.con.execute("select ?", (austria,)).fetchone() - self.failUnless(type(row[0]) == unicode, "type of row[0] must be unicode") + self.assertTrue(type(row[0]) == unicode, "type of row[0] must be unicode") def CheckString(self): self.con.text_factory = str austria = unicode("?sterreich", "latin1") row = self.con.execute("select ?", (austria,)).fetchone() - self.failUnless(type(row[0]) == str, "type of row[0] must be str") - self.failUnless(row[0] == austria.encode("utf-8"), "column must equal original data in UTF-8") + self.assertTrue(type(row[0]) == str, "type of row[0] must be str") + self.assertTrue(row[0] == austria.encode("utf-8"), "column must equal original data in UTF-8") def CheckCustom(self): self.con.text_factory = lambda x: unicode(x, "utf-8", "ignore") austria = unicode("?sterreich", "latin1") row = self.con.execute("select ?", (austria.encode("latin1"),)).fetchone() - self.failUnless(type(row[0]) == unicode, "type of row[0] must be unicode") - self.failUnless(row[0].endswith(u"reich"), "column must contain original data") + self.assertTrue(type(row[0]) == unicode, "type of row[0] must be unicode") + self.assertTrue(row[0].endswith(u"reich"), "column must contain original data") def CheckOptimizedUnicode(self): self.con.text_factory = sqlite.OptimizedUnicode @@ -183,8 +183,8 @@ germany = unicode("Deutchland") a_row = self.con.execute("select ?", (austria,)).fetchone() d_row = self.con.execute("select ?", (germany,)).fetchone() - self.failUnless(type(a_row[0]) == unicode, "type of non-ASCII row must be unicode") - self.failUnless(type(d_row[0]) == str, "type of ASCII-only row must be str") + self.assertTrue(type(a_row[0]) == unicode, "type of non-ASCII row must be unicode") + self.assertTrue(type(d_row[0]) == str, "type of ASCII-only row must be str") def tearDown(self): self.con.close() Modified: python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/hooks.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/hooks.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/hooks.py Wed Aug 5 15:32:47 2009 @@ -37,7 +37,7 @@ con.create_collation("X", 42) self.fail("should have raised a TypeError") except TypeError, e: - self.failUnlessEqual(e.args[0], "parameter must be callable") + self.assertEqual(e.args[0], "parameter must be callable") def CheckCreateCollationNotAscii(self): con = sqlite.connect(":memory:") @@ -74,7 +74,7 @@ result = con.execute(sql).fetchall() self.fail("should have raised an OperationalError") except sqlite.OperationalError, e: - self.failUnlessEqual(e.args[0].lower(), "no such collation sequence: mycoll") + self.assertEqual(e.args[0].lower(), "no such collation sequence: mycoll") def CheckCollationRegisterTwice(self): """ @@ -119,7 +119,7 @@ con.execute(""" create table foo(a, b) """) - self.failUnless(progress_calls) + self.assertTrue(progress_calls) def CheckOpcodeCount(self): @@ -143,7 +143,7 @@ create table bar (a, b) """) second_count = len(progress_calls) - self.failUnless(first_count > second_count) + self.assertTrue(first_count > second_count) def CheckCancelOperation(self): """ @@ -173,7 +173,7 @@ con.set_progress_handler(progress, 1) con.set_progress_handler(None, 1) con.execute("select 1 union select 2 union select 3").fetchall() - self.failUnlessEqual(action, 0, "progress handler was not cleared") + self.assertEqual(action, 0, "progress handler was not cleared") def suite(): collation_suite = unittest.makeSuite(CollationTests, "Check") Modified: python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/py25tests.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/py25tests.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/py25tests.py Wed Aug 5 15:32:47 2009 @@ -54,19 +54,19 @@ self.con.execute("insert into test(c) values ('foo')") self.con.rollback() count = self.con.execute("select count(*) from test").fetchone()[0] - self.failUnlessEqual(count, 1) + self.assertEqual(count, 1) def CheckContextManagerRollback(self): """Is a rollback called in the context manager?""" global did_rollback - self.failUnlessEqual(did_rollback, False) + self.assertEqual(did_rollback, False) try: with self.con: self.con.execute("insert into test(c) values (4)") self.con.execute("insert into test(c) values (4)") except sqlite.IntegrityError: pass - self.failUnlessEqual(did_rollback, True) + self.assertEqual(did_rollback, True) def suite(): ctx_suite = unittest.makeSuite(ContextTests, "Check") Modified: python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/regression.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/regression.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/regression.py Wed Aug 5 15:32:47 2009 @@ -65,10 +65,10 @@ def CheckColumnNameWithSpaces(self): cur = self.con.cursor() cur.execute('select 1 as "foo bar [datetime]"') - self.failUnlessEqual(cur.description[0][0], "foo bar") + self.assertEqual(cur.description[0][0], "foo bar") cur.execute('select 1 as "foo baz"') - self.failUnlessEqual(cur.description[0][0], "foo baz") + self.assertEqual(cur.description[0][0], "foo baz") def CheckStatementAvailable(self): # pysqlite up to 2.3.2 crashed on this, because the active statement handle was not checked Modified: python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/transactions.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/transactions.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/transactions.py Wed Aug 5 15:32:47 2009 @@ -59,14 +59,14 @@ self.cur1.execute("create table test2(j)") self.cur2.execute("select i from test") res = self.cur2.fetchall() - self.failUnlessEqual(len(res), 1) + self.assertEqual(len(res), 1) def CheckInsertStartsTransaction(self): self.cur1.execute("create table test(i)") self.cur1.execute("insert into test(i) values (5)") self.cur2.execute("select i from test") res = self.cur2.fetchall() - self.failUnlessEqual(len(res), 0) + self.assertEqual(len(res), 0) def CheckUpdateStartsTransaction(self): self.cur1.execute("create table test(i)") @@ -75,7 +75,7 @@ self.cur1.execute("update test set i=6") self.cur2.execute("select i from test") res = self.cur2.fetchone()[0] - self.failUnlessEqual(res, 5) + self.assertEqual(res, 5) def CheckDeleteStartsTransaction(self): self.cur1.execute("create table test(i)") @@ -84,7 +84,7 @@ self.cur1.execute("delete from test") self.cur2.execute("select i from test") res = self.cur2.fetchall() - self.failUnlessEqual(len(res), 1) + self.assertEqual(len(res), 1) def CheckReplaceStartsTransaction(self): self.cur1.execute("create table test(i)") @@ -93,24 +93,24 @@ self.cur1.execute("replace into test(i) values (6)") self.cur2.execute("select i from test") res = self.cur2.fetchall() - self.failUnlessEqual(len(res), 1) - self.failUnlessEqual(res[0][0], 5) + self.assertEqual(len(res), 1) + self.assertEqual(res[0][0], 5) def CheckToggleAutoCommit(self): self.cur1.execute("create table test(i)") self.cur1.execute("insert into test(i) values (5)") self.con1.isolation_level = None - self.failUnlessEqual(self.con1.isolation_level, None) + self.assertEqual(self.con1.isolation_level, None) self.cur2.execute("select i from test") res = self.cur2.fetchall() - self.failUnlessEqual(len(res), 1) + self.assertEqual(len(res), 1) self.con1.isolation_level = "DEFERRED" - self.failUnlessEqual(self.con1.isolation_level , "DEFERRED") + self.assertEqual(self.con1.isolation_level , "DEFERRED") self.cur1.execute("insert into test(i) values (5)") self.cur2.execute("select i from test") res = self.cur2.fetchall() - self.failUnlessEqual(len(res), 1) + self.assertEqual(len(res), 1) def CheckRaiseTimeout(self): if sqlite.sqlite_version_info < (3, 2, 2): Modified: python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/types.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/types.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/types.py Wed Aug 5 15:32:47 2009 @@ -39,39 +39,39 @@ self.cur.execute("insert into test(s) values (?)", (u"?sterreich",)) self.cur.execute("select s from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], u"?sterreich") + self.assertEqual(row[0], u"?sterreich") def CheckSmallInt(self): self.cur.execute("insert into test(i) values (?)", (42,)) self.cur.execute("select i from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], 42) + self.assertEqual(row[0], 42) def CheckLargeInt(self): num = 2**40 self.cur.execute("insert into test(i) values (?)", (num,)) self.cur.execute("select i from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], num) + self.assertEqual(row[0], num) def CheckFloat(self): val = 3.14 self.cur.execute("insert into test(f) values (?)", (val,)) self.cur.execute("select f from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], val) + self.assertEqual(row[0], val) def CheckBlob(self): val = buffer("Guglhupf") self.cur.execute("insert into test(b) values (?)", (val,)) self.cur.execute("select b from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], val) + self.assertEqual(row[0], val) def CheckUnicodeExecute(self): self.cur.execute(u"select '?sterreich'") row = self.cur.fetchone() - self.failUnlessEqual(row[0], u"?sterreich") + self.assertEqual(row[0], u"?sterreich") class DeclTypesTests(unittest.TestCase): class Foo: @@ -122,14 +122,14 @@ self.cur.execute("insert into test(s) values (?)", ("foo",)) self.cur.execute('select s as "s [WRONG]" from test') row = self.cur.fetchone() - self.failUnlessEqual(row[0], "foo") + self.assertEqual(row[0], "foo") def CheckSmallInt(self): # default self.cur.execute("insert into test(i) values (?)", (42,)) self.cur.execute("select i from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], 42) + self.assertEqual(row[0], 42) def CheckLargeInt(self): # default @@ -137,7 +137,7 @@ self.cur.execute("insert into test(i) values (?)", (num,)) self.cur.execute("select i from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], num) + self.assertEqual(row[0], num) def CheckFloat(self): # custom @@ -145,20 +145,20 @@ self.cur.execute("insert into test(f) values (?)", (val,)) self.cur.execute("select f from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], 47.2) + self.assertEqual(row[0], 47.2) def CheckBool(self): # custom self.cur.execute("insert into test(b) values (?)", (False,)) self.cur.execute("select b from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], False) + self.assertEqual(row[0], False) self.cur.execute("delete from test") self.cur.execute("insert into test(b) values (?)", (True,)) self.cur.execute("select b from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], True) + self.assertEqual(row[0], True) def CheckUnicode(self): # default @@ -166,14 +166,14 @@ self.cur.execute("insert into test(u) values (?)", (val,)) self.cur.execute("select u from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], val) + self.assertEqual(row[0], val) def CheckFoo(self): val = DeclTypesTests.Foo("bla") self.cur.execute("insert into test(foo) values (?)", (val,)) self.cur.execute("select foo from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], val) + self.assertEqual(row[0], val) def CheckUnsupportedSeq(self): class Bar: pass @@ -203,20 +203,20 @@ self.cur.execute("insert into test(bin) values (?)", (val,)) self.cur.execute("select bin from test") row = self.cur.fetchone() - self.failUnlessEqual(row[0], val) + self.assertEqual(row[0], val) def CheckNumber1(self): self.cur.execute("insert into test(n1) values (5)") value = self.cur.execute("select n1 from test").fetchone()[0] # if the converter is not used, it's an int instead of a float - self.failUnlessEqual(type(value), float) + self.assertEqual(type(value), float) def CheckNumber2(self): """Checks wether converter names are cut off at '(' characters""" self.cur.execute("insert into test(n2) values (5)") value = self.cur.execute("select n2 from test").fetchone()[0] # if the converter is not used, it's an int instead of a float - self.failUnlessEqual(type(value), float) + self.assertEqual(type(value), float) class ColNamesTests(unittest.TestCase): def setUp(self): @@ -245,28 +245,28 @@ self.cur.execute("insert into test(x) values (?)", ("xxx",)) self.cur.execute("select x from test") val = self.cur.fetchone()[0] - self.failUnlessEqual(val, "xxx") + self.assertEqual(val, "xxx") def CheckNone(self): self.cur.execute("insert into test(x) values (?)", (None,)) self.cur.execute("select x from test") val = self.cur.fetchone()[0] - self.failUnlessEqual(val, None) + self.assertEqual(val, None) def CheckColName(self): self.cur.execute("insert into test(x) values (?)", ("xxx",)) self.cur.execute('select x as "x [bar]" from test') val = self.cur.fetchone()[0] - self.failUnlessEqual(val, "") + self.assertEqual(val, "") # Check if the stripping of colnames works. Everything after the first # whitespace should be stripped. - self.failUnlessEqual(self.cur.description[0][0], "x") + self.assertEqual(self.cur.description[0][0], "x") def CheckCaseInConverterName(self): self.cur.execute("""select 'other' as "x [b1b1]\"""") val = self.cur.fetchone()[0] - self.failUnlessEqual(val, "MARKER") + self.assertEqual(val, "MARKER") def CheckCursorDescriptionNoRow(self): """ @@ -298,7 +298,7 @@ def CheckCasterIsUsed(self): self.cur.execute("select ?", (4,)) val = self.cur.fetchone()[0] - self.failUnlessEqual(type(val), float) + self.assertEqual(type(val), float) class BinaryConverterTests(unittest.TestCase): def convert(s): @@ -315,7 +315,7 @@ def CheckBinaryInputForConverter(self): testdata = "abcdefg" * 10 result = self.con.execute('select ? as "x [bin]"', (buffer(zlib.compress(testdata)),)).fetchone()[0] - self.failUnlessEqual(testdata, result) + self.assertEqual(testdata, result) class DateTimeTests(unittest.TestCase): def setUp(self): @@ -332,14 +332,14 @@ self.cur.execute("insert into test(d) values (?)", (d,)) self.cur.execute("select d from test") d2 = self.cur.fetchone()[0] - self.failUnlessEqual(d, d2) + self.assertEqual(d, d2) def CheckSqliteTimestamp(self): ts = sqlite.Timestamp(2004, 2, 14, 7, 15, 0) self.cur.execute("insert into test(ts) values (?)", (ts,)) self.cur.execute("select ts from test") ts2 = self.cur.fetchone()[0] - self.failUnlessEqual(ts, ts2) + self.assertEqual(ts, ts2) def CheckSqlTimestamp(self): # The date functions are only available in SQLite version 3.1 or later @@ -351,22 +351,22 @@ self.cur.execute("insert into test(ts) values (current_timestamp)") self.cur.execute("select ts from test") ts = self.cur.fetchone()[0] - self.failUnlessEqual(type(ts), datetime.datetime) - self.failUnlessEqual(ts.year, now.year) + self.assertEqual(type(ts), datetime.datetime) + self.assertEqual(ts.year, now.year) def CheckDateTimeSubSeconds(self): ts = sqlite.Timestamp(2004, 2, 14, 7, 15, 0, 500000) self.cur.execute("insert into test(ts) values (?)", (ts,)) self.cur.execute("select ts from test") ts2 = self.cur.fetchone()[0] - self.failUnlessEqual(ts, ts2) + self.assertEqual(ts, ts2) def CheckDateTimeSubSecondsFloatingPoint(self): ts = sqlite.Timestamp(2004, 2, 14, 7, 15, 0, 510241) self.cur.execute("insert into test(ts) values (?)", (ts,)) self.cur.execute("select ts from test") ts2 = self.cur.fetchone()[0] - self.failUnlessEqual(ts, ts2) + self.assertEqual(ts, ts2) def suite(): sqlite_type_suite = unittest.makeSuite(SqliteTypeTests, "Check") Modified: python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/userfunctions.py ============================================================================== --- python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/userfunctions.py (original) +++ python/branches/tk_and_idle_maintenance/Lib/sqlite3/test/userfunctions.py Wed Aug 5 15:32:47 2009 @@ -160,28 +160,28 @@ cur = self.con.cursor() cur.execute("select returntext()") val = cur.fetchone()[0] - self.failUnlessEqual(type(val), unicode) - self.failUnlessEqual(val, "foo") + self.assertEqual(type(val), unicode) + self.assertEqual(val, "foo") def CheckFuncReturnUnicode(self): cur = self.con.cursor() cur.execute("select returnunicode()") val = cur.fetchone()[0] - self.failUnlessEqual(type(val), unicode) - self.failUnlessEqual(val, u"bar") + self.assertEqual(type(val), unicode) + self.assertEqual(val, u"bar") def CheckFuncReturnInt(self): cur = self.con.cursor() cur.execute("select returnint()") val = cur.fetchone()[0] - self.failUnlessEqual(type(val), int) - self.failUnlessEqual(val, 42) + self.assertEqual(type(val), int) + self.assertEqual(val, 42) def CheckFuncReturnFloat(self): cur = self.con.cursor() cur.execute("select returnfloat()") val = cur.fetchone()[0] - self.failUnlessEqual(type(val), float) + self.assertEqual(type(val), float) if val < 3.139 or val > 3.141: self.fail("wrong value") @@ -189,15 +189,15 @@ cur = self.con.cursor() cur.execute("select returnnull()") val = cur.fetchone()[0] - self.failUnlessEqual(type(val), type(None)) - self.failUnlessEqual(val, None) + self.assertEqual(type(val), type(None)) + self.assertEqual(val, None) def CheckFuncReturnBlob(self): cur = self.con.cursor() cur.execute("select returnblob()") val = cur.fetchone()[0] - self.failUnlessEqual(type(val), buffer) - self.failUnlessEqual(val, buffer("blob")) + self.assertEqual(type(val), buffer) + self.assertEqual(val, buffer("blob")) def CheckFuncException(self): cur = self.con.cursor() @@ -206,37 +206,37 @@ cur.fetchone() self.fail("should have raised OperationalError") except sqlite.OperationalError, e: - self.failUnlessEqual(e.args[0], 'user-defined function raised exception') + self.assertEqual(e.args[0], 'user-defined function raised exception') def CheckParamString(self): cur = self.con.cursor() cur.execute("select isstring(?)", ("foo",)) val = cur.fetchone()[0] - self.failUnlessEqual(val, 1) + self.assertEqual(val, 1) def CheckParamInt(self): cur = self.con.cursor() cur.execute("select isint(?)", (42,)) val = cur.fetchone()[0] - self.failUnlessEqual(val, 1) + self.assertEqual(val, 1) def CheckParamFloat(self): cur = self.con.cursor() cur.execute("select isfloat(?)", (3.14,)) val = cur.fetchone()[0] - self.failUnlessEqual(val, 1) + self.assertEqual(val, 1) def CheckParamNone(self): cur = self.con.cursor() cur.execute("select isnone(?)", (None,)) val = cur.fetchone()[0] - self.failUnlessEqual(val, 1) + self.assertEqual(val, 1) def CheckParamBlob(self): cur