From solipsis at pitrou.net  Thu Jul  1 01:23:55 2010
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu,  1 Jul 2010 01:23:55 +0200 (CEST)
Subject: [Python-checkins] Daily py3k reference leaks (r82407): sum=0
Message-ID: <20100630232355.4AB2A1770A@ns6635.ovh.net>

py3k results for svn r82407 (hg cset 40435013f940)
--------------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogluNgCL', '-x']

From python-checkins at python.org  Thu Jul  1 01:58:07 2010
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  1 Jul 2010 01:58:07 +0200 (CEST)
Subject: [Python-checkins] r82412 - in tracker/instances/python-dev/html:
	issue.item.html issue.item.js
Message-ID: <20100630235807.73769EEA48@mail.python.org>

Author: ezio.melotti
Date: Thu Jul  1 01:58:07 2010
New Revision: 82412

Log:
Avoid using display:block -- the resize works with display:inline too. Also close the span properly in issue.item.html.

Modified:
   tracker/instances/python-dev/html/issue.item.html
   tracker/instances/python-dev/html/issue.item.js

Modified: tracker/instances/python-dev/html/issue.item.html
==============================================================================
--- tracker/instances/python-dev/html/issue.item.html	(original)
+++ tracker/instances/python-dev/html/issue.item.html	Thu Jul  1 01:58:07 2010
@@ -145,7 +145,7 @@
         tal:define="current_user request/user/username"
         tal:condition="python:request.user.username != 'anonymous' and current_user not in str(context.nosy).replace(' ','').split(',')"
         tal:attributes="onclick string:add_to_nosy('$current_user')"
-        onclick="add_to_nosy(the_current_username)" />
+        onclick="add_to_nosy(the_current_username)"></span>
  </td>
 </tr>
 <tr>

Modified: tracker/instances/python-dev/html/issue.item.js
==============================================================================
--- tracker/instances/python-dev/html/issue.item.js	(original)
+++ tracker/instances/python-dev/html/issue.item.js	Thu Jul  1 01:58:07 2010
@@ -38,6 +38,6 @@
     // hide the button and resize the list to fill the void
     var new_width = nosy.offsetWidth + add_me_button.offsetWidth;
     add_me_button.style.display = 'none';
-    nosy.style.display = 'block';
+    nosy.style.display = 'inline';
     nosy.style.width = new_width + "px";
 }

From python-checkins at python.org  Thu Jul  1 09:32:02 2010
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  1 Jul 2010 09:32:02 +0200 (CEST)
Subject: [Python-checkins] r82413 - in python/branches/py3k:
	Lib/test/test_codeccallbacks.py Lib/test/test_unicode.py
	Misc/NEWS Objects/unicodeobject.c
Message-ID: <20100701073202.76D7CEEAEF@mail.python.org>

Author: ezio.melotti
Date: Thu Jul  1 09:32:02 2010
New Revision: 82413

Log:
Update PyUnicode_DecodeUTF8 from RFC 2279 to RFC 3629.

1) #8271: when a byte sequence is invalid, only the start byte and all the
   valid continuation bytes are now replaced by U+FFFD, instead of replacing
   the number of bytes specified by the start byte.
   See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf (pages 94-95);
2) 5- and 6-bytes-long UTF-8 sequences are now considered invalid (no changes
   in behavior);
3) Change the error messages "unexpected code byte" to "invalid start byte"
   and "invalid data" to "invalid continuation byte";
4) Add an extensive set of tests in test_unicode;
5) Fix test_codeccallbacks because it was failing after this change.


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_codeccallbacks.py
   python/branches/py3k/Lib/test/test_unicode.py
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Objects/unicodeobject.c

Modified: python/branches/py3k/Lib/test/test_codeccallbacks.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codeccallbacks.py	(original)
+++ python/branches/py3k/Lib/test/test_codeccallbacks.py	Thu Jul  1 09:32:02 2010
@@ -153,28 +153,30 @@
             sout += bytes("\\U%08x" % sys.maxunicode, "ascii")
         self.assertEqual(sin.encode("iso-8859-15", "backslashreplace"), sout)
 
-    def test_decoderelaxedutf8(self):
-        # This is the test for a decoding callback handler,
-        # that relaxes the UTF-8 minimal encoding restriction.
-        # A null byte that is encoded as "\xc0\x80" will be
-        # decoded as a null byte. All other illegal sequences
-        # will be handled strictly.
+    def test_decoding_callbacks(self):
+        # This is a test for a decoding callback handler
+        # that allows the decoding of the invalid sequence
+        # "\xc0\x80" and returns "\x00" instead of raising an error.
+        # All other illegal sequences will be handled strictly.
         def relaxedutf8(exc):
             if not isinstance(exc, UnicodeDecodeError):
                 raise TypeError("don't know how to handle %r" % exc)
-            if exc.object[exc.start:exc.end].startswith(b"\xc0\x80"):
+            if exc.object[exc.start:exc.start+2] == b"\xc0\x80":
                 return ("\x00", exc.start+2) # retry after two bytes
             else:
                 raise exc
 
-        codecs.register_error(
-            "test.relaxedutf8", relaxedutf8)
+        codecs.register_error("test.relaxedutf8", relaxedutf8)
 
+        # all the "\xc0\x80" will be decoded to "\x00"
         sin = b"a\x00b\xc0\x80c\xc3\xbc\xc0\x80\xc0\x80"
         sout = "a\x00b\x00c\xfc\x00\x00"
         self.assertEqual(sin.decode("utf-8", "test.relaxedutf8"), sout)
+
+        # "\xc0\x81" is not valid and a UnicodeDecodeError will be raised
         sin = b"\xc0\x80\xc0\x81"
-        self.assertRaises(UnicodeError, sin.decode, "utf-8", "test.relaxedutf8")
+        self.assertRaises(UnicodeDecodeError, sin.decode,
+                          "utf-8", "test.relaxedutf8")
 
     def test_charmapencode(self):
         # For charmap encodings the replacement string will be

Modified: python/branches/py3k/Lib/test/test_unicode.py
==============================================================================
--- python/branches/py3k/Lib/test/test_unicode.py	(original)
+++ python/branches/py3k/Lib/test/test_unicode.py	Thu Jul  1 09:32:02 2010
@@ -942,6 +942,159 @@
         # * strict decoding testing for all of the
         #   UTF8_ERROR cases in PyUnicode_DecodeUTF8
 
+    def test_utf8_decode_valid_sequences(self):
+        sequences = [
+            # single byte
+            (b'\x00', '\x00'), (b'a', 'a'), (b'\x7f', '\x7f'),
+            # 2 bytes
+            (b'\xc2\x80', '\x80'), (b'\xdf\xbf', '\u07ff'),
+            # 3 bytes
+            (b'\xe0\xa0\x80', '\u0800'), (b'\xed\x9f\xbf', '\ud7ff'),
+            (b'\xee\x80\x80', '\uE000'), (b'\xef\xbf\xbf', '\uffff'),
+            # 4 bytes
+            (b'\xF0\x90\x80\x80', '\U00010000'),
+            (b'\xf4\x8f\xbf\xbf', '\U0010FFFF')
+        ]
+        for seq, res in sequences:
+            self.assertEqual(seq.decode('utf-8'), res)
+
+
+    def test_utf8_decode_invalid_sequences(self):
+        # continuation bytes in a sequence of 2, 3, or 4 bytes
+        continuation_bytes = [bytes([x]) for x in range(0x80, 0xC0)]
+        # start bytes of a 2-byte sequence equivalent to codepoints < 0x7F
+        invalid_2B_seq_start_bytes = [bytes([x]) for x in range(0xC0, 0xC2)]
+        # start bytes of a 4-byte sequence equivalent to codepoints > 0x10FFFF
+        invalid_4B_seq_start_bytes = [bytes([x]) for x in range(0xF5, 0xF8)]
+        invalid_start_bytes = (
+            continuation_bytes + invalid_2B_seq_start_bytes +
+            invalid_4B_seq_start_bytes + [bytes([x]) for x in range(0xF7, 0x100)]
+        )
+
+        for byte in invalid_start_bytes:
+            self.assertRaises(UnicodeDecodeError, byte.decode, 'utf-8')
+
+        for sb in invalid_2B_seq_start_bytes:
+            for cb in continuation_bytes:
+                self.assertRaises(UnicodeDecodeError, (sb+cb).decode, 'utf-8')
+
+        for sb in invalid_4B_seq_start_bytes:
+            for cb1 in continuation_bytes[:3]:
+                for cb3 in continuation_bytes[:3]:
+                    self.assertRaises(UnicodeDecodeError,
+                                      (sb+cb1+b'\x80'+cb3).decode, 'utf-8')
+
+        for cb in [bytes([x]) for x in range(0x80, 0xA0)]:
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xE0'+cb+b'\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xE0'+cb+b'\xBF').decode, 'utf-8')
+        # surrogates
+        for cb in [bytes([x]) for x in range(0xA0, 0xC0)]:
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xED'+cb+b'\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xED'+cb+b'\xBF').decode, 'utf-8')
+        for cb in [bytes([x]) for x in range(0x80, 0x90)]:
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xF0'+cb+b'\x80\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xF0'+cb+b'\xBF\xBF').decode, 'utf-8')
+        for cb in [bytes([x]) for x in range(0x90, 0xC0)]:
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xF4'+cb+b'\x80\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xF4'+cb+b'\xBF\xBF').decode, 'utf-8')
+
+    def test_issue8271(self):
+        # Issue #8271: during the decoding of an invalid UTF-8 byte sequence,
+        # only the start byte and the continuation byte(s) are now considered
+        # invalid, instead of the number of bytes specified by the start byte.
+        # See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf (page 95,
+        # table 3-8, Row 2) for more information about the algorithm used.
+        FFFD = '\ufffd'
+        sequences = [
+            # invalid start bytes
+            (b'\x80', FFFD), # continuation byte
+            (b'\x80\x80', FFFD*2), # 2 continuation bytes
+            (b'\xc0', FFFD),
+            (b'\xc0\xc0', FFFD*2),
+            (b'\xc1', FFFD),
+            (b'\xc1\xc0', FFFD*2),
+            (b'\xc0\xc1', FFFD*2),
+            # with start byte of a 2-byte sequence
+            (b'\xc2', FFFD), # only the start byte
+            (b'\xc2\xc2', FFFD*2), # 2 start bytes
+            (b'\xc2\xc2\xc2', FFFD*3), # 2 start bytes
+            (b'\xc2\x41', FFFD+'A'), # invalid continuation byte
+            # with start byte of a 3-byte sequence
+            (b'\xe1', FFFD), # only the start byte
+            (b'\xe1\xe1', FFFD*2), # 2 start bytes
+            (b'\xe1\xe1\xe1', FFFD*3), # 3 start bytes
+            (b'\xe1\xe1\xe1\xe1', FFFD*4), # 4 start bytes
+            (b'\xe1\x80', FFFD), # only 1 continuation byte
+            (b'\xe1\x41', FFFD+'A'), # invalid continuation byte
+            (b'\xe1\x41\x80', FFFD+'A'+FFFD), # invalid cb followed by valid cb
+            (b'\xe1\x41\x41', FFFD+'AA'), # 2 invalid continuation bytes
+            (b'\xe1\x80\x41', FFFD+'A'), # only 1 valid continuation byte
+            (b'\xe1\x80\xe1\x41', FFFD*2+'A'), # 1 valid and the other invalid
+            (b'\xe1\x41\xe1\x80', FFFD+'A'+FFFD), # 1 invalid and the other valid
+            # with start byte of a 4-byte sequence
+            (b'\xf1', FFFD), # only the start byte
+            (b'\xf1\xf1', FFFD*2), # 2 start bytes
+            (b'\xf1\xf1\xf1', FFFD*3), # 3 start bytes
+            (b'\xf1\xf1\xf1\xf1', FFFD*4), # 4 start bytes
+            (b'\xf1\xf1\xf1\xf1\xf1', FFFD*5), # 5 start bytes
+            (b'\xf1\x80', FFFD), # only 1 continuation bytes
+            (b'\xf1\x80\x80', FFFD), # only 2 continuation bytes
+            (b'\xf1\x80\x41', FFFD+'A'), # 1 valid cb and 1 invalid
+            (b'\xf1\x80\x41\x41', FFFD+'AA'), # 1 valid cb and 1 invalid
+            (b'\xf1\x80\x80\x41', FFFD+'A'), # 2 valid cb and 1 invalid
+            (b'\xf1\x41\x80', FFFD+'A'+FFFD), # 1 invalid cv and 1 valid
+            (b'\xf1\x41\x80\x80', FFFD+'A'+FFFD*2), # 1 invalid cb and 2 invalid
+            (b'\xf1\x41\x80\x41', FFFD+'A'+FFFD+'A'), # 2 invalid cb and 1 invalid
+            (b'\xf1\x41\x41\x80', FFFD+'AA'+FFFD), # 1 valid cb and 1 invalid
+            (b'\xf1\x41\xf1\x80', FFFD+'A'+FFFD),
+            (b'\xf1\x41\x80\xf1', FFFD+'A'+FFFD*2),
+            (b'\xf1\xf1\x80\x41', FFFD*2+'A'),
+            (b'\xf1\x41\xf1\xf1', FFFD+'A'+FFFD*2),
+            # with invalid start byte of a 4-byte sequence (rfc2279)
+            (b'\xf5', FFFD), # only the start byte
+            (b'\xf5\xf5', FFFD*2), # 2 start bytes
+            (b'\xf5\x80', FFFD*2), # only 1 continuation byte
+            (b'\xf5\x80\x80', FFFD*3), # only 2 continuation byte
+            (b'\xf5\x80\x80\x80', FFFD*4), # 3 continuation bytes
+            (b'\xf5\x80\x41', FFFD*2+'A'), #  1 valid cb and 1 invalid
+            (b'\xf5\x80\x41\xf5', FFFD*2+'A'+FFFD),
+            (b'\xf5\x41\x80\x80\x41', FFFD+'A'+FFFD*2+'A'),
+            # with invalid start byte of a 5-byte sequence (rfc2279)
+            (b'\xf8', FFFD), # only the start byte
+            (b'\xf8\xf8', FFFD*2), # 2 start bytes
+            (b'\xf8\x80', FFFD*2), # only one continuation byte
+            (b'\xf8\x80\x41', FFFD*2 + 'A'), # 1 valid cb and 1 invalid
+            (b'\xf8\x80\x80\x80\x80', FFFD*5), # invalid 5 bytes seq with 5 bytes
+            # with invalid start byte of a 6-byte sequence (rfc2279)
+            (b'\xfc', FFFD), # only the start byte
+            (b'\xfc\xfc', FFFD*2), # 2 start bytes
+            (b'\xfc\x80\x80', FFFD*3), # only 2 continuation bytes
+            (b'\xfc\x80\x80\x80\x80\x80', FFFD*6), # 6 continuation bytes
+            # invalid start byte
+            (b'\xfe', FFFD),
+            (b'\xfe\x80\x80', FFFD*3),
+            # other sequences
+            (b'\xf1\x80\x41\x42\x43', '\ufffd\x41\x42\x43'),
+            (b'\xf1\x80\xff\x42\x43', '\ufffd\ufffd\x42\x43'),
+            (b'\xf1\x80\xc2\x81\x43', '\ufffd\x81\x43'),
+            (b'\x61\xF1\x80\x80\xE1\x80\xC2\x62\x80\x63\x80\xBF\x64',
+             '\x61\uFFFD\uFFFD\uFFFD\x62\uFFFD\x63\uFFFD\uFFFD\x64'),
+        ]
+        for n, (seq, res) in enumerate(sequences):
+            self.assertRaises(UnicodeDecodeError, seq.decode, 'utf-8', 'strict')
+            self.assertEqual(seq.decode('utf-8', 'replace'), res)
+            self.assertEqual((seq+b'b').decode('utf-8', 'replace'), res+'b')
+            self.assertEqual(seq.decode('utf-8', 'ignore'),
+                             res.replace('\uFFFD', ''))
+
     def test_codecs_idna(self):
         # Test whether trailing dot is preserved
         self.assertEqual("www.python.org.".encode("idna"), b"www.python.org.")

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Jul  1 09:32:02 2010
@@ -12,6 +12,14 @@
 Core and Builtins
 -----------------
 
+- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the
+  start byte and the continuation byte(s) are now considered invalid, instead
+  of the number of bytes specified by the start byte.
+  E.g.: '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and
+  replaces with U+FFFD only the start byte ('\xf1') and the continuation byte
+  ('\x80') even if '\xf1' is the start byte of a 4-bytes sequence.
+  Previous versions returned a single u'\ufffd'.
+
 - Issue #9011: A negated imaginary literal (e.g., "-7j") now has real
   part -0.0 rather than 0.0.  So "-7j" is now exactly equivalent to
   "-(7j)".

Modified: python/branches/py3k/Objects/unicodeobject.c
==============================================================================
--- python/branches/py3k/Objects/unicodeobject.c	(original)
+++ python/branches/py3k/Objects/unicodeobject.c	Thu Jul  1 09:32:02 2010
@@ -2285,24 +2285,24 @@
 
 static
 char utf8_code_length[256] = {
-    /* Map UTF-8 encoded prefix byte to sequence length.  zero means
-       illegal prefix.  see RFC 2279 for details */
+    /* Map UTF-8 encoded prefix byte to sequence length.  Zero means
+       illegal prefix.  See RFC 3629 for details */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 00-0F */
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 70-7F */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80-8F */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* B0-BF */
+    0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* C0-C1 + C2-CF */
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* D0-DF */
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* E0-EF */
+    4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0  /* F0-F4 + F5-FF */
 };
 
 PyObject *PyUnicode_DecodeUTF8(const char *s,
@@ -2332,6 +2332,7 @@
 {
     const char *starts = s;
     int n;
+    int k;
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
     Py_ssize_t outpos;
@@ -2415,7 +2416,9 @@
             else {
                 errmsg = "unexpected end of data";
                 startinpos = s-starts;
-                endinpos = size;
+                endinpos = startinpos+1;
+                for (k=1; (k < size-startinpos) && ((s[k]&0xC0) == 0x80); k++)
+                    endinpos++;
                 goto utf8Error;
             }
         }
@@ -2423,7 +2426,7 @@
         switch (n) {
 
         case 0:
-            errmsg = "unexpected code byte";
+            errmsg = "invalid start byte";
             startinpos = s-starts;
             endinpos = startinpos+1;
             goto utf8Error;
@@ -2436,63 +2439,67 @@
 
         case 2:
             if ((s[1] & 0xc0) != 0x80) {
-                errmsg = "invalid data";
+                errmsg = "invalid continuation byte";
                 startinpos = s-starts;
-                endinpos = startinpos+2;
+                endinpos = startinpos + 1;
                 goto utf8Error;
             }
             ch = ((s[0] & 0x1f) << 6) + (s[1] & 0x3f);
-            if (ch < 0x80) {
-                startinpos = s-starts;
-                endinpos = startinpos+2;
-                errmsg = "illegal encoding";
-                goto utf8Error;
-            }
-            else
-                *p++ = (Py_UNICODE)ch;
+            assert ((ch > 0x007F) && (ch <= 0x07FF));
+            *p++ = (Py_UNICODE)ch;
             break;
 
         case 3:
+            /* XXX: surrogates shouldn't be valid UTF-8!
+               see http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf
+               (table 3-7) and http://www.rfc-editor.org/rfc/rfc3629.txt
+               Uncomment the 2 lines below to make them invalid,
+               codepoints: d800-dfff; UTF-8: \xed\xa0\x80-\xed\xbf\xbf. */
             if ((s[1] & 0xc0) != 0x80 ||
-                (s[2] & 0xc0) != 0x80) {
-                errmsg = "invalid data";
+                (s[2] & 0xc0) != 0x80 ||
+                ((unsigned char)s[0] == 0xE0 &&
+                 (unsigned char)s[1] < 0xA0) ||
+                ((unsigned char)s[0] == 0xED &&
+                 (unsigned char)s[1] > 0x9F)) {
+                errmsg = "invalid continuation byte";
                 startinpos = s-starts;
-                endinpos = startinpos+3;
+                endinpos = startinpos + 1;
+
+                /* if s[1] first two bits are 1 and 0, then the invalid
+                   continuation byte is s[2], so increment endinpos by 1,
+                   if not, s[1] is invalid and endinpos doesn't need to
+                   be incremented. */
+                if ((s[1] & 0xC0) == 0x80)
+                    endinpos++;
                 goto utf8Error;
             }
             ch = ((s[0] & 0x0f) << 12) + ((s[1] & 0x3f) << 6) + (s[2] & 0x3f);
-            if (ch < 0x0800 || (ch >= 0xd800 && ch <= 0xDFFF)) {
-                errmsg = "illegal encoding";
-                startinpos = s-starts;
-                endinpos = startinpos+3;
-                goto utf8Error;
-            }
-            else
-                *p++ = (Py_UNICODE)ch;
+            assert ((ch > 0x07FF) && (ch <= 0xFFFF));
+            *p++ = (Py_UNICODE)ch;
             break;
 
         case 4:
             if ((s[1] & 0xc0) != 0x80 ||
                 (s[2] & 0xc0) != 0x80 ||
-                (s[3] & 0xc0) != 0x80) {
-                errmsg = "invalid data";
+                (s[3] & 0xc0) != 0x80 ||
+                ((unsigned char)s[0] == 0xF0 &&
+                 (unsigned char)s[1] < 0x90) ||
+                ((unsigned char)s[0] == 0xF4 &&
+                 (unsigned char)s[1] > 0x8F)) {
+                errmsg = "invalid continuation byte";
                 startinpos = s-starts;
-                endinpos = startinpos+4;
+                endinpos = startinpos + 1;
+                if ((s[1] & 0xC0) == 0x80) {
+                    endinpos++;
+                    if ((s[2] & 0xC0) == 0x80)
+                        endinpos++;
+                }
                 goto utf8Error;
             }
             ch = ((s[0] & 0x7) << 18) + ((s[1] & 0x3f) << 12) +
-                ((s[2] & 0x3f) << 6) + (s[3] & 0x3f);
-            /* validate and convert to UTF-16 */
-            if ((ch < 0x10000)        /* minimum value allowed for 4
-                                         byte encoding */
-                || (ch > 0x10ffff))   /* maximum value allowed for
-                                         UTF-16 */
-            {
-                errmsg = "illegal encoding";
-                startinpos = s-starts;
-                endinpos = startinpos+4;
-                goto utf8Error;
-            }
+                 ((s[2] & 0x3f) << 6) + (s[3] & 0x3f);
+            assert ((ch > 0xFFFF) && (ch <= 0x10ffff));
+
 #ifdef Py_UNICODE_WIDE
             *p++ = (Py_UNICODE)ch;
 #else
@@ -2508,13 +2515,6 @@
             *p++ = (Py_UNICODE)(0xDC00 + (ch & 0x03FF));
 #endif
             break;
-
-        default:
-            /* Other sizes are only needed for UCS-4 */
-            errmsg = "unsupported Unicode code range";
-            startinpos = s-starts;
-            endinpos = startinpos+n;
-            goto utf8Error;
         }
         s += n;
         continue;

From python-checkins at python.org  Thu Jul  1 17:07:15 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Jul 2010 17:07:15 +0200 (CEST)
Subject: [Python-checkins] r82415 - python/trunk/Doc/library/math.rst
Message-ID: <20100701150715.51429F6915@mail.python.org>

Author: benjamin.peterson
Date: Thu Jul  1 17:07:15 2010
New Revision: 82415

Log:
remove docs about delegating to special methods; it does no such thing

Modified:
   python/trunk/Doc/library/math.rst

Modified: python/trunk/Doc/library/math.rst
==============================================================================
--- python/trunk/Doc/library/math.rst	(original)
+++ python/trunk/Doc/library/math.rst	Thu Jul  1 17:07:15 2010
@@ -57,9 +57,6 @@
    Return the floor of *x* as a float, the largest integer value less than or equal
    to *x*.
 
-   .. versionchanged:: 2.6
-      Added :meth:`__floor__` delegation.
-
 
 .. function:: fmod(x, y)
 
@@ -137,7 +134,7 @@
 .. function:: trunc(x)
 
    Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually
-   a long integer). Delegates to ``x.__trunc__()``.
+   a long integer).
 
    .. versionadded:: 2.6
 

From python-checkins at python.org  Thu Jul  1 17:09:15 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Jul 2010 17:09:15 +0200 (CEST)
Subject: [Python-checkins] r82416 - python/branches/py3k
Message-ID: <20100701150915.09235EEB64@mail.python.org>

Author: benjamin.peterson
Date: Thu Jul  1 17:09:14 2010
New Revision: 82416

Log:
Blocked revisions 82415 via svnmerge

........
  r82415 | benjamin.peterson | 2010-07-01 10:07:15 -0500 (Thu, 01 Jul 2010) | 1 line
  
  remove docs about delegating to special methods; it does no such thing
........


Modified:
   python/branches/py3k/   (props changed)

From python-checkins at python.org  Thu Jul  1 17:16:55 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Jul 2010 17:16:55 +0200 (CEST)
Subject: [Python-checkins] r82417 - in python/branches/py3k:
	Lib/test/test_descr.py Misc/NEWS Modules/mathmodule.c
Message-ID: <20100701151655.6E378EEBB1@mail.python.org>

Author: benjamin.peterson
Date: Thu Jul  1 17:16:55 2010
New Revision: 82417

Log:
correctly lookup __trunc__ and __floor__

Modified:
   python/branches/py3k/Lib/test/test_descr.py
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/mathmodule.c

Modified: python/branches/py3k/Lib/test/test_descr.py
==============================================================================
--- python/branches/py3k/Lib/test/test_descr.py	(original)
+++ python/branches/py3k/Lib/test/test_descr.py	Thu Jul  1 17:16:55 2010
@@ -1,6 +1,7 @@
 import builtins
 import sys
 import types
+import math
 import unittest
 
 from copy import deepcopy
@@ -1578,6 +1579,8 @@
             ("__exit__", run_context, swallow, set(), {"__enter__" : iden}),
             ("__complex__", complex, complex_num, set(), {}),
             ("__format__", format, format_impl, set(), {}),
+            ("__floor__", math.floor, zero, set(), {}),
+            ("__trunc__", math.trunc, zero, set(), {}),
             ]
 
         class Checker(object):

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Jul  1 17:16:55 2010
@@ -1374,6 +1374,9 @@
 Extension Modules
 -----------------
 
+- In the math module, correctly lookup __trunc__ and __floor__ as special
+  methods.
+
 - Issue #9005: Prevent utctimetuple() from producing year 0 or year
   10,000.  Prior to this change, timezone adjustment in utctimetuple()
   could produce tm_year value of 0 or 10,000.  Now an OverflowError is

Modified: python/branches/py3k/Modules/mathmodule.c
==============================================================================
--- python/branches/py3k/Modules/mathmodule.c	(original)
+++ python/branches/py3k/Modules/mathmodule.c	Thu Jul  1 17:16:55 2010
@@ -883,17 +883,13 @@
     static PyObject *floor_str = NULL;
     PyObject *method;
 
-    if (floor_str == NULL) {
-        floor_str = PyUnicode_InternFromString("__floor__");
-        if (floor_str == NULL)
+    method = _PyObject_LookupSpecial(number, "__floor__", &floor_str);
+    if (method == NULL) {
+        if (PyErr_Occurred())
             return NULL;
-    }
-
-    method = _PyType_Lookup(Py_TYPE(number), floor_str);
-    if (method == NULL)
         return math_1_to_int(number, floor, 0);
-    else
-        return PyObject_CallFunction(method, "O", number);
+    }
+    return PyObject_CallFunctionObjArgs(method, NULL);
 }
 
 PyDoc_STRVAR(math_floor_doc,
@@ -1427,20 +1423,15 @@
             return NULL;
     }
 
-    if (trunc_str == NULL) {
-        trunc_str = PyUnicode_InternFromString("__trunc__");
-        if (trunc_str == NULL)
-            return NULL;
-    }
-
-    trunc = _PyType_Lookup(Py_TYPE(number), trunc_str);
+    trunc = _PyObject_LookupSpecial(number, "__trunc__", &trunc_str);
     if (trunc == NULL) {
-        PyErr_Format(PyExc_TypeError,
-                     "type %.100s doesn't define __trunc__ method",
-                     Py_TYPE(number)->tp_name);
+        if (!PyErr_Occurred())
+            PyErr_Format(PyExc_TypeError,
+                         "type %.100s doesn't define __trunc__ method",
+                         Py_TYPE(number)->tp_name);
         return NULL;
     }
-    return PyObject_CallFunctionObjArgs(trunc, number, NULL);
+    return PyObject_CallFunctionObjArgs(trunc, NULL);
 }
 
 PyDoc_STRVAR(math_trunc_doc,

From python-checkins at python.org  Thu Jul  1 18:16:24 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Jul 2010 18:16:24 +0200 (CEST)
Subject: [Python-checkins] r82418 - in python/branches/release26-maint:
	Doc/library/math.rst
Message-ID: <20100701161624.EE662F692F@mail.python.org>

Author: benjamin.peterson
Date: Thu Jul  1 18:16:24 2010
New Revision: 82418

Log:
Merged revisions 82415 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82415 | benjamin.peterson | 2010-07-01 10:07:15 -0500 (Thu, 01 Jul 2010) | 1 line
  
  remove docs about delegating to special methods; it does no such thing
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/math.rst

Modified: python/branches/release26-maint/Doc/library/math.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/math.rst	(original)
+++ python/branches/release26-maint/Doc/library/math.rst	Thu Jul  1 18:16:24 2010
@@ -57,9 +57,6 @@
    Return the floor of *x* as a float, the largest integer value less than or equal
    to *x*.
 
-   .. versionchanged:: 2.6
-      Added :meth:`__floor__` delegation.
-
 
 .. function:: fmod(x, y)
 
@@ -137,7 +134,7 @@
 .. function:: trunc(x)
 
    Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually
-   a long integer). Delegates to ``x.__trunc__()``.
+   a long integer).
 
    .. versionadded:: 2.6
 

From python-checkins at python.org  Thu Jul  1 18:16:35 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Thu,  1 Jul 2010 18:16:35 +0200 (CEST)
Subject: [Python-checkins] r82419 - in sandbox/branches/py3k-datetime:
	datetime.py test_datetime.py
Message-ID: <20100701161635.88A6CEED3A@mail.python.org>

Author: alexander.belopolsky
Date: Thu Jul  1 18:16:35 2010
New Revision: 82419

Log:
Fixed pickling to pass a more rigid test suit.

Modified:
   sandbox/branches/py3k-datetime/datetime.py
   sandbox/branches/py3k-datetime/test_datetime.py

Modified: sandbox/branches/py3k-datetime/datetime.py
==============================================================================
--- sandbox/branches/py3k-datetime/datetime.py	(original)
+++ sandbox/branches/py3k-datetime/datetime.py	Thu Jul  1 18:16:35 2010
@@ -269,6 +269,8 @@
     raise ValueError("%s()=%d, must be in -1439..1439" % (name, offset))
 
 def _check_date_fields(year, month, day):
+    if not isinstance(year, int):
+        raise TypeError('int expected')
     if not MINYEAR <= year <= MAXYEAR:
         raise ValueError('year must be in %d..%d' % (MINYEAR, MAXYEAR), year)
     if not 1 <= month <= 12:
@@ -278,6 +280,8 @@
         raise ValueError('day must be in 1..%d' % dim, day)
 
 def _check_time_fields(hour, minute, second, microsecond):
+    if not isinstance(hour, int):
+        raise TypeError('int expected')
     if not 0 <= hour <= 23:
         raise ValueError('hour must be in 0..23', hour)
     if not 0 <= minute <= 59:
@@ -660,7 +664,7 @@
 
         year, month, day (required, base 1)
         """
-        if isinstance(year, bytes):
+        if isinstance(year, bytes) and len(year) == 4:
             # Pickle support
             self = object.__new__(cls)
             self.__setstate(year)
@@ -1008,7 +1012,7 @@
         tzinfo (default to None)
         """
         self = object.__new__(cls)
-        if isinstance(hour, str):
+        if isinstance(hour, bytes) and len(hour) == 6:
             # Pickle support
             self.__setstate(hour, minute or None)
             return self
@@ -1256,18 +1260,18 @@
     def __getstate(self):
         us2, us3 = divmod(self.__microsecond, 256)
         us1, us2 = divmod(us2, 256)
-        basestate = ("%c" * 6) % (self.__hour, self.__minute, self.__second,
-                                  us1, us2, us3)
+        basestate = bytes([self.__hour, self.__minute, self.__second,
+                           us1, us2, us3])
         if self._tzinfo is None:
             return (basestate,)
         else:
             return (basestate, self._tzinfo)
 
     def __setstate(self, string, tzinfo):
-        if len(string) != 6 or ord(string[0]) >= 24:
+        if len(string) != 6 or string[0] >= 24:
             raise TypeError("an integer is required")
-        self.__hour, self.__minute, self.__second, us1, us2, us3 = \
-                                                            map(ord, string)
+        (self.__hour, self.__minute, self.__second,
+         us1, us2, us3) = string
         self.__microsecond = (((us1 << 8) | us2) << 8) | us3
         self._tzinfo = tzinfo
 
@@ -1287,7 +1291,7 @@
 
     def __new__(cls, year, month=None, day=None, hour=0, minute=0, second=0,
                 microsecond=0, tzinfo=None):
-        if isinstance(year, bytes):
+        if isinstance(year, bytes) and len(year) == 10:
             # Pickle support
             self = date.__new__(cls, year[:4])
             self.__setstate(year, month)

Modified: sandbox/branches/py3k-datetime/test_datetime.py
==============================================================================
--- sandbox/branches/py3k-datetime/test_datetime.py	(original)
+++ sandbox/branches/py3k-datetime/test_datetime.py	Thu Jul  1 18:16:35 2010
@@ -261,6 +261,33 @@
                              t.replace(tzinfo=tz).dst())
 
 #############################################################################
+# Base clase for testing pickling state of timedelta, time, date and
+# datetime instances.
+
+class ReduceStructure:
+    initargs = 1, 1, 1
+    statetype = (bytes, tzinfo)
+    def test_reduce(self):
+        obj = self.theclass(*self.initargs)
+        factory, state = obj.__reduce__()[:2]
+        self.assertIs(factory, self.theclass)
+        for v, t in zip(state, self.statetype):
+            self.assertIsInstance(v, t)
+
+    def test_construct_from_state(self):
+        obj = self.theclass(*self.initargs)
+        factory, state = obj.__reduce__()[:2]
+        initbytes = state[0]
+        # This test should be overriden in tests for classes that
+        # don't produce their state as bytes.  Curently, timedelta
+        # and timezone
+        assert isinstance(initbytes, bytes)
+        obj = factory(initbytes)
+        self.assertIs(type(obj), self.theclass)
+        self.assertRaises(TypeError, factory, initbytes[:-1]) 
+        self.assertRaises(TypeError, factory, initbytes + b'x') 
+
+#############################################################################
 # Base clase for testing a particular aspect of timedelta, time, date and
 # datetime comparisons.
 
@@ -297,10 +324,10 @@
 #############################################################################
 # timedelta tests
 
-class TestTimeDelta(HarmlessMixedComparison, unittest.TestCase):
+class TestTimeDelta(HarmlessMixedComparison, ReduceStructure, unittest.TestCase):
 
     theclass = timedelta
-
+    statetype = (int, int, int)
     def test_constructor(self):
         eq = self.assertEqual
         td = timedelta
@@ -326,6 +353,9 @@
         eq(td(seconds=0.001), td(milliseconds=1))
         eq(td(milliseconds=0.001), td(microseconds=1))
 
+    def test_construct_from_state(self):
+        pass
+
     def test_computations(self):
         eq = self.assertEqual
         td = timedelta
@@ -758,11 +788,12 @@
 class SubclassDate(date):
     sub_var = 1
 
-class TestDate(HarmlessMixedComparison, unittest.TestCase):
+class TestDate(HarmlessMixedComparison, ReduceStructure, unittest.TestCase):
     # Tests here should pass for both dates and datetimes, except for a
     # few tests that TestDateTime overrides.
 
     theclass = date
+    statetype = (bytes,)
 
     def test_basic_attributes(self):
         dt = self.theclass(2002, 3, 1)
@@ -1387,6 +1418,7 @@
 class TestDateTime(TestDate):
 
     theclass = datetime
+    statetype = (bytes, tzinfo)
 
     def test_basic_attributes(self):
         dt = self.theclass(2002, 3, 1, 12, 0)
@@ -1735,6 +1767,8 @@
         # than one microsecond smaller than an integer.
         self.assertEqual(self.theclass.fromtimestamp(0.9999999),
                          self.theclass.fromtimestamp(1))
+        self.assertEqual(self.theclass.utcfromtimestamp(0.9999999),
+                         self.theclass.utcfromtimestamp(1))
 
     def test_insane_fromtimestamp(self):
         # It's possible that some platform maps time_t to double,
@@ -1962,7 +1996,7 @@
 class SubclassTime(time):
     sub_var = 1
 
-class TestTime(HarmlessMixedComparison, unittest.TestCase):
+class TestTime(HarmlessMixedComparison, ReduceStructure, unittest.TestCase):
 
     theclass = time
 

From python-checkins at python.org  Thu Jul  1 19:45:52 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Jul 2010 19:45:52 +0200 (CEST)
Subject: [Python-checkins] r82420 - python/trunk/Doc/library/2to3.rst
Message-ID: <20100701174552.DC93FEEB23@mail.python.org>

Author: benjamin.peterson
Date: Thu Jul  1 19:45:52 2010
New Revision: 82420

Log:
fix fixer name

Modified:
   python/trunk/Doc/library/2to3.rst

Modified: python/trunk/Doc/library/2to3.rst
==============================================================================
--- python/trunk/Doc/library/2to3.rst	(original)
+++ python/trunk/Doc/library/2to3.rst	Thu Jul  1 19:45:52 2010
@@ -276,7 +276,7 @@
 
    Converts the :keyword:`print` statement to the :func:`print` function.
 
-.. 2to3fixer:: raises
+.. 2to3fixer:: raise
 
    Converts ``raise E, V`` to ``raise E(V)``, and ``raise E, V, T`` to ``raise
    E(V).with_traceback(T)``.  If ``E`` is a tuple, the translation will be

From python-checkins at python.org  Thu Jul  1 19:48:17 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Jul 2010 19:48:17 +0200 (CEST)
Subject: [Python-checkins] r82421 - in python/branches/release26-maint:
	Doc/library/2to3.rst
Message-ID: <20100701174817.2423AEE9F4@mail.python.org>

Author: benjamin.peterson
Date: Thu Jul  1 19:48:16 2010
New Revision: 82421

Log:
Merged revisions 82420 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82420 | benjamin.peterson | 2010-07-01 12:45:52 -0500 (Thu, 01 Jul 2010) | 1 line
  
  fix fixer name
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/2to3.rst

Modified: python/branches/release26-maint/Doc/library/2to3.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/2to3.rst	(original)
+++ python/branches/release26-maint/Doc/library/2to3.rst	Thu Jul  1 19:48:16 2010
@@ -276,7 +276,7 @@
 
    Converts the :keyword:`print` statement to the :func:`print` function.
 
-.. 2to3fixer:: raises
+.. 2to3fixer:: raise
 
    Converts ``raise E, V`` to ``raise E(V)``, and ``raise E, V, T`` to ``raise
    E(V).with_traceback(T)``.  If ``E`` is a tuple, the translation will be

From python-checkins at python.org  Thu Jul  1 19:49:01 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Jul 2010 19:49:01 +0200 (CEST)
Subject: [Python-checkins] r82422 - in python/branches/py3k:
	Doc/library/2to3.rst
Message-ID: <20100701174901.61836EEA84@mail.python.org>

Author: benjamin.peterson
Date: Thu Jul  1 19:49:01 2010
New Revision: 82422

Log:
Merged revisions 82420 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82420 | benjamin.peterson | 2010-07-01 12:45:52 -0500 (Thu, 01 Jul 2010) | 1 line
  
  fix fixer name
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/2to3.rst

Modified: python/branches/py3k/Doc/library/2to3.rst
==============================================================================
--- python/branches/py3k/Doc/library/2to3.rst	(original)
+++ python/branches/py3k/Doc/library/2to3.rst	Thu Jul  1 19:49:01 2010
@@ -276,7 +276,7 @@
 
    Converts the :keyword:`print` statement to the :func:`print` function.
 
-.. 2to3fixer:: raises
+.. 2to3fixer:: raise
 
    Converts ``raise E, V`` to ``raise E(V)``, and ``raise E, V, T`` to ``raise
    E(V).with_traceback(T)``.  If ``E`` is a tuple, the translation will be

From python-checkins at python.org  Thu Jul  1 19:51:42 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Jul 2010 19:51:42 +0200 (CEST)
Subject: [Python-checkins] r82423 - in python/branches/release31-maint:
	Doc/library/2to3.rst
Message-ID: <20100701175142.879D4EEA65@mail.python.org>

Author: benjamin.peterson
Date: Thu Jul  1 19:51:42 2010
New Revision: 82423

Log:
Merged revisions 82422 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/branches/py3k

................
  r82422 | benjamin.peterson | 2010-07-01 12:49:01 -0500 (Thu, 01 Jul 2010) | 9 lines
  
  Merged revisions 82420 via svnmerge from 
  svn+ssh://pythondev at svn.python.org/python/trunk
  
  ........
    r82420 | benjamin.peterson | 2010-07-01 12:45:52 -0500 (Thu, 01 Jul 2010) | 1 line
    
    fix fixer name
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/2to3.rst

Modified: python/branches/release31-maint/Doc/library/2to3.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/2to3.rst	(original)
+++ python/branches/release31-maint/Doc/library/2to3.rst	Thu Jul  1 19:51:42 2010
@@ -276,7 +276,7 @@
 
    Converts the :keyword:`print` statement to the :func:`print` function.
 
-.. 2to3fixer:: raises
+.. 2to3fixer:: raise
 
    Converts ``raise E, V`` to ``raise E(V)``, and ``raise E, V, T`` to ``raise
    E(V).with_traceback(T)``.  If ``E`` is a tuple, the translation will be

From python-checkins at python.org  Thu Jul  1 21:16:58 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Thu,  1 Jul 2010 21:16:58 +0200 (CEST)
Subject: [Python-checkins] r82424 -
	sandbox/branches/py3k-datetime/datetime.py
Message-ID: <20100701191658.3B67CEE9A4@mail.python.org>

Author: alexander.belopolsky
Date: Thu Jul  1 21:16:58 2010
New Revision: 82424

Log:
added __slots__ specifications

Modified:
   sandbox/branches/py3k-datetime/datetime.py

Modified: sandbox/branches/py3k-datetime/datetime.py
==============================================================================
--- sandbox/branches/py3k-datetime/datetime.py	(original)
+++ sandbox/branches/py3k-datetime/datetime.py	Thu Jul  1 21:16:58 2010
@@ -316,6 +316,7 @@
     Representation: (days, seconds, microseconds).  Why?  Because I
     felt like it.
     """
+    __slots__ = '__days', '__seconds', '__microseconds'
 
     def __new__(cls, days=0, seconds=0, microseconds=0,
                 # XXX The following should only be used as keyword args:
@@ -656,6 +657,7 @@
     Properties (readonly):
     year, month, day
     """
+    __slots__ = '__year', '__month', '__day'
 
     def __new__(cls, year, month=None, day=None):
         """Constructor.
@@ -916,7 +918,7 @@
 
     Subclasses must override the name(), utcoffset() and dst() methods.
     """
-
+    __slots__ = ()
     def tzname(self, dt):
         "datetime -> string name of time zone."
         raise NotImplementedError("tzinfo subclass must override tzname()")
@@ -1289,6 +1291,9 @@
     # XXX needs docstrings
     # See http://www.zope.org/Members/fdrake/DateTimeWiki/TimeZoneInfo
 
+    __slots__ = date.__slots__ + (
+        '__hour', '__minute', '__second',
+        '__microsecond', '_tzinfo')
     def __new__(cls, year, month=None, day=None, hour=0, minute=0, second=0,
                 microsecond=0, tzinfo=None):
         if isinstance(year, bytes) and len(year) == 10:
@@ -1765,6 +1770,8 @@
     return week1monday
 
 class timezone(tzinfo):
+    __slots__ = '__offset', '__name'
+
     def __init__(self, offset, *args):
         # Reproduce C behavior
         n = len(args)

From python-checkins at python.org  Thu Jul  1 22:10:47 2010
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  1 Jul 2010 22:10:47 +0200 (CEST)
Subject: [Python-checkins] r82425 - in tracker/instances/python-dev/html:
	issue.item.html issue.search.html page.html
Message-ID: <20100701201047.DA893EE98A@mail.python.org>

Author: ezio.melotti
Date: Thu Jul  1 22:10:47 2010
New Revision: 82425

Log:
#343: Remove the "(list)" for superseder and dependencies.

Modified:
   tracker/instances/python-dev/html/issue.item.html
   tracker/instances/python-dev/html/issue.search.html
   tracker/instances/python-dev/html/page.html

Modified: tracker/instances/python-dev/html/issue.item.html
==============================================================================
--- tracker/instances/python-dev/html/issue.item.html	(original)
+++ tracker/instances/python-dev/html/issue.item.html	Thu Jul  1 22:10:47 2010
@@ -93,8 +93,8 @@
 <tr tal:condition="context/id">
  <th>
   <tal:block i18n:translate="">Dependencies</tal:block>:
-  <span tal:condition="context/dependencies/is_edit_ok"
-        tal:replace="structure python:db.issue.classhelp('id,title,status', filter='status=0,1', property='dependencies')" />
+  <!-- <span tal:condition="context/dependencies/is_edit_ok"
+        tal:replace="structure python:db.issue.classhelp('id,title,status', filter='status=0,1', property='dependencies')" /> -->
  </th>
  <td>
   <span tal:replace="structure python:context.dependencies.field(showid=1,size=20)" />
@@ -104,8 +104,8 @@
  </td>
  <th i18n:translate="">
   <tal:block i18n:translate="">Superseder</tal:block>:
-  <span tal:condition="context/superseder/is_edit_ok"
-        tal:replace="structure python:db.issue.classhelp('id,title', filter='status=0,1', property='superseder')" />
+  <!-- <span tal:condition="context/superseder/is_edit_ok"
+        tal:replace="structure python:db.issue.classhelp('id,title', filter='status=0,1', property='superseder')" /> -->
  </th>
  <td>
   <span tal:replace="structure python:context.superseder.field(showid=1, size=20)" />

Modified: tracker/instances/python-dev/html/issue.search.html
==============================================================================
--- tracker/instances/python-dev/html/issue.search.html	(original)
+++ tracker/instances/python-dev/html/issue.search.html	Thu Jul  1 22:10:47 2010
@@ -42,6 +42,15 @@
   <td>&nbsp;</td>
 </tr>
 
+<tr tal:define="name string:ignore">
+  <th i18n:translate="">Ignore attachments:</th>
+  <td><input type="checkbox" checked="checked"
+             name="ignore" id="ignore" value="file:content"/></td>
+  <td>&nbsp;</td>
+  <td>&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+
 <tr tal:define="name string:title">
   <th i18n:translate="">Title:</th>
   <td metal:use-macro="search_input"></td>

Modified: tracker/instances/python-dev/html/page.html
==============================================================================
--- tracker/instances/python-dev/html/page.html	(original)
+++ tracker/instances/python-dev/html/page.html	Thu Jul  1 22:10:47 2010
@@ -42,6 +42,7 @@
        <input type="hidden" name="@sort" value="-activity" />
        <input type="hidden" name="@filter" value="status"/>
        <input type="hidden" name="@action" value="searchid"/>
+       <input type="hidden" name="ignore" value="file:content"/>
        <input class="input-text" id="search-text" name="@search_text" size="10" />
        <input type="submit" id="submit" value="search" name="submit"
               class="input-button"/>
@@ -145,7 +146,8 @@
      })"
        i18n:translate="">Show Having Patch</a></li>
         <li>
-         <a href="issue?@template=search&status=1" i18n:translate="">Search</a>
+         <a href="issue?@template=search&status=1&ignore=file:content"
+            i18n:translate="">Search</a>
         </li>
         <li>
          <form method="post" action="#">

From python-checkins at python.org  Thu Jul  1 22:16:23 2010
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  1 Jul 2010 22:16:23 +0200 (CEST)
Subject: [Python-checkins] r82426 - in tracker/instances/python-dev/html:
	issue.search.html page.html
Message-ID: <20100701201623.64B72EE98A@mail.python.org>

Author: ezio.melotti
Date: Thu Jul  1 22:16:23 2010
New Revision: 82426

Log:
Revert accidental changes in two files that were unrelated.

Modified:
   tracker/instances/python-dev/html/issue.search.html
   tracker/instances/python-dev/html/page.html

Modified: tracker/instances/python-dev/html/issue.search.html
==============================================================================
--- tracker/instances/python-dev/html/issue.search.html	(original)
+++ tracker/instances/python-dev/html/issue.search.html	Thu Jul  1 22:16:23 2010
@@ -42,15 +42,6 @@
   <td>&nbsp;</td>
 </tr>
 
-<tr tal:define="name string:ignore">
-  <th i18n:translate="">Ignore attachments:</th>
-  <td><input type="checkbox" checked="checked"
-             name="ignore" id="ignore" value="file:content"/></td>
-  <td>&nbsp;</td>
-  <td>&nbsp;</td>
-  <td>&nbsp;</td>
-</tr>
-
 <tr tal:define="name string:title">
   <th i18n:translate="">Title:</th>
   <td metal:use-macro="search_input"></td>

Modified: tracker/instances/python-dev/html/page.html
==============================================================================
--- tracker/instances/python-dev/html/page.html	(original)
+++ tracker/instances/python-dev/html/page.html	Thu Jul  1 22:16:23 2010
@@ -42,7 +42,6 @@
        <input type="hidden" name="@sort" value="-activity" />
        <input type="hidden" name="@filter" value="status"/>
        <input type="hidden" name="@action" value="searchid"/>
-       <input type="hidden" name="ignore" value="file:content"/>
        <input class="input-text" id="search-text" name="@search_text" size="10" />
        <input type="submit" id="submit" value="search" name="submit"
               class="input-button"/>
@@ -146,8 +145,7 @@
      })"
        i18n:translate="">Show Having Patch</a></li>
         <li>
-         <a href="issue?@template=search&status=1&ignore=file:content"
-            i18n:translate="">Search</a>
+         <a href="issue?@template=search&status=1" i18n:translate="">Search</a>
         </li>
         <li>
          <form method="post" action="#">

From python-checkins at python.org  Thu Jul  1 22:23:17 2010
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  1 Jul 2010 22:23:17 +0200 (CEST)
Subject: [Python-checkins] r82427 -
	tracker/instances/python-dev/html/issue.item.html
Message-ID: <20100701202317.8EDC5D2CC@mail.python.org>

Author: ezio.melotti
Date: Thu Jul  1 22:23:17 2010
New Revision: 82427

Log:
#251: Remove the nosy count from the issue page.

Modified:
   tracker/instances/python-dev/html/issue.item.html

Modified: tracker/instances/python-dev/html/issue.item.html
==============================================================================
--- tracker/instances/python-dev/html/issue.item.html	(original)
+++ tracker/instances/python-dev/html/issue.item.html	Thu Jul  1 22:23:17 2010
@@ -135,7 +135,7 @@
  <td tal:condition="not:context/assignee/is_edit_ok">
   <span tal:replace="structure context/assignee/plain" />
  </td>
- <th><tal:block i18n:translate="">Nosy List</tal:block><span tal:condition="context/nosy_count" tal:replace="python: ' (%d)' % context.nosy_count" />:
+ <th><tal:block i18n:translate="">Nosy List</tal:block><!-- <span tal:condition="context/nosy_count" tal:replace="python: ' (%d)' % context.nosy_count" /> -->:
   <span tal:condition="context/nosy/is_edit_ok"
         tal:replace="structure python:db.user.classhelp('username,realname,address', property='nosy')" />
  </th>

From python-checkins at python.org  Thu Jul  1 22:26:54 2010
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  1 Jul 2010 22:26:54 +0200 (CEST)
Subject: [Python-checkins] r82428 -
	tracker/instances/python-dev/html/issue.item.html
Message-ID: <20100701202654.A3D90EDB4@mail.python.org>

Author: ezio.melotti
Date: Thu Jul  1 22:26:54 2010
New Revision: 82428

Log:
Remove trailing whitespace and add a missing colon after "Keywords".

Modified:
   tracker/instances/python-dev/html/issue.item.html

Modified: tracker/instances/python-dev/html/issue.item.html
==============================================================================
--- tracker/instances/python-dev/html/issue.item.html	(original)
+++ tracker/instances/python-dev/html/issue.item.html	Thu Jul  1 22:26:54 2010
@@ -116,8 +116,8 @@
         tal:attributes="href string:issue${sup/id}; title sup/title;"></a> -->
    <br><span i18n:translate="">View</span>:
      <a tal:content="context/superseder/id"
-        tal:attributes="href string:issue${context/superseder/id}; title context/superseder/title;"></a> 
-  </span> 
+        tal:attributes="href string:issue${context/superseder/id}; title context/superseder/title;"></a>
+  </span>
  </td>
  </tr>
  <tr>
@@ -126,7 +126,7 @@
   <select name="assignee">
    <option value="-1">nobody</option>
    <tal:block tal:repeat="userdata python:db._db.user.filter_sql('select id,_username from _user where _roles like \'%Developer%\' order by _username')">
-    <option tal:attributes="value python:userdata[0]; 
+    <option tal:attributes="value python:userdata[0];
                             selected python:str(userdata[0]) == context.assignee._value"
             tal:content="python:userdata[1]"></option>
    </tal:block>
@@ -153,7 +153,7 @@
    <span tal:replace="structure python:db.priority.classhelp('id,name,description',label='Priority')" />:
  </th>
  <td tal:content="structure context/priority/menu">priority</td>
- <th tal:content="structure python:db.keyword.classhelp('id,name,description',label='Keywords')" />
+ <th tal:content="structure python:db.keyword.classhelp('id,name,description',label='Keywords:')" />
  <td tal:content="structure python:context['keywords'].menu(height=5)">keywords</td>
 
 
@@ -242,7 +242,7 @@
  <tal:block tal:repeat="msg python:context.messages.sorted('creation')">
   <tr>
     <th tal:define="mid string:msg${msg/id}">
-     <a tal:content="mid" tal:attributes="id mid; 
+     <a tal:content="mid" tal:attributes="id mid;
         href string:#$mid;"></a> - <a tal:attributes="href mid">(view)</a></th>
    <th i18n:translate="">Author: <tal:x replace="python:msg.author.realname.plain(unchecked=1)"
        i18n:name="author" /> (<tal:x replace="msg/author"/>)

From solipsis at pitrou.net  Fri Jul  2 01:24:57 2010
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri,  2 Jul 2010 01:24:57 +0200 (CEST)
Subject: [Python-checkins] Daily py3k reference leaks (r82422): sum=13614
Message-ID: <20100701232457.799371770A@ns6635.ovh.net>

py3k results for svn r82422 (hg cset 68d89477054a)
--------------------------------------------------

test_decimal leaked [4104, 4104, 4104] references, sum=12312
test_descr leaked [280, 280, 280] references, sum=840
test_fractions leaked [70, 70, 70] references, sum=210
test_math leaked [84, 84, 84] references, sum=252


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/refloggTsoEh', '-x']

From python-checkins at python.org  Fri Jul  2 01:35:37 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Fri,  2 Jul 2010 01:35:37 +0200 (CEST)
Subject: [Python-checkins] r82429 - python/trunk/Doc/library/math.rst
Message-ID: <20100701233537.89B7EC35B@mail.python.org>

Author: benjamin.peterson
Date: Fri Jul  2 01:35:37 2010
New Revision: 82429

Log:
trunc does use the special method, though

Modified:
   python/trunk/Doc/library/math.rst

Modified: python/trunk/Doc/library/math.rst
==============================================================================
--- python/trunk/Doc/library/math.rst	(original)
+++ python/trunk/Doc/library/math.rst	Fri Jul  2 01:35:37 2010
@@ -134,7 +134,7 @@
 .. function:: trunc(x)
 
    Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually
-   a long integer).
+   a long integer).  Uses the ``__trunc__`` method.
 
    .. versionadded:: 2.6
 

From python-checkins at python.org  Fri Jul  2 01:39:27 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Fri,  2 Jul 2010 01:39:27 +0200 (CEST)
Subject: [Python-checkins] r82430 - python/branches/py3k
Message-ID: <20100701233927.06334EE982@mail.python.org>

Author: benjamin.peterson
Date: Fri Jul  2 01:39:26 2010
New Revision: 82430

Log:
Blocked revisions 82429 via svnmerge

........
  r82429 | benjamin.peterson | 2010-07-01 18:35:37 -0500 (Thu, 01 Jul 2010) | 1 line
  
  trunc does use the special method, though
........


Modified:
   python/branches/py3k/   (props changed)

From python-checkins at python.org  Fri Jul  2 01:41:09 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Fri,  2 Jul 2010 01:41:09 +0200 (CEST)
Subject: [Python-checkins] r82431 - in python/branches/release26-maint:
	Doc/library/math.rst
Message-ID: <20100701234109.7F291EE988@mail.python.org>

Author: benjamin.peterson
Date: Fri Jul  2 01:41:09 2010
New Revision: 82431

Log:
Merged revisions 82429 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82429 | benjamin.peterson | 2010-07-01 18:35:37 -0500 (Thu, 01 Jul 2010) | 1 line
  
  trunc does use the special method, though
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/math.rst

Modified: python/branches/release26-maint/Doc/library/math.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/math.rst	(original)
+++ python/branches/release26-maint/Doc/library/math.rst	Fri Jul  2 01:41:09 2010
@@ -134,7 +134,7 @@
 .. function:: trunc(x)
 
    Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually
-   a long integer).
+   a long integer).  Uses the ``__trunc__`` method.
 
    .. versionadded:: 2.6
 

From python-checkins at python.org  Fri Jul  2 09:33:50 2010
From: python-checkins at python.org (georg.brandl)
Date: Fri,  2 Jul 2010 09:33:50 +0200 (CEST)
Subject: [Python-checkins] r82433 -
	python/trunk/Doc/library/simplehttpserver.rst
Message-ID: <20100702073350.3DEA7EE999@mail.python.org>

Author: georg.brandl
Date: Fri Jul  2 09:33:50 2010
New Revision: 82433

Log:
Grammar and markup fixes.

Modified:
   python/trunk/Doc/library/simplehttpserver.rst

Modified: python/trunk/Doc/library/simplehttpserver.rst
==============================================================================
--- python/trunk/Doc/library/simplehttpserver.rst	(original)
+++ python/trunk/Doc/library/simplehttpserver.rst	Fri Jul  2 09:33:50 2010
@@ -82,34 +82,35 @@
       ``text/`` the file is opened in text mode; otherwise binary mode is used.
 
       The :func:`test` function in the :mod:`SimpleHTTPServer` module is an
-      example which creates a server using the
-      :class:`SimpleHTTPRequestHandler` as the Handler.
+      example which creates a server using the :class:`SimpleHTTPRequestHandler`
+      as the Handler.
 
       .. versionadded:: 2.5
          The ``'Last-Modified'`` header.
 
 
-The :mod:`SimpleHTTPServer` module can be used the following manner in order to
-set up a very basic web server serving files relative to the current
-directory.::
+The :mod:`SimpleHTTPServer` module can be used in the following manner in order
+to set up a very basic web server serving files relative to the current
+directory. ::
 
-        import SimpleHTTPServer
-        import SocketServer
+   import SimpleHTTPServer
+   import SocketServer
 
-        PORT = 8000
+   PORT = 8000
 
-        Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
+   Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
 
-        httpd = SocketServer.TCPServer(("", PORT), Handler)
+   httpd = SocketServer.TCPServer(("", PORT), Handler)
 
-        print "serving at port", PORT
-        httpd.serve_forever()
+   print "serving at port", PORT
+   httpd.serve_forever()
 
-:mod:`SimpleHTTPServer` module can also be invoked directly using the ``-m``
-switch of interpreter with a ``port number`` argument. Similar to previous
-example, this serves the files relative to the current directory.::
+The :mod:`SimpleHTTPServer` module can also be invoked directly using the
+:cmdoption:`-m` switch of the interpreter with a ``port number`` argument.
+Similar to the previous example, this serves the files relative to the
+current directory. ::
 
-        python -m SimpleHTTPServer 8000
+   python -m SimpleHTTPServer 8000
 
 .. seealso::
 

From python-checkins at python.org  Fri Jul  2 09:41:51 2010
From: python-checkins at python.org (georg.brandl)
Date: Fri,  2 Jul 2010 09:41:51 +0200 (CEST)
Subject: [Python-checkins] r82434 - in python/branches/py3k:
	Doc/library/http.server.rst
Message-ID: <20100702074151.A97FFEE9BD@mail.python.org>

Author: georg.brandl
Date: Fri Jul  2 09:41:51 2010
New Revision: 82434

Log:
Merged revisions 82433 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82433 | georg.brandl | 2010-07-02 09:33:50 +0200 (Fr, 02 Jul 2010) | 1 line
  
  Grammar and markup fixes.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/http.server.rst

Modified: python/branches/py3k/Doc/library/http.server.rst
==============================================================================
--- python/branches/py3k/Doc/library/http.server.rst	(original)
+++ python/branches/py3k/Doc/library/http.server.rst	Fri Jul  2 09:41:51 2010
@@ -284,30 +284,30 @@
       For example usage, see the implementation of the :func:`test` function
       invocation in the :mod:`http.server` module.
 
-The :class:`SimpleHTTPRequestHandler` class can be invoked the following manner
-with the :mod:`http.server` to create a very basic webserver serving files
-relative to the current directory.::
 
-        import http.server
-        import socketserver
+The :class:`SimpleHTTPRequestHandler` class can be used in the following
+manner in order to create a very basic webserver serving files relative to
+the current directory. ::
 
-        PORT = 8000
+   import http.server
+   import socketserver
 
-        Handler = http.server.SimpleHTTPRequestHandler
+   PORT = 8000
 
-        httpd = socketserver.TCPServer(("", PORT), Handler)
+   Handler = http.server.SimpleHTTPRequestHandler
 
-        print("serving at port", PORT)
-        httpd.serve_forever()
+   httpd = socketserver.TCPServer(("", PORT), Handler)
 
-:mod:`http.server` can also be invoked directly using the ``-m`` switch of
-interpreter a with ``port number`` argument which uses
-:class:`SimpleHTTPRequestHandler` as the default request Handler. Similar to
-the previous example, even this serves files relative to the current
-directory.::
+   print("serving at port", PORT)
+   httpd.serve_forever()
+
+:mod:`http.server` can also be invoked directly using the :cmdoption:`-m`
+switch of the interpreter a with ``port number`` argument.  Similar to
+the previous example, this serves files relative to the current directory. ::
 
         python -m http.server 8000
 
+
 .. class:: CGIHTTPRequestHandler(request, client_address, server)
 
    This class is used to serve either files or output of CGI scripts from the

From python-checkins at python.org  Fri Jul  2 10:51:24 2010
From: python-checkins at python.org (georg.brandl)
Date: Fri,  2 Jul 2010 10:51:24 +0200 (CEST)
Subject: [Python-checkins] r82435 - peps/trunk/pep-0392.txt
Message-ID: <20100702085124.E122EEE9CD@mail.python.org>

Author: georg.brandl
Date: Fri Jul  2 10:51:24 2010
New Revision: 82435

Log:
New tentative schedule.

Modified:
   peps/trunk/pep-0392.txt

Modified: peps/trunk/pep-0392.txt
==============================================================================
--- peps/trunk/pep-0392.txt	(original)
+++ peps/trunk/pep-0392.txt	Fri Jul  2 10:51:24 2010
@@ -17,7 +17,7 @@
 Python 3.2.  The schedule primarily concerns itself with PEP-sized
 items.  Small features may be added up to and including the first beta
 release.  Bugs may be fixed until the final release, which is planned
-for December 2010.
+for January 2011.
 
 
 Release Manager and Crew
@@ -34,17 +34,17 @@
 
 The current schedule is:
 
-- 3.2 alpha 1: July 3, 2010
-- 3.2 alpha 2: July 24, 2010
-- 3.2 alpha 3: August 21, 2010
-- 3.2 beta 1: September 18, 2010
+- 3.2 alpha 1: August 7, 2010
+- 3.2 alpha 2: September 4, 2010
+- 3.2 alpha 3: October 2, 2010
+- 3.2 beta 1: October 30, 2010
 
 (No new features beyond this point.)
 
-- 3.2 beta 2: October 16, 2010
-- 3.2 candidate 1: November 13, 2010
-- 3.2 candidate 2: November 27, 2010
-- 3.2 final: December 11, 2010
+- 3.2 beta 2: November 27, 2010
+- 3.2 candidate 1: December 11, 2010
+- 3.2 candidate 2: January 1, 2010
+- 3.2 final: January 15, 2010
 
 .. don't forget to update final date above as well
 

From python-checkins at python.org  Fri Jul  2 15:35:17 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Fri,  2 Jul 2010 15:35:17 +0200 (CEST)
Subject: [Python-checkins] r82437 - python/branches/py3k/Modules/mathmodule.c
Message-ID: <20100702133517.B3EFECA6A@mail.python.org>

Author: benjamin.peterson
Date: Fri Jul  2 15:35:17 2010
New Revision: 82437

Log:
account for different ref counting semantics of _PyObject_LookupSpecial

Modified:
   python/branches/py3k/Modules/mathmodule.c

Modified: python/branches/py3k/Modules/mathmodule.c
==============================================================================
--- python/branches/py3k/Modules/mathmodule.c	(original)
+++ python/branches/py3k/Modules/mathmodule.c	Fri Jul  2 15:35:17 2010
@@ -881,7 +881,7 @@
 
 static PyObject * math_floor(PyObject *self, PyObject *number) {
     static PyObject *floor_str = NULL;
-    PyObject *method;
+    PyObject *method, *result;
 
     method = _PyObject_LookupSpecial(number, "__floor__", &floor_str);
     if (method == NULL) {
@@ -889,7 +889,9 @@
             return NULL;
         return math_1_to_int(number, floor, 0);
     }
-    return PyObject_CallFunctionObjArgs(method, NULL);
+    result = PyObject_CallFunctionObjArgs(method, NULL);
+    Py_DECREF(method);
+    return result;
 }
 
 PyDoc_STRVAR(math_floor_doc,
@@ -1416,7 +1418,7 @@
 math_trunc(PyObject *self, PyObject *number)
 {
     static PyObject *trunc_str = NULL;
-    PyObject *trunc;
+    PyObject *trunc, *result;
 
     if (Py_TYPE(number)->tp_dict == NULL) {
         if (PyType_Ready(Py_TYPE(number)) < 0)
@@ -1431,7 +1433,9 @@
                          Py_TYPE(number)->tp_name);
         return NULL;
     }
-    return PyObject_CallFunctionObjArgs(trunc, NULL);
+    result = PyObject_CallFunctionObjArgs(trunc, NULL);
+    Py_DECREF(trunc);
+    return result;
 }
 
 PyDoc_STRVAR(math_trunc_doc,

From python-checkins at python.org  Fri Jul  2 15:46:42 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Fri,  2 Jul 2010 15:46:42 +0200 (CEST)
Subject: [Python-checkins] r82438 - in python/branches/py3k:
	Lib/test/test_descr.py Misc/NEWS Modules/mathmodule.c
Message-ID: <20100702134642.CA809EE982@mail.python.org>

Author: benjamin.peterson
Date: Fri Jul  2 15:46:42 2010
New Revision: 82438

Log:
fix lookup of __ceil__

Modified:
   python/branches/py3k/Lib/test/test_descr.py
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/mathmodule.c

Modified: python/branches/py3k/Lib/test/test_descr.py
==============================================================================
--- python/branches/py3k/Lib/test/test_descr.py	(original)
+++ python/branches/py3k/Lib/test/test_descr.py	Fri Jul  2 15:46:42 2010
@@ -1581,6 +1581,7 @@
             ("__format__", format, format_impl, set(), {}),
             ("__floor__", math.floor, zero, set(), {}),
             ("__trunc__", math.trunc, zero, set(), {}),
+            ("__ceil__", math.ceil, zero, set(), {}),
             ]
 
         class Checker(object):

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri Jul  2 15:46:42 2010
@@ -1374,8 +1374,8 @@
 Extension Modules
 -----------------
 
-- In the math module, correctly lookup __trunc__ and __floor__ as special
-  methods.
+- In the math module, correctly lookup __trunc__, __ceil__, and __floor__ as
+  special methods.
 
 - Issue #9005: Prevent utctimetuple() from producing year 0 or year
   10,000.  Prior to this change, timezone adjustment in utctimetuple()

Modified: python/branches/py3k/Modules/mathmodule.c
==============================================================================
--- python/branches/py3k/Modules/mathmodule.c	(original)
+++ python/branches/py3k/Modules/mathmodule.c	Fri Jul  2 15:46:42 2010
@@ -843,17 +843,17 @@
     static PyObject *ceil_str = NULL;
     PyObject *method;
 
-    if (ceil_str == NULL) {
-        ceil_str = PyUnicode_InternFromString("__ceil__");
-        if (ceil_str == NULL)
+    method = _PyObject_LookupSpecial(number, "__ceil__", &ceil_str);
+    if (method == NULL) {
+        if (PyErr_Occurred())
             return NULL;
-    }
-
-    method = _PyType_Lookup(Py_TYPE(number), ceil_str);
-    if (method == NULL)
         return math_1_to_int(number, ceil, 0);
-    else
-        return PyObject_CallFunction(method, "O", number);
+    }
+    else {
+        PyObject *result = PyObject_CallFunctionObjArgs(method, NULL);
+        Py_DECREF(method);
+        return result;
+    }
 }
 
 PyDoc_STRVAR(math_ceil_doc,

From python-checkins at python.org  Fri Jul  2 17:50:14 2010
From: python-checkins at python.org (nick.coghlan)
Date: Fri,  2 Jul 2010 17:50:14 +0200 (CEST)
Subject: [Python-checkins] r82439 - python/trunk/Doc/whatsnew/2.7.rst
Message-ID: <20100702155014.8E2D9EE99E@mail.python.org>

Author: nick.coghlan
Date: Fri Jul  2 17:50:14 2010
New Revision: 82439

Log:
Fix a couple of minor nits in What's New before the release goes out

Modified:
   python/trunk/Doc/whatsnew/2.7.rst

Modified: python/trunk/Doc/whatsnew/2.7.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.7.rst	(original)
+++ python/trunk/Doc/whatsnew/2.7.rst	Fri Jul  2 17:50:14 2010
@@ -861,10 +861,10 @@
 
 When running a module using the interpreter's :option:`-m` switch,
 ``sys.argv[0]`` will now be set to the string ``'-m'`` while the
-module is being located, while executing the :file:`__init__.py` files
-for any parent packages of the module to be executed.
-(Suggested by Michael Foord; implemented by Nick Coghlan;
-:issue:`8202`.)
+module is being located.  This change is visible to user code while
+executing the :file:`__init__.py` files for any parent packages of
+the module to be executed.  (Suggested by Michael Foord; implemented
+by Nick Coghlan; :issue:`8202`.)
 
 .. ======================================================================
 
@@ -1420,9 +1420,9 @@
   ``sys.path`` and the module :mod:`__main__` will be imported.  It's
   expected that the directory or zip contains a :file:`__main__.py`;
   if it doesn't, some other :file:`__main__.py` might be imported from
-  a location later in ``sys.path``.  This makes some of the machinery
+  a location later in ``sys.path``.  This makes more of the machinery
   of :mod:`runpy` available to scripts that want to mimic the way
-  Python's :option:`-m` processes an explicit path name.
+  Python's command line processes an explicit path name.
   (Added by Nick Coghlan; :issue:`6816`.)
 
 * New function: in the :mod:`shutil` module, :func:`~shutil.make_archive`

From python-checkins at python.org  Fri Jul  2 17:57:50 2010
From: python-checkins at python.org (nick.coghlan)
Date: Fri,  2 Jul 2010 17:57:50 +0200 (CEST)
Subject: [Python-checkins] r82440 - in python/branches/py3k:
	Doc/whatsnew/2.7.rst
Message-ID: <20100702155750.F1CBCEE98B@mail.python.org>

Author: nick.coghlan
Date: Fri Jul  2 17:57:50 2010
New Revision: 82440

Log:
Merged revisions 82439 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82439 | nick.coghlan | 2010-07-03 01:50:14 +1000 (Sat, 03 Jul 2010) | 1 line
  
  Fix a couple of minor nits in What's New before the release goes out
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/whatsnew/2.7.rst

Modified: python/branches/py3k/Doc/whatsnew/2.7.rst
==============================================================================
--- python/branches/py3k/Doc/whatsnew/2.7.rst	(original)
+++ python/branches/py3k/Doc/whatsnew/2.7.rst	Fri Jul  2 17:57:50 2010
@@ -861,10 +861,10 @@
 
 When running a module using the interpreter's :option:`-m` switch,
 ``sys.argv[0]`` will now be set to the string ``'-m'`` while the
-module is being located, while executing the :file:`__init__.py` files
-for any parent packages of the module to be executed.
-(Suggested by Michael Foord; implemented by Nick Coghlan;
-:issue:`8202`.)
+module is being located.  This change is visible to user code while
+executing the :file:`__init__.py` files for any parent packages of
+the module to be executed.  (Suggested by Michael Foord; implemented
+by Nick Coghlan; :issue:`8202`.)
 
 .. ======================================================================
 
@@ -1420,9 +1420,9 @@
   ``sys.path`` and the module :mod:`__main__` will be imported.  It's
   expected that the directory or zip contains a :file:`__main__.py`;
   if it doesn't, some other :file:`__main__.py` might be imported from
-  a location later in ``sys.path``.  This makes some of the machinery
+  a location later in ``sys.path``.  This makes more of the machinery
   of :mod:`runpy` available to scripts that want to mimic the way
-  Python's :option:`-m` processes an explicit path name.
+  Python's command line processes an explicit path name.
   (Added by Nick Coghlan; :issue:`6816`.)
 
 * New function: in the :mod:`shutil` module, :func:`~shutil.make_archive`

From python-checkins at python.org  Fri Jul  2 18:01:53 2010
From: python-checkins at python.org (nick.coghlan)
Date: Fri,  2 Jul 2010 18:01:53 +0200 (CEST)
Subject: [Python-checkins] r82441 - python/trunk/Doc/whatsnew/2.7.rst
Message-ID: <20100702160153.75707CA5E@mail.python.org>

Author: nick.coghlan
Date: Fri Jul  2 18:01:53 2010
New Revision: 82441

Log:
Issue 8202 actually caused an unintended behavioural change and was reverted in 2.7 - remove reference from What's New

Modified:
   python/trunk/Doc/whatsnew/2.7.rst

Modified: python/trunk/Doc/whatsnew/2.7.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.7.rst	(original)
+++ python/trunk/Doc/whatsnew/2.7.rst	Fri Jul  2 18:01:53 2010
@@ -859,13 +859,6 @@
 
   export PYTHONWARNINGS=all,error:::Cookie:0
 
-When running a module using the interpreter's :option:`-m` switch,
-``sys.argv[0]`` will now be set to the string ``'-m'`` while the
-module is being located.  This change is visible to user code while
-executing the :file:`__init__.py` files for any parent packages of
-the module to be executed.  (Suggested by Michael Foord; implemented
-by Nick Coghlan; :issue:`8202`.)
-
 .. ======================================================================
 
 

From python-checkins at python.org  Fri Jul  2 18:05:16 2010
From: python-checkins at python.org (mark.dickinson)
Date: Fri,  2 Jul 2010 18:05:16 +0200 (CEST)
Subject: [Python-checkins] r82442 - python/branches/py3k/Modules/mathmodule.c
Message-ID: <20100702160516.11BB8CA3F@mail.python.org>

Author: mark.dickinson
Date: Fri Jul  2 18:05:15 2010
New Revision: 82442

Log:
Style/consistency nit: make math_floor and math_ceil code look the same.

Modified:
   python/branches/py3k/Modules/mathmodule.c

Modified: python/branches/py3k/Modules/mathmodule.c
==============================================================================
--- python/branches/py3k/Modules/mathmodule.c	(original)
+++ python/branches/py3k/Modules/mathmodule.c	Fri Jul  2 18:05:15 2010
@@ -841,7 +841,7 @@
 
 static PyObject * math_ceil(PyObject *self, PyObject *number) {
     static PyObject *ceil_str = NULL;
-    PyObject *method;
+    PyObject *method, *result;
 
     method = _PyObject_LookupSpecial(number, "__ceil__", &ceil_str);
     if (method == NULL) {
@@ -849,11 +849,9 @@
             return NULL;
         return math_1_to_int(number, ceil, 0);
     }
-    else {
-        PyObject *result = PyObject_CallFunctionObjArgs(method, NULL);
-        Py_DECREF(method);
-        return result;
-    }
+    result = PyObject_CallFunctionObjArgs(method, NULL);
+    Py_DECREF(method);
+    return result;
 }
 
 PyDoc_STRVAR(math_ceil_doc,

From python-checkins at python.org  Fri Jul  2 18:14:06 2010
From: python-checkins at python.org (nick.coghlan)
Date: Fri,  2 Jul 2010 18:14:06 +0200 (CEST)
Subject: [Python-checkins] r82443 - in python/branches/py3k:
	Doc/whatsnew/2.7.rst
Message-ID: <20100702161406.0D111EE982@mail.python.org>

Author: nick.coghlan
Date: Fri Jul  2 18:14:05 2010
New Revision: 82443

Log:
Merged revisions 82441 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82441 | nick.coghlan | 2010-07-03 02:01:53 +1000 (Sat, 03 Jul 2010) | 1 line
  
  Issue 8202 actually caused an unintended behavioural change and was reverted in 2.7 - remove reference from What's New
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/whatsnew/2.7.rst

Modified: python/branches/py3k/Doc/whatsnew/2.7.rst
==============================================================================
--- python/branches/py3k/Doc/whatsnew/2.7.rst	(original)
+++ python/branches/py3k/Doc/whatsnew/2.7.rst	Fri Jul  2 18:14:05 2010
@@ -859,13 +859,6 @@
 
   export PYTHONWARNINGS=all,error:::Cookie:0
 
-When running a module using the interpreter's :option:`-m` switch,
-``sys.argv[0]`` will now be set to the string ``'-m'`` while the
-module is being located.  This change is visible to user code while
-executing the :file:`__init__.py` files for any parent packages of
-the module to be executed.  (Suggested by Michael Foord; implemented
-by Nick Coghlan; :issue:`8202`.)
-
 .. ======================================================================
 
 

From python-checkins at python.org  Fri Jul  2 18:17:17 2010
From: python-checkins at python.org (nick.coghlan)
Date: Fri,  2 Jul 2010 18:17:17 +0200 (CEST)
Subject: [Python-checkins] r82444 - python/branches/release26-maint
Message-ID: <20100702161717.65CF7CA5E@mail.python.org>

Author: nick.coghlan
Date: Fri Jul  2 18:17:17 2010
New Revision: 82444

Log:
Blocked revisions 82439,82441 via svnmerge

........
  r82439 | nick.coghlan | 2010-07-03 01:50:14 +1000 (Sat, 03 Jul 2010) | 1 line
  
  Fix a couple of minor nits in What's New before the release goes out
........
  r82441 | nick.coghlan | 2010-07-03 02:01:53 +1000 (Sat, 03 Jul 2010) | 1 line
  
  Issue 8202 actually caused an unintended behavioural change and was reverted in 2.7 - remove reference from What's New
........


Modified:
   python/branches/release26-maint/   (props changed)

From python-checkins at python.org  Fri Jul  2 18:21:37 2010
From: python-checkins at python.org (nick.coghlan)
Date: Fri,  2 Jul 2010 18:21:37 +0200 (CEST)
Subject: [Python-checkins] r82445 - python/branches/release31-maint
Message-ID: <20100702162137.736B9CA3F@mail.python.org>

Author: nick.coghlan
Date: Fri Jul  2 18:21:37 2010
New Revision: 82445

Log:
Blocked revisions 82440,82443 via svnmerge

................
  r82440 | nick.coghlan | 2010-07-03 01:57:50 +1000 (Sat, 03 Jul 2010) | 9 lines
  
  Merged revisions 82439 via svnmerge from 
  svn+ssh://pythondev at svn.python.org/python/trunk
  
  ........
    r82439 | nick.coghlan | 2010-07-03 01:50:14 +1000 (Sat, 03 Jul 2010) | 1 line
    
    Fix a couple of minor nits in What's New before the release goes out
  ........
................
  r82443 | nick.coghlan | 2010-07-03 02:14:05 +1000 (Sat, 03 Jul 2010) | 9 lines
  
  Merged revisions 82441 via svnmerge from 
  svn+ssh://pythondev at svn.python.org/python/trunk
  
  ........
    r82441 | nick.coghlan | 2010-07-03 02:01:53 +1000 (Sat, 03 Jul 2010) | 1 line
    
    Issue 8202 actually caused an unintended behavioural change and was reverted in 2.7 - remove reference from What's New
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)

From ncoghlan at gmail.com  Fri Jul  2 18:39:26 2010
From: ncoghlan at gmail.com (Nick Coghlan)
Date: Sat, 3 Jul 2010 02:39:26 +1000
Subject: [Python-checkins] r82348 - in
	tracker/instances/python-dev/html: issue.item.html issue.item.js
In-Reply-To: <20100628212916.C0CE0EEC4C@mail.python.org>
References: <20100628212916.C0CE0EEC4C@mail.python.org>
Message-ID: <AANLkTikqyS04AZXgunChwbYn0D6D5Cv2tnBrr3gzb0ds@mail.gmail.com>

On Tue, Jun 29, 2010 at 7:29 AM, ezio.melotti
<python-checkins at python.org> wrote:
> Author: ezio.melotti
> Date: Mon Jun 28 23:29:16 2010
> New Revision: 82348
>
> Log:
> #266: Add an "Add me to nosy" button next to the nosy list.

Thank you, thank you, thank you, thank you, etc... :)

Cheers,
Nick.

-- 
Nick Coghlan   |   ncoghlan at gmail.com   |   Brisbane, Australia

From python-checkins at python.org  Fri Jul  2 20:06:52 2010
From: python-checkins at python.org (mark.dickinson)
Date: Fri,  2 Jul 2010 20:06:52 +0200 (CEST)
Subject: [Python-checkins] r82446 - python/trunk/Doc/library/sys.rst
Message-ID: <20100702180652.72B68F094@mail.python.org>

Author: mark.dickinson
Date: Fri Jul  2 20:06:52 2010
New Revision: 82446

Log:
Clarify sys.float_info documentation.

Modified:
   python/trunk/Doc/library/sys.rst

Modified: python/trunk/Doc/library/sys.rst
==============================================================================
--- python/trunk/Doc/library/sys.rst	(original)
+++ python/trunk/Doc/library/sys.rst	Fri Jul  2 20:06:52 2010
@@ -296,43 +296,65 @@
 .. data:: float_info
 
    A structseq holding information about the float type. It contains low level
-   information about the precision and internal representation. Please study
-   your system's :file:`float.h` for more information.
+   information about the precision and internal representation.  The values
+   correspond to the various floating-point constants defined in the standard
+   header file :file:`float.h` for the 'C' programming language; see section
+   5.2.4.2.2 of the 1999 ISO/IEC C standard [C99]_, 'Characteristics of
+   floating types', for details.
+
+   +---------------------+----------------+--------------------------------------------------+
+   | attribute           | float.h macro  | explanation                                      |
+   +=====================+================+==================================================+
+   | :const:`epsilon`    | DBL_MAX        | difference between 1 and the least value greater |
+   |                     |                | than 1 that is representable as a float          |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`dig`        | DBL_DIG        | maximum number of decimal digits that can be     |
+   |                     |                | faithfully represented in a float;  see below    |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`mant_dig`   | DBL_MANT_DIG   | float precision: the number of base-``radix``    |
+   |                     |                | digits in the significand of a float             |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max`        | DBL_MAX        | maximum representable finite float               |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max_exp`    | DBL_MAX_EXP    | maximum integer e such that ``radix**(e-1)`` is  |
+   |                     |                | a representable finite float                     |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max_10_exp` | DBL_MAX_10_EXP | maximum integer e such that ``10**e`` is in the  |
+   |                     |                | range of representable finite floats             |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min`        | DBL_MIN        | minimum positive normalized float                |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min_exp`    | DBL_MIN_EXP    | minimum integer e such that ``radix**(e-1)`` is  |
+   |                     |                | a normalized float                               |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min_10_exp` | DBL_MIN_10_EXP | minimum integer e such that ``10**e`` is a       |
+   |                     |                | normalized float                                 |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`radix`      | FLT_RADIX      | radix of exponent representation                 |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`rounds`     | FLT_ROUNDS     | constant representing rounding mode              |
+   |                     |                | used for arithmetic operations                   |
+   +---------------------+----------------+--------------------------------------------------+
+
+   The attribute :attr:`sys.float_info.dig` needs further explanation.  If
+   ``s`` is any string representing a decimal number with at most
+   :attr:`sys.float_info.dig` significant digits, then converting ``s`` to a
+   float and back again will recover a string representing the same decimal
+   value::
 
-   +---------------------+--------------------------------------------------+
-   | attribute           |  explanation                                     |
-   +=====================+==================================================+
-   | :const:`epsilon`    | Difference between 1 and the next representable  |
-   |                     | floating point number                            |
-   +---------------------+--------------------------------------------------+
-   | :const:`dig`        | digits (see :file:`float.h`)                     |
-   +---------------------+--------------------------------------------------+
-   | :const:`mant_dig`   | mantissa digits (see :file:`float.h`)            |
-   +---------------------+--------------------------------------------------+
-   | :const:`max`        | maximum representable finite float               |
-   +---------------------+--------------------------------------------------+
-   | :const:`max_exp`    | maximum int e such that radix**(e-1) is in the   |
-   |                     | range of finite representable floats             |
-   +---------------------+--------------------------------------------------+
-   | :const:`max_10_exp` | maximum int e such that 10**e is in the          |
-   |                     | range of finite representable floats             |
-   +---------------------+--------------------------------------------------+
-   | :const:`min`        | Minimum positive normalizer float                |
-   +---------------------+--------------------------------------------------+
-   | :const:`min_exp`    | minimum int e such that radix**(e-1) is a        |
-   |                     | normalized float                                 |
-   +---------------------+--------------------------------------------------+
-   | :const:`min_10_exp` | minimum int e such that 10**e is a normalized    |
-   |                     | float                                            |
-   +---------------------+--------------------------------------------------+
-   | :const:`radix`      | radix of exponent                                |
-   +---------------------+--------------------------------------------------+
-   | :const:`rounds`     | addition rounds (see :file:`float.h`)            |
-   +---------------------+--------------------------------------------------+
-
-   .. note::
-
-      The information in the table is simplified.
+      >>> import sys
+      >>> sys.float_info.dig
+      15
+      >>> s = '3.14159265358979'    # decimal string with 15 significant digits
+      >>> format(float(s), '.15g')  # convert to float and back -> same value
+      '3.14159265358979'
+
+   But for strings with more than :attr:`sys.float_info.dig` significant digits,
+   this isn't always true::
+
+      >>> s = '9876543211234567'    # 16 significant digits is too many!
+      >>> format(float(s), '.16g')  # conversion changes value
+      '9876543211234568'
 
    .. versionadded:: 2.6
 
@@ -992,3 +1014,8 @@
    first three characters of :const:`version`.  It is provided in the :mod:`sys`
    module for informational purposes; modifying this value has no effect on the
    registry keys used by Python. Availability: Windows.
+
+.. rubric:: Citations
+
+.. [C99] ISO/IEC 9899:1999.  "Programming languages -- C."  A public draft of this standard is available at http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf .
+

From python-checkins at python.org  Fri Jul  2 21:41:40 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Fri,  2 Jul 2010 21:41:40 +0200 (CEST)
Subject: [Python-checkins] r82447 - python/trunk/Objects/floatobject.c
Message-ID: <20100702194140.13745C9A6@mail.python.org>

Author: benjamin.peterson
Date: Fri Jul  2 21:41:39 2010
New Revision: 82447

Log:
add space

Modified:
   python/trunk/Objects/floatobject.c

Modified: python/trunk/Objects/floatobject.c
==============================================================================
--- python/trunk/Objects/floatobject.c	(original)
+++ python/trunk/Objects/floatobject.c	Fri Jul  2 21:41:39 2010
@@ -1347,7 +1347,7 @@
         return float_str((PyFloatObject *)v);
 
     if (x == 0.0) {
-        if(copysign(1.0, x) == -1.0)
+        if (copysign(1.0, x) == -1.0)
             return PyString_FromString("-0x0.0p+0");
         else
             return PyString_FromString("0x0.0p+0");

From python-checkins at python.org  Fri Jul  2 21:45:07 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Fri,  2 Jul 2010 21:45:07 +0200 (CEST)
Subject: [Python-checkins] r82448 - in python/branches/py3k:
	Objects/floatobject.c
Message-ID: <20100702194507.59EDCCA21@mail.python.org>

Author: benjamin.peterson
Date: Fri Jul  2 21:45:07 2010
New Revision: 82448

Log:
Merged revisions 82447 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82447 | benjamin.peterson | 2010-07-02 14:41:39 -0500 (Fri, 02 Jul 2010) | 1 line
  
  add space
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Objects/floatobject.c

Modified: python/branches/py3k/Objects/floatobject.c
==============================================================================
--- python/branches/py3k/Objects/floatobject.c	(original)
+++ python/branches/py3k/Objects/floatobject.c	Fri Jul  2 21:45:07 2010
@@ -1172,7 +1172,7 @@
         return float_str((PyFloatObject *)v);
 
     if (x == 0.0) {
-        if(copysign(1.0, x) == -1.0)
+        if (copysign(1.0, x) == -1.0)
             return PyUnicode_FromString("-0x0.0p+0");
         else
             return PyUnicode_FromString("0x0.0p+0");

From python-checkins at python.org  Fri Jul  2 21:45:12 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Fri,  2 Jul 2010 21:45:12 +0200 (CEST)
Subject: [Python-checkins] r82449 - in python/branches/release26-maint:
	Objects/floatobject.c
Message-ID: <20100702194512.0FDB9EE98B@mail.python.org>

Author: benjamin.peterson
Date: Fri Jul  2 21:45:11 2010
New Revision: 82449

Log:
Merged revisions 82447 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82447 | benjamin.peterson | 2010-07-02 14:41:39 -0500 (Fri, 02 Jul 2010) | 1 line
  
  add space
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Objects/floatobject.c

Modified: python/branches/release26-maint/Objects/floatobject.c
==============================================================================
--- python/branches/release26-maint/Objects/floatobject.c	(original)
+++ python/branches/release26-maint/Objects/floatobject.c	Fri Jul  2 21:45:11 2010
@@ -1216,7 +1216,7 @@
         return float_str((PyFloatObject *)v);
 
     if (x == 0.0) {
-        if(copysign(1.0, x) == -1.0)
+        if (copysign(1.0, x) == -1.0)
             return PyString_FromString("-0x0.0p+0");
         else
             return PyString_FromString("0x0.0p+0");

From python-checkins at python.org  Fri Jul  2 21:50:16 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Fri,  2 Jul 2010 21:50:16 +0200 (CEST)
Subject: [Python-checkins] r82450 - in python/branches/release31-maint:
	Objects/floatobject.c
Message-ID: <20100702195016.67B62D37A@mail.python.org>

Author: benjamin.peterson
Date: Fri Jul  2 21:50:16 2010
New Revision: 82450

Log:
Merged revisions 82448 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/branches/py3k

................
  r82448 | benjamin.peterson | 2010-07-02 14:45:07 -0500 (Fri, 02 Jul 2010) | 9 lines
  
  Merged revisions 82447 via svnmerge from 
  svn+ssh://pythondev at svn.python.org/python/trunk
  
  ........
    r82447 | benjamin.peterson | 2010-07-02 14:41:39 -0500 (Fri, 02 Jul 2010) | 1 line
    
    add space
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Objects/floatobject.c

Modified: python/branches/release31-maint/Objects/floatobject.c
==============================================================================
--- python/branches/release31-maint/Objects/floatobject.c	(original)
+++ python/branches/release31-maint/Objects/floatobject.c	Fri Jul  2 21:50:16 2010
@@ -1110,7 +1110,7 @@
         return float_str((PyFloatObject *)v);
 
     if (x == 0.0) {
-        if(copysign(1.0, x) == -1.0)
+        if (copysign(1.0, x) == -1.0)
             return PyUnicode_FromString("-0x0.0p+0");
         else
             return PyUnicode_FromString("0x0.0p+0");

From python-checkins at python.org  Fri Jul  2 22:24:32 2010
From: python-checkins at python.org (mark.dickinson)
Date: Fri,  2 Jul 2010 22:24:32 +0200 (CEST)
Subject: [Python-checkins] r82451 - in python/branches/release26-maint:
	Doc/library/sys.rst
Message-ID: <20100702202432.7D959EFCB@mail.python.org>

Author: mark.dickinson
Date: Fri Jul  2 22:24:32 2010
New Revision: 82451

Log:
Merged revisions 82446 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82446 | mark.dickinson | 2010-07-02 19:06:52 +0100 (Fri, 02 Jul 2010) | 1 line
  
  Clarify sys.float_info documentation.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/sys.rst

Modified: python/branches/release26-maint/Doc/library/sys.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/sys.rst	(original)
+++ python/branches/release26-maint/Doc/library/sys.rst	Fri Jul  2 22:24:32 2010
@@ -296,43 +296,65 @@
 .. data:: float_info
 
    A structseq holding information about the float type. It contains low level
-   information about the precision and internal representation. Please study
-   your system's :file:`float.h` for more information.
+   information about the precision and internal representation.  The values
+   correspond to the various floating-point constants defined in the standard
+   header file :file:`float.h` for the 'C' programming language; see section
+   5.2.4.2.2 of the 1999 ISO/IEC C standard [C99]_, 'Characteristics of
+   floating types', for details.
+
+   +---------------------+----------------+--------------------------------------------------+
+   | attribute           | float.h macro  | explanation                                      |
+   +=====================+================+==================================================+
+   | :const:`epsilon`    | DBL_MAX        | difference between 1 and the least value greater |
+   |                     |                | than 1 that is representable as a float          |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`dig`        | DBL_DIG        | maximum number of decimal digits that can be     |
+   |                     |                | faithfully represented in a float;  see below    |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`mant_dig`   | DBL_MANT_DIG   | float precision: the number of base-``radix``    |
+   |                     |                | digits in the significand of a float             |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max`        | DBL_MAX        | maximum representable finite float               |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max_exp`    | DBL_MAX_EXP    | maximum integer e such that ``radix**(e-1)`` is  |
+   |                     |                | a representable finite float                     |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max_10_exp` | DBL_MAX_10_EXP | maximum integer e such that ``10**e`` is in the  |
+   |                     |                | range of representable finite floats             |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min`        | DBL_MIN        | minimum positive normalized float                |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min_exp`    | DBL_MIN_EXP    | minimum integer e such that ``radix**(e-1)`` is  |
+   |                     |                | a normalized float                               |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min_10_exp` | DBL_MIN_10_EXP | minimum integer e such that ``10**e`` is a       |
+   |                     |                | normalized float                                 |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`radix`      | FLT_RADIX      | radix of exponent representation                 |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`rounds`     | FLT_ROUNDS     | constant representing rounding mode              |
+   |                     |                | used for arithmetic operations                   |
+   +---------------------+----------------+--------------------------------------------------+
+
+   The attribute :attr:`sys.float_info.dig` needs further explanation.  If
+   ``s`` is any string representing a decimal number with at most
+   :attr:`sys.float_info.dig` significant digits, then converting ``s`` to a
+   float and back again will recover a string representing the same decimal
+   value::
 
-   +---------------------+--------------------------------------------------+
-   | attribute           |  explanation                                     |
-   +=====================+==================================================+
-   | :const:`epsilon`    | Difference between 1 and the next representable  |
-   |                     | floating point number                            |
-   +---------------------+--------------------------------------------------+
-   | :const:`dig`        | digits (see :file:`float.h`)                     |
-   +---------------------+--------------------------------------------------+
-   | :const:`mant_dig`   | mantissa digits (see :file:`float.h`)            |
-   +---------------------+--------------------------------------------------+
-   | :const:`max`        | maximum representable finite float               |
-   +---------------------+--------------------------------------------------+
-   | :const:`max_exp`    | maximum int e such that radix**(e-1) is in the   |
-   |                     | range of finite representable floats             |
-   +---------------------+--------------------------------------------------+
-   | :const:`max_10_exp` | maximum int e such that 10**e is in the          |
-   |                     | range of finite representable floats             |
-   +---------------------+--------------------------------------------------+
-   | :const:`min`        | Minimum positive normalizer float                |
-   +---------------------+--------------------------------------------------+
-   | :const:`min_exp`    | minimum int e such that radix**(e-1) is a        |
-   |                     | normalized float                                 |
-   +---------------------+--------------------------------------------------+
-   | :const:`min_10_exp` | minimum int e such that 10**e is a normalized    |
-   |                     | float                                            |
-   +---------------------+--------------------------------------------------+
-   | :const:`radix`      | radix of exponent                                |
-   +---------------------+--------------------------------------------------+
-   | :const:`rounds`     | addition rounds (see :file:`float.h`)            |
-   +---------------------+--------------------------------------------------+
-
-   .. note::
-
-      The information in the table is simplified.
+      >>> import sys
+      >>> sys.float_info.dig
+      15
+      >>> s = '3.14159265358979'    # decimal string with 15 significant digits
+      >>> format(float(s), '.15g')  # convert to float and back -> same value
+      '3.14159265358979'
+
+   But for strings with more than :attr:`sys.float_info.dig` significant digits,
+   this isn't always true::
+
+      >>> s = '9876543211234567'    # 16 significant digits is too many!
+      >>> format(float(s), '.16g')  # conversion changes value
+      '9876543211234568'
 
    .. versionadded:: 2.6
 
@@ -930,3 +952,8 @@
    first three characters of :const:`version`.  It is provided in the :mod:`sys`
    module for informational purposes; modifying this value has no effect on the
    registry keys used by Python. Availability: Windows.
+
+.. rubric:: Citations
+
+.. [C99] ISO/IEC 9899:1999.  "Programming languages -- C."  A public draft of this standard is available at http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf .
+

From python-checkins at python.org  Fri Jul  2 22:26:08 2010
From: python-checkins at python.org (mark.dickinson)
Date: Fri,  2 Jul 2010 22:26:08 +0200 (CEST)
Subject: [Python-checkins] r82452 - in python/branches/py3k:
	Doc/library/sys.rst
Message-ID: <20100702202608.25ABDEFCB@mail.python.org>

Author: mark.dickinson
Date: Fri Jul  2 22:26:07 2010
New Revision: 82452

Log:
Merged revisions 82446 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82446 | mark.dickinson | 2010-07-02 19:06:52 +0100 (Fri, 02 Jul 2010) | 1 line
  
  Clarify sys.float_info documentation.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/sys.rst

Modified: python/branches/py3k/Doc/library/sys.rst
==============================================================================
--- python/branches/py3k/Doc/library/sys.rst	(original)
+++ python/branches/py3k/Doc/library/sys.rst	Fri Jul  2 22:26:07 2010
@@ -223,44 +223,65 @@
 .. data:: float_info
 
    A structseq holding information about the float type. It contains low level
-   information about the precision and internal representation. Please study
-   your system's :file:`float.h` for more information.
-
-   +---------------------+--------------------------------------------------+
-   | attribute           |  explanation                                     |
-   +=====================+==================================================+
-   | :const:`epsilon`    | Difference between 1 and the next representable  |
-   |                     | floating point number                            |
-   +---------------------+--------------------------------------------------+
-   | :const:`dig`        | digits (see :file:`float.h`)                     |
-   +---------------------+--------------------------------------------------+
-   | :const:`mant_dig`   | mantissa digits (see :file:`float.h`)            |
-   +---------------------+--------------------------------------------------+
-   | :const:`max`        | maximum representable finite float               |
-   +---------------------+--------------------------------------------------+
-   | :const:`max_exp`    | maximum int e such that radix**(e-1) is in the   |
-   |                     | range of finite representable floats             |
-   +---------------------+--------------------------------------------------+
-   | :const:`max_10_exp` | maximum int e such that 10**e is in the          |
-   |                     | range of finite representable floats             |
-   +---------------------+--------------------------------------------------+
-   | :const:`min`        | Minimum positive normalizer float                |
-   +---------------------+--------------------------------------------------+
-   | :const:`min_exp`    | minimum int e such that radix**(e-1) is a        |
-   |                     | normalized float                                 |
-   +---------------------+--------------------------------------------------+
-   | :const:`min_10_exp` | minimum int e such that 10**e is a normalized    |
-   |                     | float                                            |
-   +---------------------+--------------------------------------------------+
-   | :const:`radix`      | radix of exponent                                |
-   +---------------------+--------------------------------------------------+
-   | :const:`rounds`     | addition rounds (see :file:`float.h`)            |
-   +---------------------+--------------------------------------------------+
-
-   .. note::
-
-      The information in the table is simplified.
+   information about the precision and internal representation.  The values
+   correspond to the various floating-point constants defined in the standard
+   header file :file:`float.h` for the 'C' programming language; see section
+   5.2.4.2.2 of the 1999 ISO/IEC C standard [C99]_, 'Characteristics of
+   floating types', for details.
+
+   +---------------------+----------------+--------------------------------------------------+
+   | attribute           | float.h macro  | explanation                                      |
+   +=====================+================+==================================================+
+   | :const:`epsilon`    | DBL_MAX        | difference between 1 and the least value greater |
+   |                     |                | than 1 that is representable as a float          |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`dig`        | DBL_DIG        | maximum number of decimal digits that can be     |
+   |                     |                | faithfully represented in a float;  see below    |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`mant_dig`   | DBL_MANT_DIG   | float precision: the number of base-``radix``    |
+   |                     |                | digits in the significand of a float             |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max`        | DBL_MAX        | maximum representable finite float               |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max_exp`    | DBL_MAX_EXP    | maximum integer e such that ``radix**(e-1)`` is  |
+   |                     |                | a representable finite float                     |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max_10_exp` | DBL_MAX_10_EXP | maximum integer e such that ``10**e`` is in the  |
+   |                     |                | range of representable finite floats             |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min`        | DBL_MIN        | minimum positive normalized float                |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min_exp`    | DBL_MIN_EXP    | minimum integer e such that ``radix**(e-1)`` is  |
+   |                     |                | a normalized float                               |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min_10_exp` | DBL_MIN_10_EXP | minimum integer e such that ``10**e`` is a       |
+   |                     |                | normalized float                                 |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`radix`      | FLT_RADIX      | radix of exponent representation                 |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`rounds`     | FLT_ROUNDS     | constant representing rounding mode              |
+   |                     |                | used for arithmetic operations                   |
+   +---------------------+----------------+--------------------------------------------------+
+
+   The attribute :attr:`sys.float_info.dig` needs further explanation.  If
+   ``s`` is any string representing a decimal number with at most
+   :attr:`sys.float_info.dig` significant digits, then converting ``s`` to a
+   float and back again will recover a string representing the same decimal
+   value::
 
+      >>> import sys
+      >>> sys.float_info.dig
+      15
+      >>> s = '3.14159265358979'    # decimal string with 15 significant digits
+      >>> format(float(s), '.15g')  # convert to float and back -> same value
+      '3.14159265358979'
+
+   But for strings with more than :attr:`sys.float_info.dig` significant digits,
+   this isn't always true::
+
+      >>> s = '9876543211234567'    # 16 significant digits is too many!
+      >>> format(float(s), '.16g')  # conversion changes value
+      '9876543211234568'
 
 .. data:: float_repr_style
 
@@ -957,3 +978,8 @@
    first three characters of :const:`version`.  It is provided in the :mod:`sys`
    module for informational purposes; modifying this value has no effect on the
    registry keys used by Python. Availability: Windows.
+
+.. rubric:: Citations
+
+.. [C99] ISO/IEC 9899:1999.  "Programming languages -- C."  A public draft of this standard is available at http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf .
+

From python-checkins at python.org  Fri Jul  2 22:26:51 2010
From: python-checkins at python.org (mark.dickinson)
Date: Fri,  2 Jul 2010 22:26:51 +0200 (CEST)
Subject: [Python-checkins] r82453 - in python/branches/release31-maint:
	Doc/library/sys.rst
Message-ID: <20100702202651.D0408EE98C@mail.python.org>

Author: mark.dickinson
Date: Fri Jul  2 22:26:51 2010
New Revision: 82453

Log:
Merged revisions 82452 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/branches/py3k

................
  r82452 | mark.dickinson | 2010-07-02 21:26:07 +0100 (Fri, 02 Jul 2010) | 9 lines
  
  Merged revisions 82446 via svnmerge from 
  svn+ssh://pythondev at svn.python.org/python/trunk
  
  ........
    r82446 | mark.dickinson | 2010-07-02 19:06:52 +0100 (Fri, 02 Jul 2010) | 1 line
    
    Clarify sys.float_info documentation.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/sys.rst

Modified: python/branches/release31-maint/Doc/library/sys.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/sys.rst	(original)
+++ python/branches/release31-maint/Doc/library/sys.rst	Fri Jul  2 22:26:51 2010
@@ -224,44 +224,65 @@
 .. data:: float_info
 
    A structseq holding information about the float type. It contains low level
-   information about the precision and internal representation. Please study
-   your system's :file:`float.h` for more information.
-
-   +---------------------+--------------------------------------------------+
-   | attribute           |  explanation                                     |
-   +=====================+==================================================+
-   | :const:`epsilon`    | Difference between 1 and the next representable  |
-   |                     | floating point number                            |
-   +---------------------+--------------------------------------------------+
-   | :const:`dig`        | digits (see :file:`float.h`)                     |
-   +---------------------+--------------------------------------------------+
-   | :const:`mant_dig`   | mantissa digits (see :file:`float.h`)            |
-   +---------------------+--------------------------------------------------+
-   | :const:`max`        | maximum representable finite float               |
-   +---------------------+--------------------------------------------------+
-   | :const:`max_exp`    | maximum int e such that radix**(e-1) is in the   |
-   |                     | range of finite representable floats             |
-   +---------------------+--------------------------------------------------+
-   | :const:`max_10_exp` | maximum int e such that 10**e is in the          |
-   |                     | range of finite representable floats             |
-   +---------------------+--------------------------------------------------+
-   | :const:`min`        | Minimum positive normalizer float                |
-   +---------------------+--------------------------------------------------+
-   | :const:`min_exp`    | minimum int e such that radix**(e-1) is a        |
-   |                     | normalized float                                 |
-   +---------------------+--------------------------------------------------+
-   | :const:`min_10_exp` | minimum int e such that 10**e is a normalized    |
-   |                     | float                                            |
-   +---------------------+--------------------------------------------------+
-   | :const:`radix`      | radix of exponent                                |
-   +---------------------+--------------------------------------------------+
-   | :const:`rounds`     | addition rounds (see :file:`float.h`)            |
-   +---------------------+--------------------------------------------------+
-
-   .. note::
-
-      The information in the table is simplified.
+   information about the precision and internal representation.  The values
+   correspond to the various floating-point constants defined in the standard
+   header file :file:`float.h` for the 'C' programming language; see section
+   5.2.4.2.2 of the 1999 ISO/IEC C standard [C99]_, 'Characteristics of
+   floating types', for details.
+
+   +---------------------+----------------+--------------------------------------------------+
+   | attribute           | float.h macro  | explanation                                      |
+   +=====================+================+==================================================+
+   | :const:`epsilon`    | DBL_MAX        | difference between 1 and the least value greater |
+   |                     |                | than 1 that is representable as a float          |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`dig`        | DBL_DIG        | maximum number of decimal digits that can be     |
+   |                     |                | faithfully represented in a float;  see below    |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`mant_dig`   | DBL_MANT_DIG   | float precision: the number of base-``radix``    |
+   |                     |                | digits in the significand of a float             |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max`        | DBL_MAX        | maximum representable finite float               |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max_exp`    | DBL_MAX_EXP    | maximum integer e such that ``radix**(e-1)`` is  |
+   |                     |                | a representable finite float                     |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`max_10_exp` | DBL_MAX_10_EXP | maximum integer e such that ``10**e`` is in the  |
+   |                     |                | range of representable finite floats             |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min`        | DBL_MIN        | minimum positive normalized float                |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min_exp`    | DBL_MIN_EXP    | minimum integer e such that ``radix**(e-1)`` is  |
+   |                     |                | a normalized float                               |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`min_10_exp` | DBL_MIN_10_EXP | minimum integer e such that ``10**e`` is a       |
+   |                     |                | normalized float                                 |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`radix`      | FLT_RADIX      | radix of exponent representation                 |
+   +---------------------+----------------+--------------------------------------------------+
+   | :const:`rounds`     | FLT_ROUNDS     | constant representing rounding mode              |
+   |                     |                | used for arithmetic operations                   |
+   +---------------------+----------------+--------------------------------------------------+
+
+   The attribute :attr:`sys.float_info.dig` needs further explanation.  If
+   ``s`` is any string representing a decimal number with at most
+   :attr:`sys.float_info.dig` significant digits, then converting ``s`` to a
+   float and back again will recover a string representing the same decimal
+   value::
 
+      >>> import sys
+      >>> sys.float_info.dig
+      15
+      >>> s = '3.14159265358979'    # decimal string with 15 significant digits
+      >>> format(float(s), '.15g')  # convert to float and back -> same value
+      '3.14159265358979'
+
+   But for strings with more than :attr:`sys.float_info.dig` significant digits,
+   this isn't always true::
+
+      >>> s = '9876543211234567'    # 16 significant digits is too many!
+      >>> format(float(s), '.16g')  # conversion changes value
+      '9876543211234568'
 
 .. data:: float_repr_style
 
@@ -875,3 +896,8 @@
    first three characters of :const:`version`.  It is provided in the :mod:`sys`
    module for informational purposes; modifying this value has no effect on the
    registry keys used by Python. Availability: Windows.
+
+.. rubric:: Citations
+
+.. [C99] ISO/IEC 9899:1999.  "Programming languages -- C."  A public draft of this standard is available at http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf .
+

From python-checkins at python.org  Fri Jul  2 23:25:47 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Fri,  2 Jul 2010 23:25:47 +0200 (CEST)
Subject: [Python-checkins] r82454 -
	sandbox/branches/py3k-datetime/datetime.py
Message-ID: <20100702212547.5A091EE4D@mail.python.org>

Author: alexander.belopolsky
Date: Fri Jul  2 23:25:47 2010
New Revision: 82454

Log:
Cleaned up some XXXs

Modified:
   sandbox/branches/py3k-datetime/datetime.py

Modified: sandbox/branches/py3k-datetime/datetime.py
==============================================================================
--- sandbox/branches/py3k-datetime/datetime.py	(original)
+++ sandbox/branches/py3k-datetime/datetime.py	Fri Jul  2 23:25:47 2010
@@ -319,7 +319,6 @@
     __slots__ = '__days', '__seconds', '__microseconds'
 
     def __new__(cls, days=0, seconds=0, microseconds=0,
-                # XXX The following should only be used as keyword args:
                 milliseconds=0, minutes=0, hours=0, weeks=0):
         # Doing this efficiently and accurately in C is going to be difficult
         # and error-prone, due to ubiquitous overflow possibilities, and that
@@ -329,7 +328,7 @@
         # guide the C implementation; it's way more convoluted than speed-
         # ignoring auto-overflow-to-long idiomatic Python could be.
 
-        # XXX Check that all inputs are ints, longs or floats.
+        # XXX Check that all inputs are ints or floats.
 
         # Final values, all integer.
         # s and us fit in 32-bit signed ints; d isn't bounded.
@@ -839,8 +838,7 @@
             if 0 < o <= _MAXORDINAL:
                 return date.fromordinal(o)
             raise OverflowError("result out of range")
-        raise TypeError
-        # XXX Should be 'return NotImplemented', but there's a bug in 2.2...
+        return NotImplemented
 
     __radd__ = __add__
 
@@ -1112,7 +1110,6 @@
                        (other.__hour, other.__minute, other.__second,
                         other.__microsecond))
         if myoff is None or otoff is None:
-            # XXX Buggy in 2.2.2.
             raise TypeError("cannot compare naive and aware times")
         myhhmm = self.__hour * 60 + self.__minute - myoff
         othhmm = other.__hour * 60 + other.__minute - otoff
@@ -1287,9 +1284,11 @@
 time.resolution = timedelta(microseconds=1)
 
 class datetime(date):
+    """datetime(year, month, day[, hour[, minute[, second[, microsecond[,tzinfo]]]]])
 
-    # XXX needs docstrings
-    # See http://www.zope.org/Members/fdrake/DateTimeWiki/TimeZoneInfo
+    The year, month and day arguments are required. tzinfo may be None, or an
+    instance of a tzinfo subclass. The remaining arguments may be ints or longs.
+    """
 
     __slots__ = date.__slots__ + (
         '__hour', '__minute', '__second',
@@ -1667,7 +1666,6 @@
                         other.__hour, other.__minute, other.__second,
                         other.__microsecond))
         if myoff is None or otoff is None:
-            # XXX Buggy in 2.2.2.
             raise TypeError("cannot compare naive and aware datetimes")
         # XXX What follows could be done more efficiently...
         diff = self - other     # this will take offsets into account

From python-checkins at python.org  Fri Jul  2 23:44:16 2010
From: python-checkins at python.org (eric.smith)
Date: Fri,  2 Jul 2010 23:44:16 +0200 (CEST)
Subject: [Python-checkins] r82455 - python/trunk/Doc/library/string.rst
Message-ID: <20100702214416.CB4C2D280@mail.python.org>

Author: eric.smith
Date: Fri Jul  2 23:44:16 2010
New Revision: 82455

Log:
Moved period outside paren, where it belongs.

Modified:
   python/trunk/Doc/library/string.rst

Modified: python/trunk/Doc/library/string.rst
==============================================================================
--- python/trunk/Doc/library/string.rst	(original)
+++ python/trunk/Doc/library/string.rst	Fri Jul  2 23:44:16 2010
@@ -212,7 +212,7 @@
 
 The :meth:`str.format` method and the :class:`Formatter` class share the same
 syntax for format strings (although in the case of :class:`Formatter`,
-subclasses can define their own format string syntax.)
+subclasses can define their own format string syntax).
 
 Format strings contain "replacement fields" surrounded by curly braces ``{}``.
 Anything that is not contained in braces is considered literal text, which is

From python-checkins at python.org  Sat Jul  3 00:03:00 2010
From: python-checkins at python.org (brett.cannon)
Date: Sat,  3 Jul 2010 00:03:00 +0200 (CEST)
Subject: [Python-checkins] r82456 - in python/branches/py3k:
	Doc/glossary.rst Doc/library/dis.rst Misc/NEWS
Message-ID: <20100702220300.A3D3EF2EA@mail.python.org>

Author: brett.cannon
Date: Sat Jul  3 00:03:00 2010
New Revision: 82456

Log:
Some people have mistaken Python bytecode as being stable and unchanging. In
reality it's simply an implementation detail for CPython. This point is now
clearly documented in both the docs for dis and the glossary.

Closes issue #7829. Thanks to Terry Reedy for some initial suggestions on
wording.


Modified:
   python/branches/py3k/Doc/glossary.rst
   python/branches/py3k/Doc/library/dis.rst
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/glossary.rst
==============================================================================
--- python/branches/py3k/Doc/glossary.rst	(original)
+++ python/branches/py3k/Doc/glossary.rst	Sat Jul  3 00:03:00 2010
@@ -57,11 +57,14 @@
 
    bytecode
       Python source code is compiled into bytecode, the internal representation
-      of a Python program in the interpreter.  The bytecode is also cached in
-      ``.pyc`` and ``.pyo`` files so that executing the same file is faster the
-      second time (recompilation from source to bytecode can be avoided).  This
-      "intermediate language" is said to run on a :term:`virtual machine`
-      that executes the machine code corresponding to each bytecode.
+      of a Python program in the CPython interpreter.  The bytecode is also
+      cached in ``.pyc`` and ``.pyo`` files so that executing the same file is
+      faster the second time (recompilation from source to bytecode can be
+      avoided).  This "intermediate language" is said to run on a
+      :term:`virtual machine` that executes the machine code corresponding to
+      each bytecode. Do note that bytecodes are not expected to work between
+      different Python virtual machines, nor to be stable between Python
+      releases.
 
    class
       A template for creating user-defined objects. Class definitions

Modified: python/branches/py3k/Doc/library/dis.rst
==============================================================================
--- python/branches/py3k/Doc/library/dis.rst	(original)
+++ python/branches/py3k/Doc/library/dis.rst	Sat Jul  3 00:03:00 2010
@@ -5,12 +5,13 @@
    :synopsis: Disassembler for Python bytecode.
 
 
-The :mod:`dis` module supports the analysis of Python :term:`bytecode` by
-disassembling it.  Since there is no Python assembler, this module defines the
-Python assembly language.  The Python bytecode which this module takes as an
+The :mod:`dis` module supports the analysis of CPython :term:`bytecode` by
+disassembling it. The CPython bytecode which this module takes as an
 input is defined in the file :file:`Include/opcode.h` and used by the compiler
 and the interpreter.
 
+.. warning:: Bytecode is an implementation detail of the CPython interpreter!  No guarantees are made that bytecode will not be added, removed, or changed between versions of Python. Use of this module should not be considered to work across Python VMs or Python releases.
+
 Example: Given the function :func:`myfunc`::
 
    def myfunc(alist):

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Jul  3 00:03:00 2010
@@ -468,6 +468,9 @@
 Library
 -------
 
+- Issue #7829: Clearly document that the dis module is exposing an
+  implementation detail that is not stable between Python VMs or releases.
+
 - Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor 
   raises an exception.
 

From python-checkins at python.org  Sat Jul  3 00:17:29 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Jul 2010 00:17:29 +0200 (CEST)
Subject: [Python-checkins] r82457 - python/trunk/Doc/library/string.rst
Message-ID: <20100702221729.626C9EDA6@mail.python.org>

Author: ezio.melotti
Date: Sat Jul  3 00:17:29 2010
New Revision: 82457

Log:
#9139: Add examples for str.format().

Modified:
   python/trunk/Doc/library/string.rst

Modified: python/trunk/Doc/library/string.rst
==============================================================================
--- python/trunk/Doc/library/string.rst	(original)
+++ python/trunk/Doc/library/string.rst	Sat Jul  3 00:17:29 2010
@@ -201,7 +201,7 @@
    .. method:: convert_field(value, conversion)
 
       Converts the value (returned by :meth:`get_field`) given a conversion type
-      (as in the tuple returned by the :meth:`parse` method.)  The default
+      (as in the tuple returned by the :meth:`parse` method).  The default
       version understands 'r' (repr) and 's' (str) conversion types.
 
 
@@ -238,6 +238,8 @@
 preceded by an exclamation point ``'!'``, and a *format_spec*, which is preceded
 by a colon ``':'``.  These specify a non-default format for the replacement value.
 
+See also the :ref:`formatspec` section.
+
 The *field_name* itself begins with an *arg_name* that is either either a number or a
 keyword.  If it's a number, it refers to a positional argument, and if it's a keyword,
 it refers to a named keyword argument.  If the numerical arg_names in a format string
@@ -248,6 +250,10 @@
 attribute using :func:`getattr`, while an expression of the form ``'[index]'``
 does an index lookup using :func:`__getitem__`.
 
+.. versionchanged:: 2.7
+   The positional argument specifiers can be omitted, so ``'{} {}'`` is
+   equivalent to ``'{0} {1}'``.
+
 Some simple format string examples::
 
    "First, thou shalt count to {0}" # References first positional argument
@@ -286,26 +292,7 @@
 format_spec are substituted before the *format_spec* string is interpreted.
 This allows the formatting of a value to be dynamically specified.
 
-For example, suppose you wanted to have a replacement field whose field width is
-determined by another variable::
-
-   "A man with two {0:{1}}".format("noses", 10)
-
-This would first evaluate the inner replacement field, making the format string
-effectively::
-
-   "A man with two {0:10}"
-
-Then the outer replacement field would be evaluated, producing::
-
-   "noses     "
-
-Which is substituted into the string, yielding::
-
-   "A man with two noses     "
-
-(The extra space is because we specified a field width of 10, and because left
-alignment is the default for strings.)
+See the :ref:`formatexamples` section for some examples.
 
 
 .. _formatspec:
@@ -315,7 +302,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 built-in
+: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.
 
@@ -349,7 +336,7 @@
    | Option  | Meaning                                                  |
    +=========+==========================================================+
    | ``'<'`` | Forces the field to be left-aligned within the available |
-   |         | space (This is the default.)                             |
+   |         | space (this is the default).                             |
    +---------+----------------------------------------------------------+
    | ``'>'`` | Forces the field to be right-aligned within the          |
    |         | available space.                                         |
@@ -505,6 +492,148 @@
    +---------+----------------------------------------------------------+
 
 
+
+.. _formatexamples:
+
+Format examples
+^^^^^^^^^^^^^^^
+
+This section contains examples of the new format syntax and comparison with
+the old ``%``-formatting.
+
+In most of the cases the syntax is similar to the old ``%``-formatting, with the
+addition of the ``{}`` and with ``:`` used instead of ``%``.
+For example, ``'%03.2f'`` can be translated to ``'{:03.2f}'``.
+
+The new format syntax also supports new and different options, shown in the
+follow examples.
+
+Accessing arguments by position::
+
+   >>> '{0}, {1}, {2}'.format('a', 'b', 'c')
+   'a, b, c'
+   >>> '{}, {}, {}'.format('a', 'b', 'c')  # 2.7+ only
+   'a, b, c'
+   >>> '{2}, {1}, {0}'.format('a', 'b', 'c')
+   'c, b, a'
+   >>> '{2}, {1}, {0}'.format(*'abc')      # unpacking argument sequence
+   'c, b, a'
+   >>> '{0}{1}{0}'.format('abra', 'cad')   # arguments' indices can be repeated
+   'abracadabra'
+
+Accessing arguments by name::
+
+   >>> 'Coordinates: {latitude}, {longitude}'.format(latitude='37.24N', longitude='-115.81W')
+   'Coordinates: 37.24N, -115.81W'
+   >>> coord = {'latitude': '37.24N', 'longitude': '-115.81W'}
+   >>> 'Coordinates: {latitude}, {longitude}'.format(**coord)
+   'Coordinates: 37.24N, -115.81W'
+
+Accessing arguments' attributes::
+
+   >>> ('The complex number {0} is formed from the real part {0.real} '
+   ...  'and the imaginary part {0.imag}.').format(c)
+   'The complex number (3-5j) is formed from the real part 3.0 and the imaginary part -5.0.'
+   >>> class Point(object):
+   ...     def __init__(self, x, y):
+   ...         self.x, self.y = x, y
+   ...     def __str__(self):
+   ...         return 'Point({self.x}, {self.y})'.format(self=self)
+   ...
+   >>> str(Point(4, 2))
+   'Point(4, 2)'
+
+
+Accessing arguments' items::
+
+   >>> coord = (3, 5)
+   >>> 'X: {0[0]};  Y: {0[1]}'.format(coord)
+   'X: 3;  Y: 5'
+
+Replacing ``%s`` and ``%r``::
+
+   >>> "repr() shows quotes: {!r}; str() doesn't: {!s}".format('test1', 'test2')
+   "repr() shows quotes: 'test1'; str() doesn't: test2"
+
+Aligning the text and specifying a width::
+
+   >>> '{:<30}'.format('left aligned')
+   'left aligned                  '
+   >>> '{:>30}'.format('right aligned')
+   '                 right aligned'
+   >>> '{:^30}'.format('centered')
+   '           centered           '
+   >>> '{:*^30}'.format('centered')  # use '*' as a fill char
+   '***********centered***********'
+
+Replacing ``%+f``, ``%-f``, and ``% f`` and specifying a sign::
+
+   >>> '{:+f}; {:+f}'.format(3.14, -3.14)  # show it always
+   '+3.140000; -3.140000'
+   >>> '{: f}; {: f}'.format(3.14, -3.14)  # show a space for positive numbers
+   ' 3.140000; -3.140000'
+   >>> '{:-f}; {:-f}'.format(3.14, -3.14)  # show only the minus -- same as '{:f}; {:f}'
+   '3.140000; -3.140000'
+
+Replacing ``%x`` and ``%o`` and converting the value to different bases::
+
+   >>> # format also supports binary numbers
+   >>> "int: {0:d};  hex: {0:x};  oct: {0:o};  bin: {0:b}".format(42)
+   'int: 42;  hex: 2a;  oct: 52;  bin: 101010'
+   >>> # with 0x, 0o, or 0b as prefix:
+   >>> "int: {0:d};  hex: {0:#x};  oct: {0:#o};  bin: {0:#b}".format(42)
+   'int: 42;  hex: 0x2a;  oct: 0o52;  bin: 0b101010'
+
+Using the comma as a thousands separator::
+
+   >>> '{:,}'.format(1234567890)
+   '1,234,567,890'
+
+Expressing a percentage::
+
+   >>> points = 19.5
+   >>> total = 22
+   >>> 'Correct answers: {:.2%}.'.format(points/total)
+   'Correct answers: 88.64%'
+
+Using type-specific formatting::
+
+   >>> import datetime
+   >>> d = datetime.datetime(2010, 7, 4, 12, 15, 58)
+   >>> '{:%Y-%m-%d %H:%M:%S}'.format(d)
+   '2010-07-04 12:15:58'
+
+Nesting arguments and more complex examples::
+
+   >>> for align, text in zip('<^>', ['left', 'center', 'right']):
+   ...     '{0:{align}{fill}16}'.format(text, fill=align, align=align)
+   ...
+   'left<<<<<<<<<<<<'
+   '^^^^^center^^^^^'
+   '>>>>>>>>>>>right'
+   >>>
+   >>> octets = [192, 168, 0, 1]
+   >>> '{:02X}{:02X}{:02X}{:02X}'.format(*octets)
+   'C0A80001'
+   >>> int(_, 16)
+   3232235521
+   >>>
+   >>> width = 5
+   >>> for num in range(5,12):
+   ...     for base in 'dXob':
+   ...         print '{0:{width}{base}}'.format(num, base=base, width=width),
+   ...     print
+   ...
+       5     5     5   101
+       6     6     6   110
+       7     7     7   111
+       8     8    10  1000
+       9     9    11  1001
+      10     A    12  1010
+      11     B    13  1011
+
+
+
 Template strings
 ----------------
 

From python-checkins at python.org  Sat Jul  3 00:24:55 2010
From: python-checkins at python.org (eric.smith)
Date: Sat,  3 Jul 2010 00:24:55 +0200 (CEST)
Subject: [Python-checkins] r82458 - in python/branches/release26-maint:
	Doc/library/string.rst
Message-ID: <20100702222455.0D699EE2C@mail.python.org>

Author: eric.smith
Date: Sat Jul  3 00:24:54 2010
New Revision: 82458

Log:
Merged revisions 82455 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82455 | eric.smith | 2010-07-02 17:44:16 -0400 (Fri, 02 Jul 2010) | 1 line
  
  Moved period outside paren, where it belongs.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/string.rst

Modified: python/branches/release26-maint/Doc/library/string.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/string.rst	(original)
+++ python/branches/release26-maint/Doc/library/string.rst	Sat Jul  3 00:24:54 2010
@@ -212,7 +212,7 @@
 
 The :meth:`str.format` method and the :class:`Formatter` class share the same
 syntax for format strings (although in the case of :class:`Formatter`,
-subclasses can define their own format string syntax.)
+subclasses can define their own format string syntax).
 
 Format strings contain "replacement fields" surrounded by curly braces ``{}``.
 Anything that is not contained in braces is considered literal text, which is

From python-checkins at python.org  Sat Jul  3 00:50:39 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Jul 2010 00:50:39 +0200 (CEST)
Subject: [Python-checkins] r82459 - python/trunk/Doc/library/string.rst
Message-ID: <20100702225039.8B07DECE2@mail.python.org>

Author: ezio.melotti
Date: Sat Jul  3 00:50:39 2010
New Revision: 82459

Log:
#9139: the thousands separator is new in 2.7.  Also add a missing variable in the example.

Modified:
   python/trunk/Doc/library/string.rst

Modified: python/trunk/Doc/library/string.rst
==============================================================================
--- python/trunk/Doc/library/string.rst	(original)
+++ python/trunk/Doc/library/string.rst	Sat Jul  3 00:50:39 2010
@@ -378,6 +378,9 @@
 For a locale aware separator, use the ``'n'`` integer presentation type
 instead.
 
+.. versionchanged:: 2.7
+   Added the ``','`` option (see also :pep:`378`).
+
 *width* is a decimal integer defining the minimum field width.  If not
 specified, then the field width will be determined by the content.
 
@@ -531,6 +534,7 @@
 
 Accessing arguments' attributes::
 
+   >>> c = 3-5j
    >>> ('The complex number {0} is formed from the real part {0.real} '
    ...  'and the imaginary part {0.imag}.').format(c)
    'The complex number (3-5j) is formed from the real part 3.0 and the imaginary part -5.0.'

From python-checkins at python.org  Sat Jul  3 00:58:12 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Jul 2010 00:58:12 +0200 (CEST)
Subject: [Python-checkins] r82460 - in python/branches/release26-maint:
	Doc/library/string.rst
Message-ID: <20100702225812.E6C31DB2A@mail.python.org>

Author: ezio.melotti
Date: Sat Jul  3 00:58:12 2010
New Revision: 82460

Log:
Merged revisions 82457,82459 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82457 | ezio.melotti | 2010-07-03 01:17:29 +0300 (Sat, 03 Jul 2010) | 1 line
  
  #9139: Add examples for str.format().
........
  r82459 | ezio.melotti | 2010-07-03 01:50:39 +0300 (Sat, 03 Jul 2010) | 1 line
  
  #9139: the thousands separator is new in 2.7.  Also add a missing variable in the example.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/string.rst

Modified: python/branches/release26-maint/Doc/library/string.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/string.rst	(original)
+++ python/branches/release26-maint/Doc/library/string.rst	Sat Jul  3 00:58:12 2010
@@ -201,7 +201,7 @@
    .. method:: convert_field(value, conversion)
 
       Converts the value (returned by :meth:`get_field`) given a conversion type
-      (as in the tuple returned by the :meth:`parse` method.)  The default
+      (as in the tuple returned by the :meth:`parse` method).  The default
       version understands 'r' (repr) and 's' (str) conversion types.
 
 
@@ -236,6 +236,8 @@
 preceded by an exclamation point ``'!'``, and a *format_spec*, which is preceded
 by a colon ``':'``.
 
+See also the :ref:`formatspec` section.
+
 The *field_name* itself begins with either a number or a keyword.  If it's a
 number, it refers to a positional argument, and if it's a keyword it refers to a
 named keyword argument.  This can be followed by any number of index or
@@ -279,26 +281,7 @@
 format_spec are substituted before the *format_spec* string is interpreted.
 This allows the formatting of a value to be dynamically specified.
 
-For example, suppose you wanted to have a replacement field whose field width is
-determined by another variable::
-
-   "A man with two {0:{1}}".format("noses", 10)
-
-This would first evaluate the inner replacement field, making the format string
-effectively::
-
-   "A man with two {0:10}"
-
-Then the outer replacement field would be evaluated, producing::
-
-   "noses     "
-
-Which is substituted into the string, yielding::
-
-   "A man with two noses     "
-
-(The extra space is because we specified a field width of 10, and because left
-alignment is the default for strings.)
+See the :ref:`formatexamples` section for some examples.
 
 
 .. _formatspec:
@@ -308,7 +291,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 built-in
+: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.
 
@@ -342,7 +325,7 @@
    | Option  | Meaning                                                  |
    +=========+==========================================================+
    | ``'<'`` | Forces the field to be left-aligned within the available |
-   |         | space (This is the default.)                             |
+   |         | space (this is the default).                             |
    +---------+----------------------------------------------------------+
    | ``'>'`` | Forces the field to be right-aligned within the          |
    |         | available space.                                         |
@@ -494,6 +477,142 @@
    +---------+----------------------------------------------------------+
 
 
+
+.. _formatexamples:
+
+Format examples
+^^^^^^^^^^^^^^^
+
+This section contains examples of the new format syntax and comparison with
+the old ``%``-formatting.
+
+In most of the cases the syntax is similar to the old ``%``-formatting, with the
+addition of the ``{}`` and with ``:`` used instead of ``%``.
+For example, ``'%03.2f'`` can be translated to ``'{0:03.2f}'``.
+
+The new format syntax also supports new and different options, shown in the
+follow examples.
+
+Accessing arguments by position::
+
+   >>> '{0}, {1}, {2}'.format('a', 'b', 'c')
+   'a, b, c'
+   >>> '{2}, {1}, {0}'.format('a', 'b', 'c')
+   'c, b, a'
+   >>> '{2}, {1}, {0}'.format(*'abc')      # unpacking argument sequence
+   'c, b, a'
+   >>> '{0}{1}{0}'.format('abra', 'cad')   # arguments' indices can be repeated
+   'abracadabra'
+
+Accessing arguments by name::
+
+   >>> 'Coordinates: {latitude}, {longitude}'.format(latitude='37.24N', longitude='-115.81W')
+   'Coordinates: 37.24N, -115.81W'
+   >>> coord = {'latitude': '37.24N', 'longitude': '-115.81W'}
+   >>> 'Coordinates: {latitude}, {longitude}'.format(**coord)
+   'Coordinates: 37.24N, -115.81W'
+
+Accessing arguments' attributes::
+
+   >>> c = 3-5j
+   >>> ('The complex number {0} is formed from the real part {0.real} '
+   ...  'and the imaginary part {0.imag}.').format(c)
+   'The complex number (3-5j) is formed from the real part 3.0 and the imaginary part -5.0.'
+   >>> class Point(object):
+   ...     def __init__(self, x, y):
+   ...         self.x, self.y = x, y
+   ...     def __str__(self):
+   ...         return 'Point({self.x}, {self.y})'.format(self=self)
+   ...
+   >>> str(Point(4, 2))
+   'Point(4, 2)'
+
+
+Accessing arguments' items::
+
+   >>> coord = (3, 5)
+   >>> 'X: {0[0]};  Y: {0[1]}'.format(coord)
+   'X: 3;  Y: 5'
+
+Replacing ``%s`` and ``%r``::
+
+   >>> "repr() shows quotes: {0!r}; str() doesn't: {1!s}".format('test1', 'test2')
+   "repr() shows quotes: 'test1'; str() doesn't: test2"
+
+Aligning the text and specifying a width::
+
+   >>> '{0:<30}'.format('left aligned')
+   'left aligned                  '
+   >>> '{0:>30}'.format('right aligned')
+   '                 right aligned'
+   >>> '{0:^30}'.format('centered')
+   '           centered           '
+   >>> '{0:*^30}'.format('centered')  # use '*' as a fill char
+   '***********centered***********'
+
+Replacing ``%+f``, ``%-f``, and ``% f`` and specifying a sign::
+
+   >>> '{0:+f}; {0:+f}'.format(3.14, -3.14)  # show it always
+   '+3.140000; -3.140000'
+   >>> '{0: f}; {0: f}'.format(3.14, -3.14)  # show a space for positive numbers
+   ' 3.140000; -3.140000'
+   >>> '{0:-f}; {0:-f}'.format(3.14, -3.14)  # show only the minus -- same as '{0:f}; {0:f}'
+   '3.140000; -3.140000'
+
+Replacing ``%x`` and ``%o`` and converting the value to different bases::
+
+   >>> # format also supports binary numbers
+   >>> "int: {0:d};  hex: {0:x};  oct: {0:o};  bin: {0:b}".format(42)
+   'int: 42;  hex: 2a;  oct: 52;  bin: 101010'
+   >>> # with 0x, 0o, or 0b as prefix:
+   >>> "int: {0:d};  hex: {0:#x};  oct: {0:#o};  bin: {0:#b}".format(42)
+   'int: 42;  hex: 0x2a;  oct: 0o52;  bin: 0b101010'
+
+Expressing a percentage::
+
+   >>> points = 19.5
+   >>> total = 22
+   >>> 'Correct answers: {0:.2%}.'.format(points/total)
+   'Correct answers: 88.64%'
+
+Using type-specific formatting::
+
+   >>> import datetime
+   >>> d = datetime.datetime(2010, 7, 4, 12, 15, 58)
+   >>> '{0:%Y-%m-%d %H:%M:%S}'.format(d)
+   '2010-07-04 12:15:58'
+
+Nesting arguments and more complex examples::
+
+   >>> for align, text in zip('<^>', ['left', 'center', 'right']):
+   ...     '{0:{align}{fill}16}'.format(text, fill=align, align=align)
+   ...
+   'left<<<<<<<<<<<<'
+   '^^^^^center^^^^^'
+   '>>>>>>>>>>>right'
+   >>>
+   >>> octets = [192, 168, 0, 1]
+   >>> '{0:02X}{1:02X}{2:02X}{3:02X}'.format(*octets)
+   'C0A80001'
+   >>> int(_, 16)
+   3232235521
+   >>>
+   >>> width = 5
+   >>> for num in range(5,12):
+   ...     for base in 'dXob':
+   ...         print '{0:{width}{base}}'.format(num, base=base, width=width),
+   ...     print
+   ...
+       5     5     5   101
+       6     6     6   110
+       7     7     7   111
+       8     8    10  1000
+       9     9    11  1001
+      10     A    12  1010
+      11     B    13  1011
+
+
+
 Template strings
 ----------------
 

From python-checkins at python.org  Sat Jul  3 01:05:28 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 01:05:28 +0200 (CEST)
Subject: [Python-checkins] r82461 - python/trunk/Lib/test/test_float.py
Message-ID: <20100702230528.2BC9FEDE7@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 01:05:27 2010
New Revision: 82461

Log:
don't require the presence of __getformat__ or __setformat__; use requires_IEEE_754 globally

Modified:
   python/trunk/Lib/test/test_float.py

Modified: python/trunk/Lib/test/test_float.py
==============================================================================
--- python/trunk/Lib/test/test_float.py	(original)
+++ python/trunk/Lib/test/test_float.py	Sat Jul  3 01:05:27 2010
@@ -12,8 +12,13 @@
 INF = float("inf")
 NAN = float("nan")
 
+have_getformat = hasattr(float, "__getformat__")
+requires_getformat = unittest.skipUnless(have_getformat,
+                                         "requires __getformat__")
+requires_setformat = unittest.skipUnless(hasattr(float, "__setformat__"),
+                                         "requires __setformat__")
 # decorator for skipping tests on non-IEEE 754 platforms
-requires_IEEE_754 = unittest.skipUnless(
+requires_IEEE_754 = unittest.skipUnless(have_getformat and
     float.__getformat__("double").startswith("IEEE"),
     "test requires IEEE 754 doubles")
 
@@ -357,6 +362,7 @@
             #self.assertTrue(0.0 > pow_op(-2.0, -1047) > -1e-315)
 
 
+ at requires_setformat
 class FormatFunctionsTestCase(unittest.TestCase):
 
     def setUp(self):
@@ -407,6 +413,7 @@
 # on non-IEEE platforms, attempting to unpack a bit pattern
 # representing an infinity or a NaN should raise an exception.
 
+ at requires_setformat
 class UnknownFormatTestCase(unittest.TestCase):
     def setUp(self):
         self.save_formats = {'double':float.__getformat__('double'),
@@ -439,41 +446,42 @@
 # let's also try to guarantee that -0.0 and 0.0 don't get confused.
 
 class IEEEFormatTestCase(unittest.TestCase):
-    if float.__getformat__("double").startswith("IEEE"):
-        def test_double_specials_do_unpack(self):
-            for fmt, data in [('>d', BE_DOUBLE_INF),
-                              ('>d', BE_DOUBLE_NAN),
-                              ('<d', LE_DOUBLE_INF),
-                              ('<d', LE_DOUBLE_NAN)]:
-                struct.unpack(fmt, data)
-
-    if float.__getformat__("float").startswith("IEEE"):
-        def test_float_specials_do_unpack(self):
-            for fmt, data in [('>f', BE_FLOAT_INF),
-                              ('>f', BE_FLOAT_NAN),
-                              ('<f', LE_FLOAT_INF),
-                              ('<f', LE_FLOAT_NAN)]:
-                struct.unpack(fmt, data)
-
-    if float.__getformat__("double").startswith("IEEE"):
-        def test_negative_zero(self):
-            def pos_pos():
-                return 0.0, math.atan2(0.0, -1)
-            def pos_neg():
-                return 0.0, math.atan2(-0.0, -1)
-            def neg_pos():
-                return -0.0, math.atan2(0.0, -1)
-            def neg_neg():
-                return -0.0, math.atan2(-0.0, -1)
-            self.assertEquals(pos_pos(), neg_pos())
-            self.assertEquals(pos_neg(), neg_neg())
-
-    if float.__getformat__("double").startswith("IEEE"):
-        def test_underflow_sign(self):
-            # check that -1e-1000 gives -0.0, not 0.0
-            self.assertEquals(math.atan2(-1e-1000, -1), math.atan2(-0.0, -1))
-            self.assertEquals(math.atan2(float('-1e-1000'), -1),
-                              math.atan2(-0.0, -1))
+
+    @requires_IEEE_754
+    def test_double_specials_do_unpack(self):
+        for fmt, data in [('>d', BE_DOUBLE_INF),
+                          ('>d', BE_DOUBLE_NAN),
+                          ('<d', LE_DOUBLE_INF),
+                          ('<d', LE_DOUBLE_NAN)]:
+            struct.unpack(fmt, data)
+
+    @requires_IEEE_754
+    def test_float_specials_do_unpack(self):
+        for fmt, data in [('>f', BE_FLOAT_INF),
+                          ('>f', BE_FLOAT_NAN),
+                          ('<f', LE_FLOAT_INF),
+                          ('<f', LE_FLOAT_NAN)]:
+            struct.unpack(fmt, data)
+
+    @requires_IEEE_754
+    def test_negative_zero(self):
+        def pos_pos():
+            return 0.0, math.atan2(0.0, -1)
+        def pos_neg():
+            return 0.0, math.atan2(-0.0, -1)
+        def neg_pos():
+            return -0.0, math.atan2(0.0, -1)
+        def neg_neg():
+            return -0.0, math.atan2(-0.0, -1)
+        self.assertEquals(pos_pos(), neg_pos())
+        self.assertEquals(pos_neg(), neg_neg())
+
+    @requires_IEEE_754
+    def test_underflow_sign(self):
+        # check that -1e-1000 gives -0.0, not 0.0
+        self.assertEquals(math.atan2(-1e-1000, -1), math.atan2(-0.0, -1))
+        self.assertEquals(math.atan2(float('-1e-1000'), -1),
+                          math.atan2(-0.0, -1))
 
     def test_format(self):
         # these should be rewritten to use both format(x, spec) and
@@ -530,8 +538,7 @@
         self.assertEqual('{0:f}'.format(NAN), 'nan')
         self.assertEqual('{0:F}'.format(NAN), 'NAN')
 
-    @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
-                         "test requires IEEE 754 doubles")
+    @requires_IEEE_754
     def test_format_testfile(self):
         for line in open(format_testfile):
             if line.startswith('--'):
@@ -613,8 +620,8 @@
             self.assertEqual(s, repr(float(s)))
             self.assertEqual(negs, repr(float(negs)))
 
- at unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
-                     "test requires IEEE 754 doubles")
+
+ at requires_IEEE_754
 class RoundTestCase(unittest.TestCase):
     def test_second_argument_type(self):
         # any type with an __index__ method should be permitted as
@@ -752,8 +759,8 @@
         self.assertAlmostEqual(round(0.5e22, -22), 1e22)
         self.assertAlmostEqual(round(1.5e22, -22), 2e22)
 
-    @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
-                         "test requires IEEE 754 doubles")
+
+    @requires_IEEE_754
     def test_format_specials(self):
         # Test formatting of nans and infs.
 

From python-checkins at python.org  Sat Jul  3 01:18:52 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Jul 2010 01:18:52 +0200 (CEST)
Subject: [Python-checkins] r82462 - in python/branches/py3k:
	Doc/library/string.rst
Message-ID: <20100702231852.00B8EEDB4@mail.python.org>

Author: ezio.melotti
Date: Sat Jul  3 01:18:51 2010
New Revision: 82462

Log:
Merged revisions 82455,82457,82459 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82455 | eric.smith | 2010-07-03 00:44:16 +0300 (Sat, 03 Jul 2010) | 1 line
  
  Moved period outside paren, where it belongs.
........
  r82457 | ezio.melotti | 2010-07-03 01:17:29 +0300 (Sat, 03 Jul 2010) | 1 line
  
  #9139: Add examples for str.format().
........
  r82459 | ezio.melotti | 2010-07-03 01:50:39 +0300 (Sat, 03 Jul 2010) | 1 line
  
  #9139: the thousands separator is new in 2.7.  Also add a missing variable in the example.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/string.rst

Modified: python/branches/py3k/Doc/library/string.rst
==============================================================================
--- python/branches/py3k/Doc/library/string.rst	(original)
+++ python/branches/py3k/Doc/library/string.rst	Sat Jul  3 01:18:51 2010
@@ -174,7 +174,7 @@
    .. method:: convert_field(value, conversion)
 
       Converts the value (returned by :meth:`get_field`) given a conversion type
-      (as in the tuple returned by the :meth:`parse` method.)  The default
+      (as in the tuple returned by the :meth:`parse` method).  The default
       version understands 'r' (repr) and 's' (str) conversion types.
 
 
@@ -185,7 +185,7 @@
 
 The :meth:`str.format` method and the :class:`Formatter` class share the same
 syntax for format strings (although in the case of :class:`Formatter`,
-subclasses can define their own format string syntax.)
+subclasses can define their own format string syntax).
 
 Format strings contain "replacement fields" surrounded by curly braces ``{}``.
 Anything that is not contained in braces is considered literal text, which is
@@ -211,6 +211,8 @@
 preceded by an exclamation point ``'!'``, and a *format_spec*, which is preceded
 by a colon ``':'``.  These specify a non-default format for the replacement value.
 
+See also the :ref:`formatspec` section.
+
 The *field_name* itself begins with an *arg_name* that is either either a number or a
 keyword.  If it's a number, it refers to a positional argument, and if it's a keyword,
 it refers to a named keyword argument.  If the numerical arg_names in a format string
@@ -221,6 +223,10 @@
 attribute using :func:`getattr`, while an expression of the form ``'[index]'``
 does an index lookup using :func:`__getitem__`.
 
+.. versionchanged:: 3.1
+   The positional argument specifiers can be omitted, so ``'{} {}'`` is
+   equivalent to ``'{0} {1}'``.
+
 Some simple format string examples::
 
    "First, thou shalt count to {0}" # References first positional argument
@@ -261,26 +267,7 @@
 format_spec are substituted before the *format_spec* string is interpreted.
 This allows the formatting of a value to be dynamically specified.
 
-For example, suppose you wanted to have a replacement field whose field width is
-determined by another variable::
-
-   "A man with two {0:{1}}".format("noses", 10)
-
-This would first evaluate the inner replacement field, making the format string
-effectively::
-
-   "A man with two {0:10}"
-
-Then the outer replacement field would be evaluated, producing::
-
-   "noses     "
-
-Which is substituted into the string, yielding::
-
-   "A man with two noses     "
-
-(The extra space is because we specified a field width of 10, and because left
-alignment is the default for strings.)
+See the :ref:`formatexamples` section for some examples.
 
 
 .. _formatspec:
@@ -290,7 +277,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 built-in
+: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.
 
@@ -324,7 +311,7 @@
    | Option  | Meaning                                                  |
    +=========+==========================================================+
    | ``'<'`` | Forces the field to be left-aligned within the available |
-   |         | space (This is the default.)                             |
+   |         | space (this is the default).                             |
    +---------+----------------------------------------------------------+
    | ``'>'`` | Forces the field to be right-aligned within the          |
    |         | available space.                                         |
@@ -366,6 +353,9 @@
 For a locale aware separator, use the ``'n'`` integer presentation type
 instead.
 
+.. versionchanged:: 3.1
+   Added the ``','`` option (see also :pep:`378`).
+
 *width* is a decimal integer defining the minimum field width.  If not
 specified, then the field width will be determined by the content.
 
@@ -484,6 +474,147 @@
    +---------+----------------------------------------------------------+
 
 
+.. _formatexamples:
+
+Format examples
+^^^^^^^^^^^^^^^
+
+This section contains examples of the new format syntax and comparison with
+the old ``%``-formatting.
+
+In most of the cases the syntax is similar to the old ``%``-formatting, with the
+addition of the ``{}`` and with ``:`` used instead of ``%``.
+For example, ``'%03.2f'`` can be translated to ``'{:03.2f}'``.
+
+The new format syntax also supports new and different options, shown in the
+follow examples.
+
+Accessing arguments by position::
+
+   >>> '{0}, {1}, {2}'.format('a', 'b', 'c')
+   'a, b, c'
+   >>> '{}, {}, {}'.format('a', 'b', 'c')  # 3.1+ only
+   'a, b, c'
+   >>> '{2}, {1}, {0}'.format('a', 'b', 'c')
+   'c, b, a'
+   >>> '{2}, {1}, {0}'.format(*'abc')      # unpacking argument sequence
+   'c, b, a'
+   >>> '{0}{1}{0}'.format('abra', 'cad')   # arguments' indices can be repeated
+   'abracadabra'
+
+Accessing arguments by name::
+
+   >>> 'Coordinates: {latitude}, {longitude}'.format(latitude='37.24N', longitude='-115.81W')
+   'Coordinates: 37.24N, -115.81W'
+   >>> coord = {'latitude': '37.24N', 'longitude': '-115.81W'}
+   >>> 'Coordinates: {latitude}, {longitude}'.format(**coord)
+   'Coordinates: 37.24N, -115.81W'
+
+Accessing arguments' attributes::
+
+   >>> c = 3-5j
+   >>> ('The complex number {0} is formed from the real part {0.real} '
+   ...  'and the imaginary part {0.imag}.').format(c)
+   'The complex number (3-5j) is formed from the real part 3.0 and the imaginary part -5.0.'
+   >>> class Point:
+   ...     def __init__(self, x, y):
+   ...         self.x, self.y = x, y
+   ...     def __str__(self):
+   ...         return 'Point({self.x}, {self.y})'.format(self=self)
+   ...
+   >>> str(Point(4, 2))
+   'Point(4, 2)'
+
+Accessing arguments' items::
+
+   >>> coord = (3, 5)
+   >>> 'X: {0[0]};  Y: {0[1]}'.format(coord)
+   'X: 3;  Y: 5'
+
+Replacing ``%s`` and ``%r``::
+
+   >>> "repr() shows quotes: {!r}; str() doesn't: {!s}".format('test1', 'test2')
+   "repr() shows quotes: 'test1'; str() doesn't: test2"
+
+Aligning the text and specifying a width::
+
+   >>> '{:<30}'.format('left aligned')
+   'left aligned                  '
+   >>> '{:>30}'.format('right aligned')
+   '                 right aligned'
+   >>> '{:^30}'.format('centered')
+   '           centered           '
+   >>> '{:*^30}'.format('centered')  # use '*' as a fill char
+   '***********centered***********'
+
+Replacing ``%+f``, ``%-f``, and ``% f`` and specifying a sign::
+
+   >>> '{:+f}; {:+f}'.format(3.14, -3.14)  # show it always
+   '+3.140000; -3.140000'
+   >>> '{: f}; {: f}'.format(3.14, -3.14)  # show a space for positive numbers
+   ' 3.140000; -3.140000'
+   >>> '{:-f}; {:-f}'.format(3.14, -3.14)  # show only the minus -- same as '{:f}; {:f}'
+   '3.140000; -3.140000'
+
+Replacing ``%x`` and ``%o`` and converting the value to different bases::
+
+   >>> # format also supports binary numbers
+   >>> "int: {0:d};  hex: {0:x};  oct: {0:o};  bin: {0:b}".format(42)
+   'int: 42;  hex: 2a;  oct: 52;  bin: 101010'
+   >>> # with 0x, 0o, or 0b as prefix:
+   >>> "int: {0:d};  hex: {0:#x};  oct: {0:#o};  bin: {0:#b}".format(42)
+   'int: 42;  hex: 0x2a;  oct: 0o52;  bin: 0b101010'
+
+Using the comma as a thousands separator::
+
+   >>> '{:,}'.format(1234567890)
+   '1,234,567,890'
+
+Expressing a percentage::
+
+   >>> points = 19
+   >>> total = 22
+   >>> 'Correct answers: {:.2%}.'.format(points/total)
+   'Correct answers: 86.36%'
+
+Using type-specific formatting::
+
+   >>> import datetime
+   >>> d = datetime.datetime(2010, 7, 4, 12, 15, 58)
+   >>> '{:%Y-%m-%d %H:%M:%S}'.format(d)
+   '2010-07-04 12:15:58'
+
+Nesting arguments and more complex examples::
+
+   >>> for align, text in zip('<^>', ['left', 'center', 'right']):
+   ...     '{0:{align}{fill}16}'.format(text, fill=align, align=align)
+   ...
+   'left<<<<<<<<<<<<'
+   '^^^^^center^^^^^'
+   '>>>>>>>>>>>right'
+   >>>
+   >>> octets = [192, 168, 0, 1]
+   >>> '{:02X}{:02X}{:02X}{:02X}'.format(*octets)
+   'C0A80001'
+   >>> int(_, 16)
+   3232235521
+   >>>
+   >>> width = 5
+   >>> for num in range(5,12):
+   ...     for base in 'dXob':
+   ...         print('{0:{width}{base}}'.format(num, base=base, width=width), end=' ')
+   ...     print()
+   ...
+       5     5     5   101
+       6     6     6   110
+       7     7     7   111
+       8     8    10  1000
+       9     9    11  1001
+      10     A    12  1010
+      11     B    13  1011
+
+
+
 .. _template-strings:
 
 Template strings

From python-checkins at python.org  Sat Jul  3 01:22:04 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Jul 2010 01:22:04 +0200 (CEST)
Subject: [Python-checkins] r82463 - in python/branches/release31-maint:
	Doc/library/string.rst
Message-ID: <20100702232204.0A0D4EF9F@mail.python.org>

Author: ezio.melotti
Date: Sat Jul  3 01:22:03 2010
New Revision: 82463

Log:
Merged revisions 82462 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/branches/py3k

................
  r82462 | ezio.melotti | 2010-07-03 02:18:51 +0300 (Sat, 03 Jul 2010) | 17 lines
  
  Merged revisions 82455,82457,82459 via svnmerge from 
  svn+ssh://pythondev at svn.python.org/python/trunk
  
  ........
    r82455 | eric.smith | 2010-07-03 00:44:16 +0300 (Sat, 03 Jul 2010) | 1 line
    
    Moved period outside paren, where it belongs.
  ........
    r82457 | ezio.melotti | 2010-07-03 01:17:29 +0300 (Sat, 03 Jul 2010) | 1 line
    
    #9139: Add examples for str.format().
  ........
    r82459 | ezio.melotti | 2010-07-03 01:50:39 +0300 (Sat, 03 Jul 2010) | 1 line
    
    #9139: the thousands separator is new in 2.7.  Also add a missing variable in the example.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/string.rst

Modified: python/branches/release31-maint/Doc/library/string.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/string.rst	(original)
+++ python/branches/release31-maint/Doc/library/string.rst	Sat Jul  3 01:22:03 2010
@@ -174,7 +174,7 @@
    .. method:: convert_field(value, conversion)
 
       Converts the value (returned by :meth:`get_field`) given a conversion type
-      (as in the tuple returned by the :meth:`parse` method.)  The default
+      (as in the tuple returned by the :meth:`parse` method).  The default
       version understands 'r' (repr) and 's' (str) conversion types.
 
 
@@ -185,7 +185,7 @@
 
 The :meth:`str.format` method and the :class:`Formatter` class share the same
 syntax for format strings (although in the case of :class:`Formatter`,
-subclasses can define their own format string syntax.)
+subclasses can define their own format string syntax).
 
 Format strings contain "replacement fields" surrounded by curly braces ``{}``.
 Anything that is not contained in braces is considered literal text, which is
@@ -211,6 +211,8 @@
 preceded by an exclamation point ``'!'``, and a *format_spec*, which is preceded
 by a colon ``':'``.  These specify a non-default format for the replacement value.
 
+See also the :ref:`formatspec` section.
+
 The *field_name* itself begins with an *arg_name* that is either either a number or a
 keyword.  If it's a number, it refers to a positional argument, and if it's a keyword,
 it refers to a named keyword argument.  If the numerical arg_names in a format string
@@ -221,6 +223,10 @@
 attribute using :func:`getattr`, while an expression of the form ``'[index]'``
 does an index lookup using :func:`__getitem__`.
 
+.. versionchanged:: 3.1
+   The positional argument specifiers can be omitted, so ``'{} {}'`` is
+   equivalent to ``'{0} {1}'``.
+
 Some simple format string examples::
 
    "First, thou shalt count to {0}" # References first positional argument
@@ -261,26 +267,7 @@
 format_spec are substituted before the *format_spec* string is interpreted.
 This allows the formatting of a value to be dynamically specified.
 
-For example, suppose you wanted to have a replacement field whose field width is
-determined by another variable::
-
-   "A man with two {0:{1}}".format("noses", 10)
-
-This would first evaluate the inner replacement field, making the format string
-effectively::
-
-   "A man with two {0:10}"
-
-Then the outer replacement field would be evaluated, producing::
-
-   "noses     "
-
-Which is substituted into the string, yielding::
-
-   "A man with two noses     "
-
-(The extra space is because we specified a field width of 10, and because left
-alignment is the default for strings.)
+See the :ref:`formatexamples` section for some examples.
 
 
 .. _formatspec:
@@ -290,7 +277,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 built-in
+: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.
 
@@ -324,7 +311,7 @@
    | Option  | Meaning                                                  |
    +=========+==========================================================+
    | ``'<'`` | Forces the field to be left-aligned within the available |
-   |         | space (This is the default.)                             |
+   |         | space (this is the default).                             |
    +---------+----------------------------------------------------------+
    | ``'>'`` | Forces the field to be right-aligned within the          |
    |         | available space.                                         |
@@ -366,6 +353,9 @@
 For a locale aware separator, use the ``'n'`` integer presentation type
 instead.
 
+.. versionchanged:: 3.1
+   Added the ``','`` option (see also :pep:`378`).
+
 *width* is a decimal integer defining the minimum field width.  If not
 specified, then the field width will be determined by the content.
 
@@ -484,6 +474,147 @@
    +---------+----------------------------------------------------------+
 
 
+.. _formatexamples:
+
+Format examples
+^^^^^^^^^^^^^^^
+
+This section contains examples of the new format syntax and comparison with
+the old ``%``-formatting.
+
+In most of the cases the syntax is similar to the old ``%``-formatting, with the
+addition of the ``{}`` and with ``:`` used instead of ``%``.
+For example, ``'%03.2f'`` can be translated to ``'{:03.2f}'``.
+
+The new format syntax also supports new and different options, shown in the
+follow examples.
+
+Accessing arguments by position::
+
+   >>> '{0}, {1}, {2}'.format('a', 'b', 'c')
+   'a, b, c'
+   >>> '{}, {}, {}'.format('a', 'b', 'c')  # 3.1+ only
+   'a, b, c'
+   >>> '{2}, {1}, {0}'.format('a', 'b', 'c')
+   'c, b, a'
+   >>> '{2}, {1}, {0}'.format(*'abc')      # unpacking argument sequence
+   'c, b, a'
+   >>> '{0}{1}{0}'.format('abra', 'cad')   # arguments' indices can be repeated
+   'abracadabra'
+
+Accessing arguments by name::
+
+   >>> 'Coordinates: {latitude}, {longitude}'.format(latitude='37.24N', longitude='-115.81W')
+   'Coordinates: 37.24N, -115.81W'
+   >>> coord = {'latitude': '37.24N', 'longitude': '-115.81W'}
+   >>> 'Coordinates: {latitude}, {longitude}'.format(**coord)
+   'Coordinates: 37.24N, -115.81W'
+
+Accessing arguments' attributes::
+
+   >>> c = 3-5j
+   >>> ('The complex number {0} is formed from the real part {0.real} '
+   ...  'and the imaginary part {0.imag}.').format(c)
+   'The complex number (3-5j) is formed from the real part 3.0 and the imaginary part -5.0.'
+   >>> class Point:
+   ...     def __init__(self, x, y):
+   ...         self.x, self.y = x, y
+   ...     def __str__(self):
+   ...         return 'Point({self.x}, {self.y})'.format(self=self)
+   ...
+   >>> str(Point(4, 2))
+   'Point(4, 2)'
+
+Accessing arguments' items::
+
+   >>> coord = (3, 5)
+   >>> 'X: {0[0]};  Y: {0[1]}'.format(coord)
+   'X: 3;  Y: 5'
+
+Replacing ``%s`` and ``%r``::
+
+   >>> "repr() shows quotes: {!r}; str() doesn't: {!s}".format('test1', 'test2')
+   "repr() shows quotes: 'test1'; str() doesn't: test2"
+
+Aligning the text and specifying a width::
+
+   >>> '{:<30}'.format('left aligned')
+   'left aligned                  '
+   >>> '{:>30}'.format('right aligned')
+   '                 right aligned'
+   >>> '{:^30}'.format('centered')
+   '           centered           '
+   >>> '{:*^30}'.format('centered')  # use '*' as a fill char
+   '***********centered***********'
+
+Replacing ``%+f``, ``%-f``, and ``% f`` and specifying a sign::
+
+   >>> '{:+f}; {:+f}'.format(3.14, -3.14)  # show it always
+   '+3.140000; -3.140000'
+   >>> '{: f}; {: f}'.format(3.14, -3.14)  # show a space for positive numbers
+   ' 3.140000; -3.140000'
+   >>> '{:-f}; {:-f}'.format(3.14, -3.14)  # show only the minus -- same as '{:f}; {:f}'
+   '3.140000; -3.140000'
+
+Replacing ``%x`` and ``%o`` and converting the value to different bases::
+
+   >>> # format also supports binary numbers
+   >>> "int: {0:d};  hex: {0:x};  oct: {0:o};  bin: {0:b}".format(42)
+   'int: 42;  hex: 2a;  oct: 52;  bin: 101010'
+   >>> # with 0x, 0o, or 0b as prefix:
+   >>> "int: {0:d};  hex: {0:#x};  oct: {0:#o};  bin: {0:#b}".format(42)
+   'int: 42;  hex: 0x2a;  oct: 0o52;  bin: 0b101010'
+
+Using the comma as a thousands separator::
+
+   >>> '{:,}'.format(1234567890)
+   '1,234,567,890'
+
+Expressing a percentage::
+
+   >>> points = 19
+   >>> total = 22
+   >>> 'Correct answers: {:.2%}.'.format(points/total)
+   'Correct answers: 86.36%'
+
+Using type-specific formatting::
+
+   >>> import datetime
+   >>> d = datetime.datetime(2010, 7, 4, 12, 15, 58)
+   >>> '{:%Y-%m-%d %H:%M:%S}'.format(d)
+   '2010-07-04 12:15:58'
+
+Nesting arguments and more complex examples::
+
+   >>> for align, text in zip('<^>', ['left', 'center', 'right']):
+   ...     '{0:{align}{fill}16}'.format(text, fill=align, align=align)
+   ...
+   'left<<<<<<<<<<<<'
+   '^^^^^center^^^^^'
+   '>>>>>>>>>>>right'
+   >>>
+   >>> octets = [192, 168, 0, 1]
+   >>> '{:02X}{:02X}{:02X}{:02X}'.format(*octets)
+   'C0A80001'
+   >>> int(_, 16)
+   3232235521
+   >>>
+   >>> width = 5
+   >>> for num in range(5,12):
+   ...     for base in 'dXob':
+   ...         print('{0:{width}{base}}'.format(num, base=base, width=width), end=' ')
+   ...     print()
+   ...
+       5     5     5   101
+       6     6     6   110
+       7     7     7   111
+       8     8    10  1000
+       9     9    11  1001
+      10     A    12  1010
+      11     B    13  1011
+
+
+
 .. _template-strings:
 
 Template strings

From solipsis at pitrou.net  Sat Jul  3 01:24:54 2010
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat,  3 Jul 2010 01:24:54 +0200 (CEST)
Subject: [Python-checkins] Daily py3k reference leaks (r82452): sum=0
Message-ID: <20100702232454.3921F1770A@ns6635.ovh.net>

py3k results for svn r82452 (hg cset 799649587872)
--------------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflog8d1xYz', '-x']

From python-checkins at python.org  Sat Jul  3 01:25:44 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 01:25:44 +0200 (CEST)
Subject: [Python-checkins] r82464 - in python/branches/py3k:
	Lib/test/test_float.py
Message-ID: <20100702232544.950A4EE98A@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 01:25:44 2010
New Revision: 82464

Log:
Merged revisions 82461 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82461 | benjamin.peterson | 2010-07-02 18:05:27 -0500 (Fri, 02 Jul 2010) | 1 line
  
  don't require the presence of __getformat__ or __setformat__; use requires_IEEE_754 globally
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_float.py

Modified: python/branches/py3k/Lib/test/test_float.py
==============================================================================
--- python/branches/py3k/Lib/test/test_float.py	(original)
+++ python/branches/py3k/Lib/test/test_float.py	Sat Jul  3 01:25:44 2010
@@ -11,8 +11,13 @@
 INF = float("inf")
 NAN = float("nan")
 
+have_getformat = hasattr(float, "__getformat__")
+requires_getformat = unittest.skipUnless(have_getformat,
+                                         "requires __getformat__")
+requires_setformat = unittest.skipUnless(hasattr(float, "__setformat__"),
+                                         "requires __setformat__")
 # decorator for skipping tests on non-IEEE 754 platforms
-requires_IEEE_754 = unittest.skipUnless(
+requires_IEEE_754 = unittest.skipUnless(have_getformat and
     float.__getformat__("double").startswith("IEEE"),
     "test requires IEEE 754 doubles")
 
@@ -377,6 +382,7 @@
             #self.assertTrue(0.0 > pow_op(-2.0, -1047) > -1e-315)
 
 
+ at requires_setformat
 class FormatFunctionsTestCase(unittest.TestCase):
 
     def setUp(self):
@@ -427,6 +433,7 @@
 # on non-IEEE platforms, attempting to unpack a bit pattern
 # representing an infinity or a NaN should raise an exception.
 
+ at requires_setformat
 class UnknownFormatTestCase(unittest.TestCase):
     def setUp(self):
         self.save_formats = {'double':float.__getformat__('double'),
@@ -459,36 +466,25 @@
 # let's also try to guarantee that -0.0 and 0.0 don't get confused.
 
 class IEEEFormatTestCase(unittest.TestCase):
-    if float.__getformat__("double").startswith("IEEE"):
-        def test_double_specials_do_unpack(self):
-            for fmt, data in [('>d', BE_DOUBLE_INF),
-                              ('>d', BE_DOUBLE_NAN),
-                              ('<d', LE_DOUBLE_INF),
-                              ('<d', LE_DOUBLE_NAN)]:
-                struct.unpack(fmt, data)
-
-    if float.__getformat__("float").startswith("IEEE"):
-        def test_float_specials_do_unpack(self):
-            for fmt, data in [('>f', BE_FLOAT_INF),
-                              ('>f', BE_FLOAT_NAN),
-                              ('<f', LE_FLOAT_INF),
-                              ('<f', LE_FLOAT_NAN)]:
-                struct.unpack(fmt, data)
-
-    if float.__getformat__("double").startswith("IEEE"):
-        def test_negative_zero(self):
-            def pos_pos():
-                return 0.0, math.atan2(0.0, -1)
-            def pos_neg():
-                return 0.0, math.atan2(-0.0, -1)
-            def neg_pos():
-                return -0.0, math.atan2(0.0, -1)
-            def neg_neg():
-                return -0.0, math.atan2(-0.0, -1)
-            self.assertEquals(pos_pos(), neg_pos())
-            self.assertEquals(pos_neg(), neg_neg())
+
+    @requires_IEEE_754
+    def test_double_specials_do_unpack(self):
+        for fmt, data in [('>d', BE_DOUBLE_INF),
+                          ('>d', BE_DOUBLE_NAN),
+                          ('<d', LE_DOUBLE_INF),
+                          ('<d', LE_DOUBLE_NAN)]:
+            struct.unpack(fmt, data)
+
+    @requires_IEEE_754
+    def test_float_specials_do_unpack(self):
+        for fmt, data in [('>f', BE_FLOAT_INF),
+                          ('>f', BE_FLOAT_NAN),
+                          ('<f', LE_FLOAT_INF),
+                          ('<f', LE_FLOAT_NAN)]:
+            struct.unpack(fmt, data)
 
 class FormatTestCase(unittest.TestCase):
+
     def test_format(self):
         # these should be rewritten to use both format(x, spec) and
         # x.__format__(spec)
@@ -542,8 +538,7 @@
         self.assertEqual(format(INF, 'f'), 'inf')
         self.assertEqual(format(INF, 'F'), 'INF')
 
-    @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
-                         "test requires IEEE 754 doubles")
+    @requires_IEEE_754
     def test_format_testfile(self):
         for line in open(format_testfile):
             if line.startswith('--'):
@@ -623,9 +618,10 @@
             self.assertEqual(s, repr(float(s)))
             self.assertEqual(negs, repr(float(negs)))
 
+
+ at requires_IEEE_754
 class RoundTestCase(unittest.TestCase):
-    @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
-                         "test requires IEEE 754 doubles")
+
     def test_inf_nan(self):
         self.assertRaises(OverflowError, round, INF)
         self.assertRaises(OverflowError, round, -INF)
@@ -635,8 +631,6 @@
         self.assertRaises(TypeError, round, NAN, "ceci n'est pas un integer")
         self.assertRaises(TypeError, round, -0.0, 1j)
 
-    @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
-                         "test requires IEEE 754 doubles")
     def test_large_n(self):
         for n in [324, 325, 400, 2**31-1, 2**31, 2**32, 2**100]:
             self.assertEqual(round(123.456, n), 123.456)
@@ -649,8 +643,6 @@
         self.assertEqual(round(1e150, 309), 1e150)
         self.assertEqual(round(1.4e-315, 315), 1e-315)
 
-    @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
-                         "test requires IEEE 754 doubles")
     def test_small_n(self):
         for n in [-308, -309, -400, 1-2**31, -2**31, -2**31-1, -2**100]:
             self.assertEqual(round(123.456, n), 0.0)
@@ -658,8 +650,6 @@
             self.assertEqual(round(1e300, n), 0.0)
             self.assertEqual(round(1e-320, n), 0.0)
 
-    @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
-                         "test requires IEEE 754 doubles")
     def test_overflow(self):
         self.assertRaises(OverflowError, round, 1.6e308, -308)
         self.assertRaises(OverflowError, round, -1.7e308, -308)
@@ -707,9 +697,6 @@
             self.assertEqual(float(format(x, '.2f')), round(x, 2))
             self.assertEqual(float(format(x, '.3f')), round(x, 3))
 
-
-    @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
-                         "test requires IEEE 754 doubles")
     def test_format_specials(self):
         # Test formatting of nans and infs.
 

From python-checkins at python.org  Sat Jul  3 03:32:48 2010
From: python-checkins at python.org (brett.cannon)
Date: Sat,  3 Jul 2010 03:32:48 +0200 (CEST)
Subject: [Python-checkins] r82465 -
	python/branches/py3k/Lib/test/test_import.py
Message-ID: <20100703013248.A037FEE98E@mail.python.org>

Author: brett.cannon
Date: Sat Jul  3 03:32:48 2010
New Revision: 82465

Log:
Make test_import a little bit more robust for cleaning up after itself in the
face of a failure.


Modified:
   python/branches/py3k/Lib/test/test_import.py

Modified: python/branches/py3k/Lib/test/test_import.py
==============================================================================
--- python/branches/py3k/Lib/test/test_import.py	(original)
+++ python/branches/py3k/Lib/test/test_import.py	Sat Jul  3 03:32:48 2010
@@ -147,22 +147,24 @@
         filename = module + '.py'
 
         # Create a file with a list of 65000 elements.
-        with open(filename, 'w+') as f:
+        with open(filename, 'w') as f:
             f.write('d = [\n')
             for i in range(65000):
                 f.write('"",\n')
             f.write(']')
 
-        # Compile & remove .py file; we only need .pyc (or .pyo).
-        # Bytecode must be relocated from the PEP 3147 bytecode-only location.
-        py_compile.compile(filename)
-        unlink(filename)
-        make_legacy_pyc(filename)
+        try:
+            # Compile & remove .py file; we only need .pyc (or .pyo).
+            # Bytecode must be relocated from the PEP 3147 bytecode-only location.
+            py_compile.compile(filename)
+        finally:
+            unlink(filename)
 
         # Need to be able to load from current dir.
         sys.path.append('')
 
         try:
+            make_legacy_pyc(filename)
             # This used to crash.
             exec('import ' + module)
         finally:

From alexander.belopolsky at gmail.com  Sat Jul  3 04:12:35 2010
From: alexander.belopolsky at gmail.com (Alexander Belopolsky)
Date: Fri, 2 Jul 2010 22:12:35 -0400
Subject: [Python-checkins] r81681 - python/trunk/Modules/datetimemodule.c
In-Reply-To: <20100604015127.1C135EEBFB@mail.python.org>
References: <20100604015127.1C135EEBFB@mail.python.org>
Message-ID: <AANLkTin7jluKBNv2xGKYaTA2bxnMkSjiNqnQMIWUh06d@mail.gmail.com>

On Thu, Jun 3, 2010 at 9:51 PM, sean.reifschneider
<python-checkins at python.org> wrote:
> Author: sean.reifschneider
> Date: Fri Jun ?4 03:51:26 2010
> New Revision: 81681
>
> Log:
> Issue8810: Clearing up docstring for tzinfo.utcoffset.
..
> ? ? {"fromutc", ? ? ? ? (PyCFunction)tzinfo_fromutc, ? ? ? ? ? ?METH_O,
> - ? ? PyDoc_STR("datetime in UTC -> datetime in local time.")},
> + ? ? PyDoc_STR("datetime -> timedelta showing offset from UTC, negative "
> + ? ? ? ? ? "values indicating West of UTC")},

This is wrong.  The fromutc method returns datetime, not timedelta.
See http://docs.python.org/dev/library/datetime.html#datetime.tzinfo.fromutc

From python-checkins at python.org  Sat Jul  3 05:27:13 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Sat,  3 Jul 2010 05:27:13 +0200 (CEST)
Subject: [Python-checkins] r82466 - python/trunk/Modules/datetimemodule.c
Message-ID: <20100703032713.1D5F1F1AE@mail.python.org>

Author: alexander.belopolsky
Date: Sat Jul  3 05:27:12 2010
New Revision: 82466

Log:
Revert r81681 (issue 8810).

Modified:
   python/trunk/Modules/datetimemodule.c

Modified: python/trunk/Modules/datetimemodule.c
==============================================================================
--- python/trunk/Modules/datetimemodule.c	(original)
+++ python/trunk/Modules/datetimemodule.c	Sat Jul  3 05:27:12 2010
@@ -3026,8 +3026,7 @@
      PyDoc_STR("datetime -> DST offset in minutes east of UTC.")},
 
     {"fromutc",         (PyCFunction)tzinfo_fromutc,            METH_O,
-     PyDoc_STR("datetime -> timedelta showing offset from UTC, negative "
-           "values indicating West of UTC")},
+     PyDoc_STR("datetime in UTC -> datetime in local time.")},
 
     {"__reduce__",  (PyCFunction)tzinfo_reduce,             METH_NOARGS,
      PyDoc_STR("-> (cls, state)")},

From python-checkins at python.org  Sat Jul  3 05:35:27 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Sat,  3 Jul 2010 05:35:27 +0200 (CEST)
Subject: [Python-checkins] r82467 - in python/branches/py3k:
	Modules/datetimemodule.c
Message-ID: <20100703033527.5FDA8EE990@mail.python.org>

Author: alexander.belopolsky
Date: Sat Jul  3 05:35:27 2010
New Revision: 82467

Log:
Merged revisions 82466 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82466 | alexander.belopolsky | 2010-07-02 23:27:12 -0400 (Fri, 02 Jul 2010) | 1 line
  
  Revert r81681 (issue 8810).
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Modules/datetimemodule.c

Modified: python/branches/py3k/Modules/datetimemodule.c
==============================================================================
--- python/branches/py3k/Modules/datetimemodule.c	(original)
+++ python/branches/py3k/Modules/datetimemodule.c	Sat Jul  3 05:35:27 2010
@@ -3277,8 +3277,7 @@
      PyDoc_STR("datetime -> DST offset in minutes east of UTC.")},
 
     {"fromutc",         (PyCFunction)tzinfo_fromutc,            METH_O,
-     PyDoc_STR("datetime -> timedelta showing offset from UTC, negative "
-           "values indicating West of UTC")},
+     PyDoc_STR("datetime in UTC -> datetime in local time.")},
 
     {"__reduce__",  (PyCFunction)tzinfo_reduce,             METH_NOARGS,
      PyDoc_STR("-> (cls, state)")},

From python-checkins at python.org  Sat Jul  3 06:52:19 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Jul 2010 06:52:19 +0200 (CEST)
Subject: [Python-checkins] r82468 -
	python/branches/py3k/Objects/unicodeobject.c
Message-ID: <20100703045219.96D74EFCB@mail.python.org>

Author: ezio.melotti
Date: Sat Jul  3 06:52:19 2010
New Revision: 82468

Log:
Update comment about surrogates.

Modified:
   python/branches/py3k/Objects/unicodeobject.c

Modified: python/branches/py3k/Objects/unicodeobject.c
==============================================================================
--- python/branches/py3k/Objects/unicodeobject.c	(original)
+++ python/branches/py3k/Objects/unicodeobject.c	Sat Jul  3 06:52:19 2010
@@ -2450,11 +2450,11 @@
             break;
 
         case 3:
-            /* XXX: surrogates shouldn't be valid UTF-8!
-               see http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf
-               (table 3-7) and http://www.rfc-editor.org/rfc/rfc3629.txt
-               Uncomment the 2 lines below to make them invalid,
-               codepoints: d800-dfff; UTF-8: \xed\xa0\x80-\xed\xbf\xbf. */
+            /* Decoding UTF-8 sequences in range \xed\xa0\x80-\xed\xbf\xbf
+               will result in surrogates in range d800-dfff. Surrogates are
+               not valid UTF-8 so they are rejected.
+               See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf
+               (table 3-7) and http://www.rfc-editor.org/rfc/rfc3629.txt */
             if ((s[1] & 0xc0) != 0x80 ||
                 (s[2] & 0xc0) != 0x80 ||
                 ((unsigned char)s[0] == 0xE0 &&

From python-checkins at python.org  Sat Jul  3 07:18:50 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Jul 2010 07:18:50 +0200 (CEST)
Subject: [Python-checkins] r82469 - in python/branches/release31-maint:
	Lib/test/test_codeccallbacks.py Lib/test/test_unicode.py
	Misc/NEWS Objects/unicodeobject.c
Message-ID: <20100703051850.DA94BF2CA@mail.python.org>

Author: ezio.melotti
Date: Sat Jul  3 07:18:50 2010
New Revision: 82469

Log:
Merged revisions 82413,82468 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/branches/py3k

........
  r82413 | ezio.melotti | 2010-07-01 10:32:02 +0300 (Thu, 01 Jul 2010) | 13 lines
  
  Update PyUnicode_DecodeUTF8 from RFC 2279 to RFC 3629.
  
  1) #8271: when a byte sequence is invalid, only the start byte and all the
     valid continuation bytes are now replaced by U+FFFD, instead of replacing
     the number of bytes specified by the start byte.
     See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf (pages 94-95);
  2) 5- and 6-bytes-long UTF-8 sequences are now considered invalid (no changes
     in behavior);
  3) Change the error messages "unexpected code byte" to "invalid start byte"
     and "invalid data" to "invalid continuation byte";
  4) Add an extensive set of tests in test_unicode;
  5) Fix test_codeccallbacks because it was failing after this change.
........
  r82468 | ezio.melotti | 2010-07-03 07:52:19 +0300 (Sat, 03 Jul 2010) | 1 line
  
  Update comment about surrogates.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_codeccallbacks.py
   python/branches/release31-maint/Lib/test/test_unicode.py
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Objects/unicodeobject.c

Modified: python/branches/release31-maint/Lib/test/test_codeccallbacks.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_codeccallbacks.py	(original)
+++ python/branches/release31-maint/Lib/test/test_codeccallbacks.py	Sat Jul  3 07:18:50 2010
@@ -153,28 +153,30 @@
             sout += bytes("\\U%08x" % sys.maxunicode, "ascii")
         self.assertEqual(sin.encode("iso-8859-15", "backslashreplace"), sout)
 
-    def test_decoderelaxedutf8(self):
-        # This is the test for a decoding callback handler,
-        # that relaxes the UTF-8 minimal encoding restriction.
-        # A null byte that is encoded as "\xc0\x80" will be
-        # decoded as a null byte. All other illegal sequences
-        # will be handled strictly.
+    def test_decoding_callbacks(self):
+        # This is a test for a decoding callback handler
+        # that allows the decoding of the invalid sequence
+        # "\xc0\x80" and returns "\x00" instead of raising an error.
+        # All other illegal sequences will be handled strictly.
         def relaxedutf8(exc):
             if not isinstance(exc, UnicodeDecodeError):
                 raise TypeError("don't know how to handle %r" % exc)
-            if exc.object[exc.start:exc.end].startswith(b"\xc0\x80"):
+            if exc.object[exc.start:exc.start+2] == b"\xc0\x80":
                 return ("\x00", exc.start+2) # retry after two bytes
             else:
                 raise exc
 
-        codecs.register_error(
-            "test.relaxedutf8", relaxedutf8)
+        codecs.register_error("test.relaxedutf8", relaxedutf8)
 
+        # all the "\xc0\x80" will be decoded to "\x00"
         sin = b"a\x00b\xc0\x80c\xc3\xbc\xc0\x80\xc0\x80"
         sout = "a\x00b\x00c\xfc\x00\x00"
         self.assertEqual(sin.decode("utf-8", "test.relaxedutf8"), sout)
+
+        # "\xc0\x81" is not valid and a UnicodeDecodeError will be raised
         sin = b"\xc0\x80\xc0\x81"
-        self.assertRaises(UnicodeError, sin.decode, "utf-8", "test.relaxedutf8")
+        self.assertRaises(UnicodeDecodeError, sin.decode,
+                          "utf-8", "test.relaxedutf8")
 
     def test_charmapencode(self):
         # For charmap encodings the replacement string will be

Modified: python/branches/release31-maint/Lib/test/test_unicode.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_unicode.py	(original)
+++ python/branches/release31-maint/Lib/test/test_unicode.py	Sat Jul  3 07:18:50 2010
@@ -948,6 +948,159 @@
         # * strict decoding testing for all of the
         #   UTF8_ERROR cases in PyUnicode_DecodeUTF8
 
+    def test_utf8_decode_valid_sequences(self):
+        sequences = [
+            # single byte
+            (b'\x00', '\x00'), (b'a', 'a'), (b'\x7f', '\x7f'),
+            # 2 bytes
+            (b'\xc2\x80', '\x80'), (b'\xdf\xbf', '\u07ff'),
+            # 3 bytes
+            (b'\xe0\xa0\x80', '\u0800'), (b'\xed\x9f\xbf', '\ud7ff'),
+            (b'\xee\x80\x80', '\uE000'), (b'\xef\xbf\xbf', '\uffff'),
+            # 4 bytes
+            (b'\xF0\x90\x80\x80', '\U00010000'),
+            (b'\xf4\x8f\xbf\xbf', '\U0010FFFF')
+        ]
+        for seq, res in sequences:
+            self.assertEqual(seq.decode('utf-8'), res)
+
+
+    def test_utf8_decode_invalid_sequences(self):
+        # continuation bytes in a sequence of 2, 3, or 4 bytes
+        continuation_bytes = [bytes([x]) for x in range(0x80, 0xC0)]
+        # start bytes of a 2-byte sequence equivalent to codepoints < 0x7F
+        invalid_2B_seq_start_bytes = [bytes([x]) for x in range(0xC0, 0xC2)]
+        # start bytes of a 4-byte sequence equivalent to codepoints > 0x10FFFF
+        invalid_4B_seq_start_bytes = [bytes([x]) for x in range(0xF5, 0xF8)]
+        invalid_start_bytes = (
+            continuation_bytes + invalid_2B_seq_start_bytes +
+            invalid_4B_seq_start_bytes + [bytes([x]) for x in range(0xF7, 0x100)]
+        )
+
+        for byte in invalid_start_bytes:
+            self.assertRaises(UnicodeDecodeError, byte.decode, 'utf-8')
+
+        for sb in invalid_2B_seq_start_bytes:
+            for cb in continuation_bytes:
+                self.assertRaises(UnicodeDecodeError, (sb+cb).decode, 'utf-8')
+
+        for sb in invalid_4B_seq_start_bytes:
+            for cb1 in continuation_bytes[:3]:
+                for cb3 in continuation_bytes[:3]:
+                    self.assertRaises(UnicodeDecodeError,
+                                      (sb+cb1+b'\x80'+cb3).decode, 'utf-8')
+
+        for cb in [bytes([x]) for x in range(0x80, 0xA0)]:
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xE0'+cb+b'\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xE0'+cb+b'\xBF').decode, 'utf-8')
+        # surrogates
+        for cb in [bytes([x]) for x in range(0xA0, 0xC0)]:
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xED'+cb+b'\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xED'+cb+b'\xBF').decode, 'utf-8')
+        for cb in [bytes([x]) for x in range(0x80, 0x90)]:
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xF0'+cb+b'\x80\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xF0'+cb+b'\xBF\xBF').decode, 'utf-8')
+        for cb in [bytes([x]) for x in range(0x90, 0xC0)]:
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xF4'+cb+b'\x80\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              (b'\xF4'+cb+b'\xBF\xBF').decode, 'utf-8')
+
+    def test_issue8271(self):
+        # Issue #8271: during the decoding of an invalid UTF-8 byte sequence,
+        # only the start byte and the continuation byte(s) are now considered
+        # invalid, instead of the number of bytes specified by the start byte.
+        # See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf (page 95,
+        # table 3-8, Row 2) for more information about the algorithm used.
+        FFFD = '\ufffd'
+        sequences = [
+            # invalid start bytes
+            (b'\x80', FFFD), # continuation byte
+            (b'\x80\x80', FFFD*2), # 2 continuation bytes
+            (b'\xc0', FFFD),
+            (b'\xc0\xc0', FFFD*2),
+            (b'\xc1', FFFD),
+            (b'\xc1\xc0', FFFD*2),
+            (b'\xc0\xc1', FFFD*2),
+            # with start byte of a 2-byte sequence
+            (b'\xc2', FFFD), # only the start byte
+            (b'\xc2\xc2', FFFD*2), # 2 start bytes
+            (b'\xc2\xc2\xc2', FFFD*3), # 2 start bytes
+            (b'\xc2\x41', FFFD+'A'), # invalid continuation byte
+            # with start byte of a 3-byte sequence
+            (b'\xe1', FFFD), # only the start byte
+            (b'\xe1\xe1', FFFD*2), # 2 start bytes
+            (b'\xe1\xe1\xe1', FFFD*3), # 3 start bytes
+            (b'\xe1\xe1\xe1\xe1', FFFD*4), # 4 start bytes
+            (b'\xe1\x80', FFFD), # only 1 continuation byte
+            (b'\xe1\x41', FFFD+'A'), # invalid continuation byte
+            (b'\xe1\x41\x80', FFFD+'A'+FFFD), # invalid cb followed by valid cb
+            (b'\xe1\x41\x41', FFFD+'AA'), # 2 invalid continuation bytes
+            (b'\xe1\x80\x41', FFFD+'A'), # only 1 valid continuation byte
+            (b'\xe1\x80\xe1\x41', FFFD*2+'A'), # 1 valid and the other invalid
+            (b'\xe1\x41\xe1\x80', FFFD+'A'+FFFD), # 1 invalid and the other valid
+            # with start byte of a 4-byte sequence
+            (b'\xf1', FFFD), # only the start byte
+            (b'\xf1\xf1', FFFD*2), # 2 start bytes
+            (b'\xf1\xf1\xf1', FFFD*3), # 3 start bytes
+            (b'\xf1\xf1\xf1\xf1', FFFD*4), # 4 start bytes
+            (b'\xf1\xf1\xf1\xf1\xf1', FFFD*5), # 5 start bytes
+            (b'\xf1\x80', FFFD), # only 1 continuation bytes
+            (b'\xf1\x80\x80', FFFD), # only 2 continuation bytes
+            (b'\xf1\x80\x41', FFFD+'A'), # 1 valid cb and 1 invalid
+            (b'\xf1\x80\x41\x41', FFFD+'AA'), # 1 valid cb and 1 invalid
+            (b'\xf1\x80\x80\x41', FFFD+'A'), # 2 valid cb and 1 invalid
+            (b'\xf1\x41\x80', FFFD+'A'+FFFD), # 1 invalid cv and 1 valid
+            (b'\xf1\x41\x80\x80', FFFD+'A'+FFFD*2), # 1 invalid cb and 2 invalid
+            (b'\xf1\x41\x80\x41', FFFD+'A'+FFFD+'A'), # 2 invalid cb and 1 invalid
+            (b'\xf1\x41\x41\x80', FFFD+'AA'+FFFD), # 1 valid cb and 1 invalid
+            (b'\xf1\x41\xf1\x80', FFFD+'A'+FFFD),
+            (b'\xf1\x41\x80\xf1', FFFD+'A'+FFFD*2),
+            (b'\xf1\xf1\x80\x41', FFFD*2+'A'),
+            (b'\xf1\x41\xf1\xf1', FFFD+'A'+FFFD*2),
+            # with invalid start byte of a 4-byte sequence (rfc2279)
+            (b'\xf5', FFFD), # only the start byte
+            (b'\xf5\xf5', FFFD*2), # 2 start bytes
+            (b'\xf5\x80', FFFD*2), # only 1 continuation byte
+            (b'\xf5\x80\x80', FFFD*3), # only 2 continuation byte
+            (b'\xf5\x80\x80\x80', FFFD*4), # 3 continuation bytes
+            (b'\xf5\x80\x41', FFFD*2+'A'), #  1 valid cb and 1 invalid
+            (b'\xf5\x80\x41\xf5', FFFD*2+'A'+FFFD),
+            (b'\xf5\x41\x80\x80\x41', FFFD+'A'+FFFD*2+'A'),
+            # with invalid start byte of a 5-byte sequence (rfc2279)
+            (b'\xf8', FFFD), # only the start byte
+            (b'\xf8\xf8', FFFD*2), # 2 start bytes
+            (b'\xf8\x80', FFFD*2), # only one continuation byte
+            (b'\xf8\x80\x41', FFFD*2 + 'A'), # 1 valid cb and 1 invalid
+            (b'\xf8\x80\x80\x80\x80', FFFD*5), # invalid 5 bytes seq with 5 bytes
+            # with invalid start byte of a 6-byte sequence (rfc2279)
+            (b'\xfc', FFFD), # only the start byte
+            (b'\xfc\xfc', FFFD*2), # 2 start bytes
+            (b'\xfc\x80\x80', FFFD*3), # only 2 continuation bytes
+            (b'\xfc\x80\x80\x80\x80\x80', FFFD*6), # 6 continuation bytes
+            # invalid start byte
+            (b'\xfe', FFFD),
+            (b'\xfe\x80\x80', FFFD*3),
+            # other sequences
+            (b'\xf1\x80\x41\x42\x43', '\ufffd\x41\x42\x43'),
+            (b'\xf1\x80\xff\x42\x43', '\ufffd\ufffd\x42\x43'),
+            (b'\xf1\x80\xc2\x81\x43', '\ufffd\x81\x43'),
+            (b'\x61\xF1\x80\x80\xE1\x80\xC2\x62\x80\x63\x80\xBF\x64',
+             '\x61\uFFFD\uFFFD\uFFFD\x62\uFFFD\x63\uFFFD\uFFFD\x64'),
+        ]
+        for n, (seq, res) in enumerate(sequences):
+            self.assertRaises(UnicodeDecodeError, seq.decode, 'utf-8', 'strict')
+            self.assertEqual(seq.decode('utf-8', 'replace'), res)
+            self.assertEqual((seq+b'b').decode('utf-8', 'replace'), res+'b')
+            self.assertEqual(seq.decode('utf-8', 'ignore'),
+                             res.replace('\uFFFD', ''))
+
     def test_codecs_idna(self):
         # Test whether trailing dot is preserved
         self.assertEqual("www.python.org.".encode("idna"), b"www.python.org.")

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sat Jul  3 07:18:50 2010
@@ -12,6 +12,14 @@
 Core and Builtins
 -----------------
 
+- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the
+  start byte and the continuation byte(s) are now considered invalid, instead
+  of the number of bytes specified by the start byte.
+  E.g.: '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and
+  replaces with U+FFFD only the start byte ('\xf1') and the continuation byte
+  ('\x80') even if '\xf1' is the start byte of a 4-bytes sequence.
+  Previous versions returned a single u'\ufffd'.
+
 - Issue #6543: Write the traceback in the terminal encoding instead of utf-8.
   Fix the encoding of the modules filename. Patch written by Amaury Forgeot
   d'Arc.

Modified: python/branches/release31-maint/Objects/unicodeobject.c
==============================================================================
--- python/branches/release31-maint/Objects/unicodeobject.c	(original)
+++ python/branches/release31-maint/Objects/unicodeobject.c	Sat Jul  3 07:18:50 2010
@@ -2147,24 +2147,24 @@
 
 static
 char utf8_code_length[256] = {
-    /* Map UTF-8 encoded prefix byte to sequence length.  zero means
-       illegal prefix.  see RFC 2279 for details */
+    /* Map UTF-8 encoded prefix byte to sequence length.  Zero means
+       illegal prefix.  See RFC 3629 for details */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 00-0F */
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 70-7F */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80-8F */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* B0-BF */
+    0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* C0-C1 + C2-CF */
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* D0-DF */
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* E0-EF */
+    4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0  /* F0-F4 + F5-FF */
 };
 
 PyObject *PyUnicode_DecodeUTF8(const char *s,
@@ -2194,6 +2194,7 @@
 {
     const char *starts = s;
     int n;
+    int k;
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
     Py_ssize_t outpos;
@@ -2277,7 +2278,9 @@
             else {
                 errmsg = "unexpected end of data";
                 startinpos = s-starts;
-                endinpos = size;
+                endinpos = startinpos+1;
+                for (k=1; (k < size-startinpos) && ((s[k]&0xC0) == 0x80); k++)
+                    endinpos++;
                 goto utf8Error;
             }
         }
@@ -2285,7 +2288,7 @@
         switch (n) {
 
         case 0:
-            errmsg = "unexpected code byte";
+            errmsg = "invalid start byte";
             startinpos = s-starts;
             endinpos = startinpos+1;
             goto utf8Error;
@@ -2298,63 +2301,67 @@
 
         case 2:
             if ((s[1] & 0xc0) != 0x80) {
-                errmsg = "invalid data";
+                errmsg = "invalid continuation byte";
                 startinpos = s-starts;
-                endinpos = startinpos+2;
+                endinpos = startinpos + 1;
                 goto utf8Error;
             }
             ch = ((s[0] & 0x1f) << 6) + (s[1] & 0x3f);
-            if (ch < 0x80) {
-                startinpos = s-starts;
-                endinpos = startinpos+2;
-                errmsg = "illegal encoding";
-                goto utf8Error;
-            }
-            else
-                *p++ = (Py_UNICODE)ch;
+            assert ((ch > 0x007F) && (ch <= 0x07FF));
+            *p++ = (Py_UNICODE)ch;
             break;
 
         case 3:
+            /* Decoding UTF-8 sequences in range \xed\xa0\x80-\xed\xbf\xbf
+               will result in surrogates in range d800-dfff. Surrogates are
+               not valid UTF-8 so they are rejected.
+               See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf
+               (table 3-7) and http://www.rfc-editor.org/rfc/rfc3629.txt */
             if ((s[1] & 0xc0) != 0x80 ||
-                (s[2] & 0xc0) != 0x80) {
-                errmsg = "invalid data";
+                (s[2] & 0xc0) != 0x80 ||
+                ((unsigned char)s[0] == 0xE0 &&
+                 (unsigned char)s[1] < 0xA0) ||
+                ((unsigned char)s[0] == 0xED &&
+                 (unsigned char)s[1] > 0x9F)) {
+                errmsg = "invalid continuation byte";
                 startinpos = s-starts;
-                endinpos = startinpos+3;
+                endinpos = startinpos + 1;
+
+                /* if s[1] first two bits are 1 and 0, then the invalid
+                   continuation byte is s[2], so increment endinpos by 1,
+                   if not, s[1] is invalid and endinpos doesn't need to
+                   be incremented. */
+                if ((s[1] & 0xC0) == 0x80)
+                    endinpos++;
                 goto utf8Error;
             }
             ch = ((s[0] & 0x0f) << 12) + ((s[1] & 0x3f) << 6) + (s[2] & 0x3f);
-            if (ch < 0x0800 || (ch >= 0xd800 && ch <= 0xDFFF)) {
-                errmsg = "illegal encoding";
-                startinpos = s-starts;
-                endinpos = startinpos+3;
-                goto utf8Error;
-            }
-            else
-                *p++ = (Py_UNICODE)ch;
+            assert ((ch > 0x07FF) && (ch <= 0xFFFF));
+            *p++ = (Py_UNICODE)ch;
             break;
 
         case 4:
             if ((s[1] & 0xc0) != 0x80 ||
                 (s[2] & 0xc0) != 0x80 ||
-                (s[3] & 0xc0) != 0x80) {
-                errmsg = "invalid data";
+                (s[3] & 0xc0) != 0x80 ||
+                ((unsigned char)s[0] == 0xF0 &&
+                 (unsigned char)s[1] < 0x90) ||
+                ((unsigned char)s[0] == 0xF4 &&
+                 (unsigned char)s[1] > 0x8F)) {
+                errmsg = "invalid continuation byte";
                 startinpos = s-starts;
-                endinpos = startinpos+4;
+                endinpos = startinpos + 1;
+                if ((s[1] & 0xC0) == 0x80) {
+                    endinpos++;
+                    if ((s[2] & 0xC0) == 0x80)
+                        endinpos++;
+                }
                 goto utf8Error;
             }
             ch = ((s[0] & 0x7) << 18) + ((s[1] & 0x3f) << 12) +
-                ((s[2] & 0x3f) << 6) + (s[3] & 0x3f);
-            /* validate and convert to UTF-16 */
-            if ((ch < 0x10000)        /* minimum value allowed for 4
-                                         byte encoding */
-                || (ch > 0x10ffff))   /* maximum value allowed for
-                                         UTF-16 */
-            {
-                errmsg = "illegal encoding";
-                startinpos = s-starts;
-                endinpos = startinpos+4;
-                goto utf8Error;
-            }
+                 ((s[2] & 0x3f) << 6) + (s[3] & 0x3f);
+            assert ((ch > 0xFFFF) && (ch <= 0x10ffff));
+
 #ifdef Py_UNICODE_WIDE
             *p++ = (Py_UNICODE)ch;
 #else
@@ -2370,13 +2377,6 @@
             *p++ = (Py_UNICODE)(0xDC00 + (ch & 0x03FF));
 #endif
             break;
-
-        default:
-            /* Other sizes are only needed for UCS-4 */
-            errmsg = "unsupported Unicode code range";
-            startinpos = s-starts;
-            endinpos = startinpos+n;
-            goto utf8Error;
         }
         s += n;
         continue;

From python-checkins at python.org  Sat Jul  3 07:34:39 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Jul 2010 07:34:39 +0200 (CEST)
Subject: [Python-checkins] r82470 - in python/branches/release26-maint:
	Lib/test/test_codeccallbacks.py Lib/test/test_unicode.py
	Misc/NEWS Objects/unicodeobject.c
Message-ID: <20100703053439.74482EE996@mail.python.org>

Author: ezio.melotti
Date: Sat Jul  3 07:34:39 2010
New Revision: 82470

Log:
Merged revisions 81758-81759 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r81758 | ezio.melotti | 2010-06-05 20:51:07 +0300 (Sat, 05 Jun 2010) | 15 lines
  
  Update PyUnicode_DecodeUTF8 from RFC 2279 to RFC 3629.
  
  1) #8271: when a byte sequence is invalid, only the start byte and all the
     valid continuation bytes are now replaced by U+FFFD, instead of replacing
     the number of bytes specified by the start byte.
     See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf (pages 94-95);
  2) 5- and 6-bytes-long UTF-8 sequences are now considered invalid (no changes
     in behavior);
  3) Add code and tests to reject surrogates (U+D800-U+DFFF) as defined in
     RFC 3629, but leave it commented out since it's not backward compatible;
  4) Change the error messages "unexpected code byte" to "invalid start byte"
     and "invalid data" to "invalid continuation byte";
  5) Add an extensive set of tests in test_unicode;
  6) Fix test_codeccallbacks because it was failing after this change.
........
  r81759 | ezio.melotti | 2010-06-05 22:21:32 +0300 (Sat, 05 Jun 2010) | 1 line
  
  Add a NEWS entry for r81758 and clarify a comment.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_codeccallbacks.py
   python/branches/release26-maint/Lib/test/test_unicode.py
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Objects/unicodeobject.c

Modified: python/branches/release26-maint/Lib/test/test_codeccallbacks.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_codeccallbacks.py	(original)
+++ python/branches/release26-maint/Lib/test/test_codeccallbacks.py	Sat Jul  3 07:34:39 2010
@@ -153,28 +153,30 @@
             sout += "\\U%08x" % sys.maxunicode
         self.assertEqual(sin.encode("iso-8859-15", "backslashreplace"), sout)
 
-    def test_decoderelaxedutf8(self):
-        # This is the test for a decoding callback handler,
-        # that relaxes the UTF-8 minimal encoding restriction.
-        # A null byte that is encoded as "\xc0\x80" will be
-        # decoded as a null byte. All other illegal sequences
-        # will be handled strictly.
+    def test_decoding_callbacks(self):
+        # This is a test for a decoding callback handler
+        # that allows the decoding of the invalid sequence
+        # "\xc0\x80" and returns "\x00" instead of raising an error.
+        # All other illegal sequences will be handled strictly.
         def relaxedutf8(exc):
             if not isinstance(exc, UnicodeDecodeError):
                 raise TypeError("don't know how to handle %r" % exc)
-            if exc.object[exc.start:exc.end].startswith("\xc0\x80"):
+            if exc.object[exc.start:exc.start+2] == "\xc0\x80":
                 return (u"\x00", exc.start+2) # retry after two bytes
             else:
                 raise exc
 
-        codecs.register_error(
-            "test.relaxedutf8", relaxedutf8)
+        codecs.register_error("test.relaxedutf8", relaxedutf8)
 
+        # all the "\xc0\x80" will be decoded to "\x00"
         sin = "a\x00b\xc0\x80c\xc3\xbc\xc0\x80\xc0\x80"
         sout = u"a\x00b\x00c\xfc\x00\x00"
         self.assertEqual(sin.decode("utf-8", "test.relaxedutf8"), sout)
+
+        # "\xc0\x81" is not valid and a UnicodeDecodeError will be raised
         sin = "\xc0\x80\xc0\x81"
-        self.assertRaises(UnicodeError, sin.decode, "utf-8", "test.relaxedutf8")
+        self.assertRaises(UnicodeDecodeError, sin.decode,
+                          "utf-8", "test.relaxedutf8")
 
     def test_charmapencode(self):
         # For charmap encodings the replacement string will be

Modified: python/branches/release26-maint/Lib/test/test_unicode.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_unicode.py	(original)
+++ python/branches/release26-maint/Lib/test/test_unicode.py	Sat Jul  3 07:34:39 2010
@@ -587,6 +587,164 @@
         # * strict decoding testing for all of the
         #   UTF8_ERROR cases in PyUnicode_DecodeUTF8
 
+    def test_utf8_decode_valid_sequences(self):
+        sequences = [
+            # single byte
+            ('\x00', u'\x00'), ('a', u'a'), ('\x7f', u'\x7f'),
+            # 2 bytes
+            ('\xc2\x80', u'\x80'), ('\xdf\xbf', u'\u07ff'),
+            # 3 bytes
+            ('\xe0\xa0\x80', u'\u0800'), ('\xed\x9f\xbf', u'\ud7ff'),
+            ('\xee\x80\x80', u'\uE000'), ('\xef\xbf\xbf', u'\uffff'),
+            # 4 bytes
+            ('\xF0\x90\x80\x80', u'\U00010000'),
+            ('\xf4\x8f\xbf\xbf', u'\U0010FFFF')
+        ]
+        for seq, res in sequences:
+            self.assertEqual(seq.decode('utf-8'), res)
+
+        for ch in map(unichr, range(0, sys.maxunicode)):
+            self.assertEqual(ch, ch.encode('utf-8').decode('utf-8'))
+
+    def test_utf8_decode_invalid_sequences(self):
+        # continuation bytes in a sequence of 2, 3, or 4 bytes
+        continuation_bytes = map(chr, range(0x80, 0xC0))
+        # start bytes of a 2-byte sequence equivalent to codepoints < 0x7F
+        invalid_2B_seq_start_bytes = map(chr, range(0xC0, 0xC2))
+        # start bytes of a 4-byte sequence equivalent to codepoints > 0x10FFFF
+        invalid_4B_seq_start_bytes = map(chr, range(0xF5, 0xF8))
+        invalid_start_bytes = (
+            continuation_bytes + invalid_2B_seq_start_bytes +
+            invalid_4B_seq_start_bytes + map(chr, range(0xF7, 0x100))
+        )
+
+        for byte in invalid_start_bytes:
+            self.assertRaises(UnicodeDecodeError, byte.decode, 'utf-8')
+
+        for sb in invalid_2B_seq_start_bytes:
+            for cb in continuation_bytes:
+                self.assertRaises(UnicodeDecodeError, (sb+cb).decode, 'utf-8')
+
+        for sb in invalid_4B_seq_start_bytes:
+            for cb1 in continuation_bytes[:3]:
+                for cb3 in continuation_bytes[:3]:
+                    self.assertRaises(UnicodeDecodeError,
+                                      (sb+cb1+'\x80'+cb3).decode, 'utf-8')
+
+        for cb in map(chr, range(0x80, 0xA0)):
+            self.assertRaises(UnicodeDecodeError,
+                              ('\xE0'+cb+'\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              ('\xE0'+cb+'\xBF').decode, 'utf-8')
+        # XXX: surrogates shouldn't be valid UTF-8!
+        # see http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf
+        # (table 3-7) and http://www.rfc-editor.org/rfc/rfc3629.txt
+        #for cb in map(chr, range(0xA0, 0xC0)):
+            #sys.__stdout__.write('\\xED\\x%02x\\x80\n' % ord(cb))
+            #self.assertRaises(UnicodeDecodeError,
+                              #('\xED'+cb+'\x80').decode, 'utf-8')
+            #self.assertRaises(UnicodeDecodeError,
+                              #('\xED'+cb+'\xBF').decode, 'utf-8')
+        for cb in map(chr, range(0x80, 0x90)):
+            self.assertRaises(UnicodeDecodeError,
+                              ('\xF0'+cb+'\x80\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              ('\xF0'+cb+'\xBF\xBF').decode, 'utf-8')
+        for cb in map(chr, range(0x90, 0xC0)):
+            self.assertRaises(UnicodeDecodeError,
+                              ('\xF4'+cb+'\x80\x80').decode, 'utf-8')
+            self.assertRaises(UnicodeDecodeError,
+                              ('\xF4'+cb+'\xBF\xBF').decode, 'utf-8')
+
+    def test_issue8271(self):
+        # Issue #8271: during the decoding of an invalid UTF-8 byte sequence,
+        # only the start byte and the continuation byte(s) are now considered
+        # invalid, instead of the number of bytes specified by the start byte.
+        # See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf (page 95,
+        # table 3-8, Row 2) for more information about the algorithm used.
+        FFFD = u'\ufffd'
+        sequences = [
+            # invalid start bytes
+            ('\x80', FFFD), # continuation byte
+            ('\x80\x80', FFFD*2), # 2 continuation bytes
+            ('\xc0', FFFD),
+            ('\xc0\xc0', FFFD*2),
+            ('\xc1', FFFD),
+            ('\xc1\xc0', FFFD*2),
+            ('\xc0\xc1', FFFD*2),
+            # with start byte of a 2-byte sequence
+            ('\xc2', FFFD), # only the start byte
+            ('\xc2\xc2', FFFD*2), # 2 start bytes
+            ('\xc2\xc2\xc2', FFFD*3), # 2 start bytes
+            ('\xc2\x41', FFFD+'A'), # invalid continuation byte
+            # with start byte of a 3-byte sequence
+            ('\xe1', FFFD), # only the start byte
+            ('\xe1\xe1', FFFD*2), # 2 start bytes
+            ('\xe1\xe1\xe1', FFFD*3), # 3 start bytes
+            ('\xe1\xe1\xe1\xe1', FFFD*4), # 4 start bytes
+            ('\xe1\x80', FFFD), # only 1 continuation byte
+            ('\xe1\x41', FFFD+'A'), # invalid continuation byte
+            ('\xe1\x41\x80', FFFD+'A'+FFFD), # invalid cb followed by valid cb
+            ('\xe1\x41\x41', FFFD+'AA'), # 2 invalid continuation bytes
+            ('\xe1\x80\x41', FFFD+'A'), # only 1 valid continuation byte
+            ('\xe1\x80\xe1\x41', FFFD*2+'A'), # 1 valid and the other invalid
+            ('\xe1\x41\xe1\x80', FFFD+'A'+FFFD), # 1 invalid and the other valid
+            # with start byte of a 4-byte sequence
+            ('\xf1', FFFD), # only the start byte
+            ('\xf1\xf1', FFFD*2), # 2 start bytes
+            ('\xf1\xf1\xf1', FFFD*3), # 3 start bytes
+            ('\xf1\xf1\xf1\xf1', FFFD*4), # 4 start bytes
+            ('\xf1\xf1\xf1\xf1\xf1', FFFD*5), # 5 start bytes
+            ('\xf1\x80', FFFD), # only 1 continuation bytes
+            ('\xf1\x80\x80', FFFD), # only 2 continuation bytes
+            ('\xf1\x80\x41', FFFD+'A'), # 1 valid cb and 1 invalid
+            ('\xf1\x80\x41\x41', FFFD+'AA'), # 1 valid cb and 1 invalid
+            ('\xf1\x80\x80\x41', FFFD+'A'), # 2 valid cb and 1 invalid
+            ('\xf1\x41\x80', FFFD+'A'+FFFD), # 1 invalid cv and 1 valid
+            ('\xf1\x41\x80\x80', FFFD+'A'+FFFD*2), # 1 invalid cb and 2 invalid
+            ('\xf1\x41\x80\x41', FFFD+'A'+FFFD+'A'), # 2 invalid cb and 1 invalid
+            ('\xf1\x41\x41\x80', FFFD+'AA'+FFFD), # 1 valid cb and 1 invalid
+            ('\xf1\x41\xf1\x80', FFFD+'A'+FFFD),
+            ('\xf1\x41\x80\xf1', FFFD+'A'+FFFD*2),
+            ('\xf1\xf1\x80\x41', FFFD*2+'A'),
+            ('\xf1\x41\xf1\xf1', FFFD+'A'+FFFD*2),
+            # with invalid start byte of a 4-byte sequence (rfc2279)
+            ('\xf5', FFFD), # only the start byte
+            ('\xf5\xf5', FFFD*2), # 2 start bytes
+            ('\xf5\x80', FFFD*2), # only 1 continuation byte
+            ('\xf5\x80\x80', FFFD*3), # only 2 continuation byte
+            ('\xf5\x80\x80\x80', FFFD*4), # 3 continuation bytes
+            ('\xf5\x80\x41', FFFD*2+'A'), #  1 valid cb and 1 invalid
+            ('\xf5\x80\x41\xf5', FFFD*2+'A'+FFFD),
+            ('\xf5\x41\x80\x80\x41', FFFD+'A'+FFFD*2+'A'),
+            # with invalid start byte of a 5-byte sequence (rfc2279)
+            ('\xf8', FFFD), # only the start byte
+            ('\xf8\xf8', FFFD*2), # 2 start bytes
+            ('\xf8\x80', FFFD*2), # only one continuation byte
+            ('\xf8\x80\x41', FFFD*2 + 'A'), # 1 valid cb and 1 invalid
+            ('\xf8\x80\x80\x80\x80', FFFD*5), # invalid 5 bytes seq with 5 bytes
+            # with invalid start byte of a 6-byte sequence (rfc2279)
+            ('\xfc', FFFD), # only the start byte
+            ('\xfc\xfc', FFFD*2), # 2 start bytes
+            ('\xfc\x80\x80', FFFD*3), # only 2 continuation bytes
+            ('\xfc\x80\x80\x80\x80\x80', FFFD*6), # 6 continuation bytes
+            # invalid start byte
+            ('\xfe', FFFD),
+            ('\xfe\x80\x80', FFFD*3),
+            # other sequences
+            ('\xf1\x80\x41\x42\x43', u'\ufffd\x41\x42\x43'),
+            ('\xf1\x80\xff\x42\x43', u'\ufffd\ufffd\x42\x43'),
+            ('\xf1\x80\xc2\x81\x43', u'\ufffd\x81\x43'),
+            ('\x61\xF1\x80\x80\xE1\x80\xC2\x62\x80\x63\x80\xBF\x64',
+             u'\x61\uFFFD\uFFFD\uFFFD\x62\uFFFD\x63\uFFFD\uFFFD\x64'),
+        ]
+        for n, (seq, res) in enumerate(sequences):
+            self.assertRaises(UnicodeDecodeError, seq.decode, 'utf-8', 'strict')
+            self.assertEqual(seq.decode('utf-8', 'replace'), res)
+            self.assertEqual((seq+'b').decode('utf-8', 'replace'), res+'b')
+            self.assertEqual(seq.decode('utf-8', 'ignore'),
+                             res.replace(u'\uFFFD', ''))
+
     def test_codecs_idna(self):
         # Test whether trailing dot is preserved
         self.assertEqual(u"www.python.org.".encode("idna"), "www.python.org.")

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sat Jul  3 07:34:39 2010
@@ -12,6 +12,14 @@
 Core and Builtins
 -----------------
 
+- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the
+  start byte and the continuation byte(s) are now considered invalid, instead
+  of the number of bytes specified by the start byte.
+  E.g.: '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and
+  replaces with U+FFFD only the start byte ('\xf1') and the continuation byte
+  ('\x80') even if '\xf1' is the start byte of a 4-bytes sequence.
+  Previous versions returned a single u'\ufffd'.
+
 - Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError.
 
 - Issue #8941: decoding big endian UTF-32 data in UCS-2 builds could crash

Modified: python/branches/release26-maint/Objects/unicodeobject.c
==============================================================================
--- python/branches/release26-maint/Objects/unicodeobject.c	(original)
+++ python/branches/release26-maint/Objects/unicodeobject.c	Sat Jul  3 07:34:39 2010
@@ -1735,24 +1735,24 @@
 
 static
 char utf8_code_length[256] = {
-    /* Map UTF-8 encoded prefix byte to sequence length.  zero means
-       illegal prefix.  see RFC 2279 for details */
+    /* Map UTF-8 encoded prefix byte to sequence length.  Zero means
+       illegal prefix.  See RFC 3629 for details */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 00-0F */
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 70-7F */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80-8F */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* B0-BF */
+    0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* C0-C1 + C2-CF */
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* D0-DF */
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* E0-EF */
+    4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0  /* F0-F4 + F5-FF */
 };
 
 PyObject *PyUnicode_DecodeUTF8(const char *s,
@@ -1769,6 +1769,7 @@
 {
     const char *starts = s;
     int n;
+    int k;
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
     Py_ssize_t outpos;
@@ -1811,7 +1812,9 @@
             else {
                 errmsg = "unexpected end of data";
                 startinpos = s-starts;
-                endinpos = size;
+                endinpos = startinpos+1;
+                for (k=1; (k < size-startinpos) && ((s[k]&0xC0) == 0x80); k++)
+                    endinpos++;
                 goto utf8Error;
             }
         }
@@ -1819,7 +1822,7 @@
         switch (n) {
 
         case 0:
-            errmsg = "unexpected code byte";
+            errmsg = "invalid start byte";
             startinpos = s-starts;
             endinpos = startinpos+1;
             goto utf8Error;
@@ -1832,70 +1835,67 @@
 
         case 2:
             if ((s[1] & 0xc0) != 0x80) {
-                errmsg = "invalid data";
+                errmsg = "invalid continuation byte";
                 startinpos = s-starts;
-                endinpos = startinpos+2;
+                endinpos = startinpos + 1;
                 goto utf8Error;
             }
             ch = ((s[0] & 0x1f) << 6) + (s[1] & 0x3f);
-            if (ch < 0x80) {
-                startinpos = s-starts;
-                endinpos = startinpos+2;
-                errmsg = "illegal encoding";
-                goto utf8Error;
-            }
-            else
-                *p++ = (Py_UNICODE)ch;
+            assert ((ch > 0x007F) && (ch <= 0x07FF));
+            *p++ = (Py_UNICODE)ch;
             break;
 
         case 3:
+            /* XXX: surrogates shouldn't be valid UTF-8!
+               see http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf
+               (table 3-7) and http://www.rfc-editor.org/rfc/rfc3629.txt
+               Uncomment the 2 lines below to make them invalid,
+               codepoints: d800-dfff; UTF-8: \xed\xa0\x80-\xed\xbf\xbf. */
             if ((s[1] & 0xc0) != 0x80 ||
-                (s[2] & 0xc0) != 0x80) {
-                errmsg = "invalid data";
+                (s[2] & 0xc0) != 0x80 ||
+                ((unsigned char)s[0] == 0xE0 &&
+                 (unsigned char)s[1] < 0xA0)/* ||
+                ((unsigned char)s[0] == 0xED &&
+                 (unsigned char)s[1] > 0x9F)*/) {
+                errmsg = "invalid continuation byte";
                 startinpos = s-starts;
-                endinpos = startinpos+3;
+                endinpos = startinpos + 1;
+
+                /* if s[1] first two bits are 1 and 0, then the invalid
+                   continuation byte is s[2], so increment endinpos by 1,
+                   if not, s[1] is invalid and endinpos doesn't need to
+                   be incremented. */
+                if ((s[1] & 0xC0) == 0x80)
+                    endinpos++;
                 goto utf8Error;
             }
             ch = ((s[0] & 0x0f) << 12) + ((s[1] & 0x3f) << 6) + (s[2] & 0x3f);
-            if (ch < 0x0800) {
-                /* Note: UTF-8 encodings of surrogates are considered
-                   legal UTF-8 sequences;
-
-                   XXX For wide builds (UCS-4) we should probably try
-                   to recombine the surrogates into a single code
-                   unit.
-                */
-                errmsg = "illegal encoding";
-                startinpos = s-starts;
-                endinpos = startinpos+3;
-                goto utf8Error;
-            }
-            else
-                *p++ = (Py_UNICODE)ch;
+            assert ((ch > 0x07FF) && (ch <= 0xFFFF));
+            *p++ = (Py_UNICODE)ch;
             break;
 
         case 4:
             if ((s[1] & 0xc0) != 0x80 ||
                 (s[2] & 0xc0) != 0x80 ||
-                (s[3] & 0xc0) != 0x80) {
-                errmsg = "invalid data";
+                (s[3] & 0xc0) != 0x80 ||
+                ((unsigned char)s[0] == 0xF0 &&
+                 (unsigned char)s[1] < 0x90) ||
+                ((unsigned char)s[0] == 0xF4 &&
+                 (unsigned char)s[1] > 0x8F)) {
+                errmsg = "invalid continuation byte";
                 startinpos = s-starts;
-                endinpos = startinpos+4;
+                endinpos = startinpos + 1;
+                if ((s[1] & 0xC0) == 0x80) {
+                    endinpos++;
+                    if ((s[2] & 0xC0) == 0x80)
+                        endinpos++;
+                }
                 goto utf8Error;
             }
             ch = ((s[0] & 0x7) << 18) + ((s[1] & 0x3f) << 12) +
-                ((s[2] & 0x3f) << 6) + (s[3] & 0x3f);
-            /* validate and convert to UTF-16 */
-            if ((ch < 0x10000)        /* minimum value allowed for 4
-                                         byte encoding */
-                || (ch > 0x10ffff))   /* maximum value allowed for
-                                         UTF-16 */
-            {
-                errmsg = "illegal encoding";
-                startinpos = s-starts;
-                endinpos = startinpos+4;
-                goto utf8Error;
-            }
+                 ((s[2] & 0x3f) << 6) + (s[3] & 0x3f);
+            assert ((ch > 0xFFFF) && (ch <= 0x10ffff));
+
 #ifdef Py_UNICODE_WIDE
             *p++ = (Py_UNICODE)ch;
 #else
@@ -1911,13 +1911,6 @@
             *p++ = (Py_UNICODE)(0xDC00 + (ch & 0x03FF));
 #endif
             break;
-
-        default:
-            /* Other sizes are only needed for UCS-4 */
-            errmsg = "unsupported Unicode code range";
-            startinpos = s-starts;
-            endinpos = startinpos+n;
-            goto utf8Error;
         }
         s += n;
         continue;

From python-checkins at python.org  Sat Jul  3 09:36:51 2010
From: python-checkins at python.org (nick.coghlan)
Date: Sat,  3 Jul 2010 09:36:51 +0200 (CEST)
Subject: [Python-checkins] r82471 - in python/branches/py3k:
	Doc/library/dis.rst Lib/dis.py Lib/test/test_dis.py Misc/ACKS
	Misc/NEWS
Message-ID: <20100703073651.93017EE982@mail.python.org>

Author: nick.coghlan
Date: Sat Jul  3 09:36:51 2010
New Revision: 82471

Log:
Issue 6507: accept source strings directly in dis.dis(). Original patch by Daniel Urban

Modified:
   python/branches/py3k/Doc/library/dis.rst
   python/branches/py3k/Lib/dis.py
   python/branches/py3k/Lib/test/test_dis.py
   python/branches/py3k/Misc/ACKS
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/library/dis.rst
==============================================================================
--- python/branches/py3k/Doc/library/dis.rst	(original)
+++ python/branches/py3k/Doc/library/dis.rst	Sat Jul  3 09:36:51 2010
@@ -33,10 +33,13 @@
 .. function:: dis(x=None)
 
    Disassemble the *x* object. *x* can denote either a module, a
-   class, a method, a function, or a code object.   For a module, it disassembles
-   all functions.  For a class, it disassembles all methods.  For a single code
-   sequence, it prints one line per bytecode instruction.  If no object is
-   provided, it disassembles the last traceback.
+   class, a method, a function, a code object, a string of source code or a
+   byte sequence of raw bytecode.   For a module, it disassembles all
+   functions.  For a class, it disassembles all methods.  For a code object
+   or sequence of raw bytecode, it prints one line per bytecode instruction.
+   Strings are first compiled to code objects with the :func:`compile`
+   built-in function before being disassembled.  If no object is provided,
+   this function disassembles the last traceback.
 
 
 .. function:: distb(tb=None)

Modified: python/branches/py3k/Lib/dis.py
==============================================================================
--- python/branches/py3k/Lib/dis.py	(original)
+++ python/branches/py3k/Lib/dis.py	Sat Jul  3 09:36:51 2010
@@ -12,6 +12,22 @@
 
 _have_code = (types.MethodType, types.FunctionType, types.CodeType, type)
 
+def _try_compile(source, name):
+    """Attempts to compile the given source, first as an expression and
+       then as a statement if the first approach fails.
+
+       Utility function to accept strings in functions that otherwise
+       expect code objects
+    """
+    # ncoghlan: currently only used by dis(), but plan to add an
+    # equivalent for show_code() as well (but one that returns a
+    # string rather than printing directly to the console)
+    try:
+        c = compile(source, name, 'eval')
+    except SyntaxError:
+        c = compile(source, name, 'exec')
+    return c
+
 def dis(x=None):
     """Disassemble classes, methods, functions, or code.
 
@@ -38,7 +54,9 @@
     elif hasattr(x, 'co_code'):
         disassemble(x)
     elif isinstance(x, (bytes, bytearray)):
-        disassemble_string(x)
+        _disassemble_bytes(x)
+    elif isinstance(x, str):
+        _disassemble_str(x)
     else:
         raise TypeError("don't know how to disassemble %s objects" %
                         type(x).__name__)
@@ -157,7 +175,7 @@
                 print('(' + free[oparg] + ')', end=' ')
         print()
 
-def disassemble_string(code, lasti=-1, varnames=None, names=None,
+def _disassemble_bytes(code, lasti=-1, varnames=None, names=None,
                        constants=None):
     labels = findlabels(code)
     n = len(code)
@@ -196,6 +214,10 @@
                 print('(' + cmp_op[oparg] + ')', end=' ')
         print()
 
+def _disassemble_str(source):
+    """Compile the source string, then disassemble the code object."""
+    disassemble(_try_compile(source, '<dis>'))
+
 disco = disassemble                     # XXX For backwards compatibility
 
 def findlabels(code):

Modified: python/branches/py3k/Lib/test/test_dis.py
==============================================================================
--- python/branches/py3k/Lib/test/test_dis.py	(original)
+++ python/branches/py3k/Lib/test/test_dis.py	Sat Jul  3 09:36:51 2010
@@ -96,6 +96,46 @@
 
 """
 
+expr_str = "x + 1"
+
+dis_expr_str = """\
+  1           0 LOAD_NAME                0 (x)
+              3 LOAD_CONST               0 (1)
+              6 BINARY_ADD
+              7 RETURN_VALUE
+"""
+
+simple_stmt_str = "x = x + 1"
+
+dis_simple_stmt_str = """\
+  1           0 LOAD_NAME                0 (x)
+              3 LOAD_CONST               0 (1)
+              6 BINARY_ADD
+              7 STORE_NAME               0 (x)
+             10 LOAD_CONST               1 (None)
+             13 RETURN_VALUE
+"""
+
+compound_stmt_str = """\
+x = 0
+while 1:
+    x += 1"""
+# Trailing newline has been deliberately omitted
+
+dis_compound_stmt_str = """\
+  1           0 LOAD_CONST               0 (0)
+              3 STORE_NAME               0 (x)
+
+  2           6 SETUP_LOOP              13 (to 22)
+
+  3     >>    9 LOAD_NAME                0 (x)
+             12 LOAD_CONST               1 (1)
+             15 INPLACE_ADD
+             16 STORE_NAME               0 (x)
+             19 JUMP_ABSOLUTE            9
+        >>   22 LOAD_CONST               2 (None)
+             25 RETURN_VALUE
+"""
 
 class DisTests(unittest.TestCase):
     def do_disassembly_test(self, func, expected):
@@ -166,6 +206,11 @@
         from test import dis_module
         self.do_disassembly_test(dis_module, dis_module_expected_results)
 
+    def test_disassemble_str(self):
+        self.do_disassembly_test(expr_str, dis_expr_str)
+        self.do_disassembly_test(simple_stmt_str, dis_simple_stmt_str)
+        self.do_disassembly_test(compound_stmt_str, dis_compound_stmt_str)
+
 def test_main():
     run_unittest(DisTests)
 

Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS	(original)
+++ python/branches/py3k/Misc/ACKS	Sat Jul  3 09:36:51 2010
@@ -797,6 +797,7 @@
 Eren T?rkay
 Lionel Ulmer
 Roger Upole
+Daniel Urban
 Michael Urman
 Hector Urtubia
 Andi Vajda

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Jul  3 09:36:51 2010
@@ -468,6 +468,8 @@
 Library
 -------
 
+- Issue #6507: Accept source strings in dis.dis()
+
 - Issue #7829: Clearly document that the dis module is exposing an
   implementation detail that is not stable between Python VMs or releases.
 

From python-checkins at python.org  Sat Jul  3 09:38:29 2010
From: python-checkins at python.org (nick.coghlan)
Date: Sat,  3 Jul 2010 09:38:29 +0200 (CEST)
Subject: [Python-checkins] r82472 - python/branches/py3k/Misc/NEWS
Message-ID: <20100703073829.0CD27EF59@mail.python.org>

Author: nick.coghlan
Date: Sat Jul  3 09:38:28 2010
New Revision: 82472

Log:
Issue 6507: missing patch submitter from NEWS entry in previous checkin

Modified:
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Jul  3 09:38:28 2010
@@ -468,7 +468,8 @@
 Library
 -------
 
-- Issue #6507: Accept source strings in dis.dis()
+- Issue #6507: Accept source strings in dis.dis(). Original patch by
+  Daniel Urban.
 
 - Issue #7829: Clearly document that the dis module is exposing an
   implementation detail that is not stable between Python VMs or releases.

From python-checkins at python.org  Sat Jul  3 09:43:04 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Jul 2010 09:43:04 +0200 (CEST)
Subject: [Python-checkins] r82473 - in python/trunk/Doc: using/cmdline.rst
	whatsnew/2.7.rst
Message-ID: <20100703074304.DFEA8F416@mail.python.org>

Author: ezio.melotti
Date: Sat Jul  3 09:43:04 2010
New Revision: 82473

Log:
Update whatsnew/2.7.rst, add a few links and fix a couple of XXX.  Also add a paragraph about DeprecationWarnings in cmdline.rst.

Modified:
   python/trunk/Doc/using/cmdline.rst
   python/trunk/Doc/whatsnew/2.7.rst

Modified: python/trunk/Doc/using/cmdline.rst
==============================================================================
--- python/trunk/Doc/using/cmdline.rst	(original)
+++ python/trunk/Doc/using/cmdline.rst	Sat Jul  3 09:43:04 2010
@@ -315,6 +315,10 @@
    :option:`-W` options are ignored (though, a warning message is printed about
    invalid options when the first warning is issued).
 
+   Starting from Python 2.7, :exc:`DeprecationWarning` and its descendants
+   are ignored by default.  The :option:`-Wd` option can be used to re-enable
+   them.
+
    Warnings can also be controlled from within a Python program using the
    :mod:`warnings` module.
 

Modified: python/trunk/Doc/whatsnew/2.7.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.7.rst	(original)
+++ python/trunk/Doc/whatsnew/2.7.rst	Sat Jul  3 09:43:04 2010
@@ -9,7 +9,6 @@
 ..  hyperlink all the methods & functions.
 
 .. T_STRING_INPLACE not described in main docs
-.. "Format String Syntax" in string.rst could use many more examples.
 
 .. $Id$
    Rules for maintenance:
@@ -57,12 +56,12 @@
 schedule is described in :pep:`373`.
 
 Numeric handling has been improved in many ways, for both
-floating-point numbers and for the :class:`Decimal` class.  There are
-some useful additions to the standard library, such as a greatly
-enhanced :mod:`unittest` module, the :mod:`argparse` module for
-parsing command-line options, convenient ordered-dictionary and
-:class:`Counter` classes in the :mod:`collections` module, and many
-other improvements.
+floating-point numbers and for the :class:`~decimal.Decimal` class.
+There are some useful additions to the standard library, such as a
+greatly enhanced :mod:`unittest` module, the :mod:`argparse` module
+for parsing command-line options, convenient :class:`~collections.OrderedDict`
+and :class:`~collections.Counter` classes in the :mod:`collections` module,
+and many other improvements.
 
 Python 2.7 is planned to be the last of the 2.x releases, so we worked
 on making it a good release for the long term.  To help with porting
@@ -117,8 +116,8 @@
   with responding to these concerns.
 
   You can re-enable display of :exc:`DeprecationWarning` messages by
-  running Python with the :option:`-Wdefault` (short form:
-  :option:`-Wd`) switch, or by setting the :envvar:`PYTHONWARNINGS`
+  running Python with the :option:`-Wdefault <-W>` (short form:
+  :option:`-Wd <-W>`) switch, or by setting the :envvar:`PYTHONWARNINGS`
   environment variable to ``"default"`` (or ``"d"``) before running
   Python.  Python code can also re-enable them
   by calling ``warnings.simplefilter('default')``.
@@ -135,7 +134,7 @@
 A partial list of 3.1 features that were backported to 2.7:
 
 * The syntax for set literals (``{1,2,3}`` is a mutable set).
-* Dictionary and set comprehensions (``{ i: i*2 for i in range(3)}``).
+* Dictionary and set comprehensions (``{i: i*2 for i in range(3)}``).
 * Multiple context managers in a single :keyword:`with` statement.
 * A new version of the :mod:`io` library, rewritten in C for performance.
 * The ordered-dictionary type described in :ref:`pep-0372`.
@@ -155,7 +154,7 @@
 * :func:`operator.isCallable` and :func:`operator.sequenceIncludes`,
   which are not supported in 3.x, now trigger warnings.
 * The :option:`-3` switch now automatically
-  enables the :option:`-Qwarn` switch that causes warnings
+  enables the :option:`-Qwarn <-Q>` switch that causes warnings
   about using classic division with integers and long integers.
 
 
@@ -390,7 +389,8 @@
 
 .. seealso::
 
-   `argparse module documentation <http://docs.python.org/dev/library/argparse.html>`__
+   `argparse documentation <http://docs.python.org/dev/library/argparse.html>`__
+     The documentation page of the argparse module.
 
    `Upgrading optparse code to use argparse <http://docs.python.org/dev/library/argparse.html#upgrading-optparse-code>`__
      Part of the Python documentation, describing how to convert
@@ -402,8 +402,6 @@
 PEP 391: Dictionary-Based Configuration For Logging
 ====================================================
 
-.. XXX not documented in library reference yet; add link here once it's added.
-
 The :mod:`logging` module is very flexible; applications can define
 a tree of logging subsystems, and each logger in this tree can filter
 out certain messages, format them differently, and direct messages to
@@ -412,21 +410,21 @@
 All this flexibility can require a lot of configuration.  You can
 write Python statements to create objects and set their properties,
 but a complex set-up requires verbose but boring code.
-:mod:`logging` also supports a :func:`~logging.config.fileConfig`
+:mod:`logging` also supports a :func:`~logging.fileConfig`
 function that parses a file, but the file format doesn't support
 configuring filters, and it's messier to generate programmatically.
 
-Python 2.7 adds a :func:`~logging.config.dictConfig` function that
+Python 2.7 adds a :func:`~logging.dictConfig` function that
 uses a dictionary to configure logging.  There are many ways to
 produce a dictionary from different sources: construct one with code;
 parse a file containing JSON; or use a YAML parsing library if one is
-installed.
+installed.  For more information see :ref:`logging-config-api`.
 
 The following example configures two loggers, the root logger and a
-logger named "network".   Messages sent to the root logger will be
+logger named "network".  Messages sent to the root logger will be
 sent to the system log using the syslog protocol, and messages
 to the "network" logger will be written to a :file:`network.log` file
-that will be rotated once the log reaches 1Mb.
+that will be rotated once the log reaches 1MB.
 
 ::
 
@@ -445,7 +443,7 @@
                          'filename': '/logs/network.log',
                          'formatter': 'standard',
                          'level': 'INFO',
-                         'maxBytes': 1024*1024},
+                         'maxBytes': 1000000},
                   'syslog': {'class': 'logging.handlers.SysLogHandler',
                              'formatter': 'standard',
                              'level': 'ERROR'}},
@@ -483,16 +481,19 @@
   for UDP or :const:`socket.SOCK_STREAM` for TCP.  The default
   protocol remains UDP.
 
-* :class:`Logger` instances gained a :meth:`getChild` method that retrieves a
-  descendant logger using a relative path.  For example,
-  once you retrieve a logger by doing ``log = getLogger('app')``,
+* :class:`~logging.Logger` instances gained a :meth:`~logging.Logger.getChild`
+  method that retrieves a descendant logger using a relative path.
+  For example, once you retrieve a logger by doing ``log = getLogger('app')``,
   calling ``log.getChild('network.listen')`` is equivalent to
   ``getLogger('app.network.listen')``.
 
-* The :class:`LoggerAdapter` class gained a :meth:`isEnabledFor` method
-  that takes a *level* and returns whether the underlying logger would
+* The :class:`~logging.LoggerAdapter` class gained a
+  :meth:`~logging.LoggerAdapter.isEnabledFor` method that takes a
+  *level* and returns whether the underlying logger would
   process a message of that level of importance.
 
+.. XXX: Logger objects don't have a class declaration so the link don't work
+
 .. seealso::
 
    :pep:`391` - Dictionary-Based Configuration For Logging
@@ -501,14 +502,15 @@
 PEP 3106: Dictionary Views
 ====================================================
 
-The dictionary methods :meth:`keys`, :meth:`values`, and :meth:`items`
-are different in Python 3.x.  They return an object called a :dfn:`view`
-instead of a fully materialized list.
-
-It's not possible to change the return values of :meth:`keys`,
-:meth:`values`, and :meth:`items` in Python 2.7 because too much code
-would break.  Instead the 3.x versions were added under the new names
-:meth:`viewkeys`, :meth:`viewvalues`, and :meth:`viewitems`.
+The dictionary methods :meth:`~dict.keys`, :meth:`~dict.values`, and
+:meth:`~dict.items` are different in Python 3.x.  They return an object
+called a :dfn:`view` instead of a fully materialized list.
+
+It's not possible to change the return values of :meth:`~dict.keys`,
+:meth:`~dict.values`, and :meth:`~dict.items` in Python 2.7 because
+too much code would break.  Instead the 3.x versions were added
+under the new names :meth:`~dict.viewkeys`, :meth:`~dict.viewvalues`,
+and :meth:`~dict.viewitems`.
 
 ::
 
@@ -550,8 +552,8 @@
     RuntimeError: dictionary changed size during iteration
 
 You can use the view methods in Python 2.x code, and the 2to3
-converter will change them to the standard :meth:`keys`,
-:meth:`values`, and :meth:`items` methods.
+converter will change them to the standard :meth:`~dict.keys`,
+:meth:`~dict.values`, and :meth:`~dict.items` methods.
 
 .. seealso::
 
@@ -624,7 +626,7 @@
   ``{}`` continues to represent an empty dictionary; use
   ``set()`` for an empty set.
 
-    >>> {1,2,3,4,5}
+    >>> {1, 2, 3, 4, 5}
     set([1, 2, 3, 4, 5])
     >>> set() # empty set
     set([])
@@ -794,7 +796,7 @@
   ``None`` as its first argument.  (Fixed by Georg Brandl;
   :issue:`4759`.)
 
-  .. bytearray doesn't seem to be documented
+  .. XXX bytearray doesn't seem to be documented
 
 * When using ``@classmethod`` and ``@staticmethod`` to wrap
   methods as class or static methods, the wrapper object now
@@ -1054,7 +1056,7 @@
   :meth:`~collections.deque.count` method that returns the number of
   contained elements equal to the supplied argument *x*, and a
   :meth:`~collections.deque.reverse` method that reverses the elements
-  of the deque in-place.  :class:`deque` also exposes its maximum
+  of the deque in-place.  :class:`~collections.deque` also exposes its maximum
   length as the read-only :attr:`~collections.deque.maxlen` attribute.
   (Both features added by Raymond Hettinger.)
 
@@ -1135,15 +1137,14 @@
   ``Decimal('0.1000000000000000055511151231257827021181583404541015625')``.
   (Implemented by Raymond Hettinger; :issue:`4796`.)
 
-  Comparing instances of :class:`Decimal` with floating-point
+  Comparing instances of :class:`~decimal.Decimal` with floating-point
   numbers now produces sensible results based on the numeric values
   of the operands.  Previously such comparisons would fall back to
   Python's default rules for comparing objects, which produced arbitrary
   results based on their type.  Note that you still cannot combine
   :class:`Decimal` and floating-point in other operations such as addition,
   since you should be explicitly choosing how to convert between float and
-  :class:`Decimal`.
-  (Fixed by Mark Dickinson; :issue:`2531`.)
+  :class:`~decimal.Decimal`.  (Fixed by Mark Dickinson; :issue:`2531`.)
 
   The constructor for :class:`~decimal.Decimal` now accepts
   floating-point numbers (added by Raymond Hettinger; :issue:`8257`)
@@ -1195,8 +1196,8 @@
 
   Ordering comparisons (``<``, ``<=``, ``>``, ``>=``) between
   fractions and complex numbers now raise a :exc:`TypeError`.
-  This fixes an oversight, making the :class:`Fraction` match the other
-  numeric types.
+  This fixes an oversight, making the :class:`~fractions.Fraction`
+  match the other numeric types.
 
   .. revision 79455
 
@@ -1210,7 +1211,7 @@
   uploads thanks to an added *rest* parameter (patch by Pablo Mouzo;
   :issue:`6845`.)
 
-* New class decorator: :func:`total_ordering` in the :mod:`functools`
+* New class decorator: :func:`~functools.total_ordering` in the :mod:`functools`
   module takes a class that defines an :meth:`__eq__` method and one of
   :meth:`__lt__`, :meth:`__le__`, :meth:`__gt__`, or :meth:`__ge__`,
   and generates the missing comparison methods.  Since the
@@ -1218,7 +1219,7 @@
   this decorator makes it easier to define ordered classes.
   (Added by Raymond Hettinger; :issue:`5479`.)
 
-  New function: :func:`cmp_to_key` will take an old-style comparison
+  New function: :func:`~functools.cmp_to_key` will take an old-style comparison
   function that expects two arguments and return a new callable that
   can be used as the *key* parameter to functions such as
   :func:`sorted`, :func:`min` and :func:`max`, etc.  The primary
@@ -1345,7 +1346,7 @@
   with any object literal that decodes to a list of pairs.
   (Contributed by Raymond Hettinger; :issue:`5381`.)
 
-* The :mod:`mailbox` module's :class:`Maildir` class now records the
+* The :mod:`mailbox` module's :class:`~mailbox.Maildir` class now records the
   timestamp on the directories it reads, and only re-reads them if the
   modification time has subsequently changed.  This improves
   performance by avoiding unneeded directory scans.  (Fixed by
@@ -1466,10 +1467,10 @@
   defaults to False; if overridden to be True,
   new request connections will have the TCP_NODELAY option set to
   prevent buffering many small sends into a single TCP packet.
-  The :attr:`~SocketServer.TCPServer.timeout` class attribute can hold
+  The :attr:`~SocketServer.BaseServer.timeout` class attribute can hold
   a timeout in seconds that will be applied to the request socket; if
-  no request is received within that time, :meth:`handle_timeout`
-  will be called and :meth:`handle_request` will return.
+  no request is received within that time, :meth:`~SocketServer.BaseServer.handle_timeout`
+  will be called and :meth:`~SocketServer.BaseServer.handle_request` will return.
   (Contributed by Kristj?n Valur J?nsson; :issue:`6192` and :issue:`6267`.)
 
 * Updated module: the :mod:`sqlite3` module has been updated to
@@ -1479,7 +1480,7 @@
   and then call :meth:`~sqlite3.Connection.load_extension` to load a particular shared library.
   (Updated by Gerhard H?ring.)
 
-* The :mod:`ssl` module's :class:`ssl.SSLSocket` objects now support the
+* The :mod:`ssl` module's :class:`~ssl.SSLSocket` objects now support the
   buffer API, which fixed a test suite failure (fix by Antoine Pitrou;
   :issue:`7133`) and automatically set
   OpenSSL's :cmacro:`SSL_MODE_AUTO_RETRY`, which will prevent an error
@@ -1535,7 +1536,7 @@
   on receiving an :const:`EINTR` signal.  (Reported by several people; final
   patch by Gregory P. Smith in :issue:`1068268`.)
 
-* New function: :func:`~symtable.is_declared_global` in the :mod:`symtable` module
+* New function: :func:`~symtable.Symbol.is_declared_global` in the :mod:`symtable` module
   returns true for variables that are explicitly declared to be global,
   false for ones that are implicitly global.
   (Contributed by Jeremy Hylton.)
@@ -1716,7 +1717,7 @@
   Makefile and the :file:`pyconfig.h` file.
 * :func:`~sysconfig.get_config_vars` returns a dictionary containing
   all of the configuration variables.
-* :func:`~sysconfig.getpath` returns the configured path for
+* :func:`~sysconfig.get_path` returns the configured path for
   a particular type of module: the standard library,
   site-specific modules, platform-specific modules, etc.
 * :func:`~sysconfig.is_python_build` returns true if you're running a
@@ -1778,7 +1779,7 @@
 Consult the :mod:`unittest` module documentation for more details.
 (Developed in :issue:`6001`.)
 
-The :func:`main` function supports some other new options:
+The :func:`~unittest.main` function supports some other new options:
 
 * :option:`-b` or :option:`--buffer` will buffer the standard output
   and standard error streams during each test.  If the test passes,
@@ -1796,7 +1797,7 @@
   being tested or the tests being run have defined a signal handler of
   their own, by noticing that a signal handler was already set and
   calling it.  If this doesn't work for you, there's a
-  :func:`removeHandler` decorator that can be used to mark tests that
+  :func:`~unittest.removeHandler` decorator that can be used to mark tests that
   should have the control-C handling disabled.
 
 * :option:`-f` or :option:`--failfast` makes
@@ -1923,7 +1924,7 @@
 
 :func:`unittest.main` now takes an optional ``exit`` argument.  If
 False, :func:`~unittest.main` doesn't call :func:`sys.exit`, allowing
-:func:`main` to be used from the interactive interpreter.
+:func:`~unittest.main` to be used from the interactive interpreter.
 (Contributed by J. Pablo Fern?ndez; :issue:`3379`.)
 
 :class:`~unittest.TestResult` has new :meth:`~unittest.TestResult.startTestRun` and
@@ -2117,7 +2118,7 @@
   :cmacro:`Py_ISSPACE`,
   :cmacro:`Py_ISUPPER`,
   :cmacro:`Py_ISXDIGIT`,
-  and :cmacro:`Py_TOLOWER`, :cmacro:`Py_TOUPPER`.
+  :cmacro:`Py_TOLOWER`, and :cmacro:`Py_TOUPPER`.
   All of these functions are analogous to the C
   standard macros for classifying characters, but ignore the current
   locale setting, because in
@@ -2263,11 +2264,11 @@
   (Contributed by David Cournapeau; :issue:`4365`.)
 
 * The :mod:`_winreg` module for accessing the registry now implements
-  the :func:`CreateKeyEx` and :func:`DeleteKeyEx` functions, extended
-  versions of previously-supported functions that take several extra
-  arguments.  The :func:`DisableReflectionKey`,
-  :func:`EnableReflectionKey`, and :func:`QueryReflectionKey` were also
-  tested and documented.
+  the :func:`~_winreg.CreateKeyEx` and :func:`~_winreg.DeleteKeyEx`
+  functions, extended versions of previously-supported functions that
+  take several extra arguments.  The :func:`~_winreg.DisableReflectionKey`,
+  :func:`~_winreg.EnableReflectionKey`, and :func:`~_winreg.QueryReflectionKey`
+  were also tested and documented.
   (Implemented by Brian Curtin: :issue:`7347`.)
 
 * The new :cfunc:`_beginthreadex` API is used to start threads, and
@@ -2384,20 +2385,20 @@
 
 In the standard library:
 
-* Operations with :class:`datetime` instances that resulted in a year
+* Operations with :class:`~datetime.datetime` instances that resulted in a year
   falling outside the supported range didn't always raise
   :exc:`OverflowError`.  Such errors are now checked more carefully
   and will now raise the exception. (Reported by Mark Leander, patch
   by Anand B. Pillai and Alexander Belopolsky; :issue:`7150`.)
 
-* When using :class:`Decimal` instances with a string's
+* When using :class:`~decimal.Decimal` instances with a string's
   :meth:`format` method, the default alignment was previously
   left-alignment.  This has been changed to right-alignment, which might
   change the output of your programs.
   (Changed by Mark Dickinson; :issue:`6857`.)
 
   Comparisons involving a signaling NaN value (or ``sNAN``) now signal
-  :const:`InvalidOperation` instead of silently returning a true or
+  :const:`~decimal.InvalidOperation` instead of silently returning a true or
   false value depending on the comparison operator.  Quiet NaN values
   (or ``NaN``) are now hashable.  (Fixed by Mark Dickinson;
   :issue:`7279`.)
@@ -2408,7 +2409,7 @@
   or comment (which looks like `<!-- comment -->`).
   (Patch by Neil Muller; :issue:`2746`.)
 
-* The :meth:`readline` method of :class:`StringIO` objects now does
+* The :meth:`~StringIO.StringIO.readline` method of :class:`~StringIO.StringIO` objects now does
   nothing when a negative length is requested, as other file-like
   objects do.  (:issue:`7348`).
 

From python-checkins at python.org  Sat Jul  3 10:40:13 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 10:40:13 +0200 (CEST)
Subject: [Python-checkins] r82474 -
	python/trunk/Doc/library/simplehttpserver.rst
Message-ID: <20100703084013.71674F800@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 10:40:13 2010
New Revision: 82474

Log:
Fix role name.

Modified:
   python/trunk/Doc/library/simplehttpserver.rst

Modified: python/trunk/Doc/library/simplehttpserver.rst
==============================================================================
--- python/trunk/Doc/library/simplehttpserver.rst	(original)
+++ python/trunk/Doc/library/simplehttpserver.rst	Sat Jul  3 10:40:13 2010
@@ -106,7 +106,7 @@
    httpd.serve_forever()
 
 The :mod:`SimpleHTTPServer` module can also be invoked directly using the
-:cmdoption:`-m` switch of the interpreter with a ``port number`` argument.
+:option:`-m` switch of the interpreter with a ``port number`` argument.
 Similar to the previous example, this serves the files relative to the
 current directory. ::
 

From python-checkins at python.org  Sat Jul  3 10:42:33 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 10:42:33 +0200 (CEST)
Subject: [Python-checkins] r82475 - python/trunk/Doc/whatsnew/2.7.rst
Message-ID: <20100703084233.B673EF800@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 10:42:33 2010
New Revision: 82475

Log:
Use internal links.

Modified:
   python/trunk/Doc/whatsnew/2.7.rst

Modified: python/trunk/Doc/whatsnew/2.7.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.7.rst	(original)
+++ python/trunk/Doc/whatsnew/2.7.rst	Sat Jul  3 10:42:33 2010
@@ -389,10 +389,10 @@
 
 .. seealso::
 
-   `argparse documentation <http://docs.python.org/dev/library/argparse.html>`__
+   :mod:`argparse` documentation
      The documentation page of the argparse module.
 
-   `Upgrading optparse code to use argparse <http://docs.python.org/dev/library/argparse.html#upgrading-optparse-code>`__
+   :ref:`argparse-from-optparse`
      Part of the Python documentation, describing how to convert
      code that uses :mod:`optparse`.
 

From python-checkins at python.org  Sat Jul  3 11:15:10 2010
From: python-checkins at python.org (mark.dickinson)
Date: Sat,  3 Jul 2010 11:15:10 +0200 (CEST)
Subject: [Python-checkins] r82476 - python/trunk/Doc/library/sys.rst
Message-ID: <20100703091510.0BF2BF416@mail.python.org>

Author: mark.dickinson
Date: Sat Jul  3 11:15:09 2010
New Revision: 82476

Log:
Fix typo in sys.float_info docs.

Modified:
   python/trunk/Doc/library/sys.rst

Modified: python/trunk/Doc/library/sys.rst
==============================================================================
--- python/trunk/Doc/library/sys.rst	(original)
+++ python/trunk/Doc/library/sys.rst	Sat Jul  3 11:15:09 2010
@@ -305,7 +305,7 @@
    +---------------------+----------------+--------------------------------------------------+
    | attribute           | float.h macro  | explanation                                      |
    +=====================+================+==================================================+
-   | :const:`epsilon`    | DBL_MAX        | difference between 1 and the least value greater |
+   | :const:`epsilon`    | DBL_EPSILON    | difference between 1 and the least value greater |
    |                     |                | than 1 that is representable as a float          |
    +---------------------+----------------+--------------------------------------------------+
    | :const:`dig`        | DBL_DIG        | maximum number of decimal digits that can be     |

From python-checkins at python.org  Sat Jul  3 11:16:01 2010
From: python-checkins at python.org (mark.dickinson)
Date: Sat,  3 Jul 2010 11:16:01 +0200 (CEST)
Subject: [Python-checkins] r82477 - in python/branches/release26-maint:
	Doc/library/sys.rst
Message-ID: <20100703091601.823AAEE9A7@mail.python.org>

Author: mark.dickinson
Date: Sat Jul  3 11:16:01 2010
New Revision: 82477

Log:
Merged revisions 82476 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82476 | mark.dickinson | 2010-07-03 10:15:09 +0100 (Sat, 03 Jul 2010) | 1 line
  
  Fix typo in sys.float_info docs.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/sys.rst

Modified: python/branches/release26-maint/Doc/library/sys.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/sys.rst	(original)
+++ python/branches/release26-maint/Doc/library/sys.rst	Sat Jul  3 11:16:01 2010
@@ -305,7 +305,7 @@
    +---------------------+----------------+--------------------------------------------------+
    | attribute           | float.h macro  | explanation                                      |
    +=====================+================+==================================================+
-   | :const:`epsilon`    | DBL_MAX        | difference between 1 and the least value greater |
+   | :const:`epsilon`    | DBL_EPSILON    | difference between 1 and the least value greater |
    |                     |                | than 1 that is representable as a float          |
    +---------------------+----------------+--------------------------------------------------+
    | :const:`dig`        | DBL_DIG        | maximum number of decimal digits that can be     |

From python-checkins at python.org  Sat Jul  3 11:17:16 2010
From: python-checkins at python.org (mark.dickinson)
Date: Sat,  3 Jul 2010 11:17:16 +0200 (CEST)
Subject: [Python-checkins] r82478 - in python/branches/py3k:
	Doc/library/sys.rst
Message-ID: <20100703091716.4B7A5F416@mail.python.org>

Author: mark.dickinson
Date: Sat Jul  3 11:17:16 2010
New Revision: 82478

Log:
Merged revisions 82476 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82476 | mark.dickinson | 2010-07-03 10:15:09 +0100 (Sat, 03 Jul 2010) | 1 line
  
  Fix typo in sys.float_info docs.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/sys.rst

Modified: python/branches/py3k/Doc/library/sys.rst
==============================================================================
--- python/branches/py3k/Doc/library/sys.rst	(original)
+++ python/branches/py3k/Doc/library/sys.rst	Sat Jul  3 11:17:16 2010
@@ -232,7 +232,7 @@
    +---------------------+----------------+--------------------------------------------------+
    | attribute           | float.h macro  | explanation                                      |
    +=====================+================+==================================================+
-   | :const:`epsilon`    | DBL_MAX        | difference between 1 and the least value greater |
+   | :const:`epsilon`    | DBL_EPSILON    | difference between 1 and the least value greater |
    |                     |                | than 1 that is representable as a float          |
    +---------------------+----------------+--------------------------------------------------+
    | :const:`dig`        | DBL_DIG        | maximum number of decimal digits that can be     |

From python-checkins at python.org  Sat Jul  3 11:18:26 2010
From: python-checkins at python.org (mark.dickinson)
Date: Sat,  3 Jul 2010 11:18:26 +0200 (CEST)
Subject: [Python-checkins] r82479 - in python/branches/release31-maint:
	Doc/library/sys.rst
Message-ID: <20100703091826.687DCEE9A7@mail.python.org>

Author: mark.dickinson
Date: Sat Jul  3 11:18:26 2010
New Revision: 82479

Log:
Merged revisions 82478 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/branches/py3k

................
  r82478 | mark.dickinson | 2010-07-03 10:17:16 +0100 (Sat, 03 Jul 2010) | 9 lines
  
  Merged revisions 82476 via svnmerge from 
  svn+ssh://pythondev at svn.python.org/python/trunk
  
  ........
    r82476 | mark.dickinson | 2010-07-03 10:15:09 +0100 (Sat, 03 Jul 2010) | 1 line
    
    Fix typo in sys.float_info docs.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/sys.rst

Modified: python/branches/release31-maint/Doc/library/sys.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/sys.rst	(original)
+++ python/branches/release31-maint/Doc/library/sys.rst	Sat Jul  3 11:18:26 2010
@@ -233,7 +233,7 @@
    +---------------------+----------------+--------------------------------------------------+
    | attribute           | float.h macro  | explanation                                      |
    +=====================+================+==================================================+
-   | :const:`epsilon`    | DBL_MAX        | difference between 1 and the least value greater |
+   | :const:`epsilon`    | DBL_EPSILON    | difference between 1 and the least value greater |
    |                     |                | than 1 that is representable as a float          |
    +---------------------+----------------+--------------------------------------------------+
    | :const:`dig`        | DBL_DIG        | maximum number of decimal digits that can be     |

From python-checkins at python.org  Sat Jul  3 12:21:51 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 12:21:51 +0200 (CEST)
Subject: [Python-checkins] r82480 - python/branches/py3k/Doc/library/dis.rst
Message-ID: <20100703102151.21FB7EFCB@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 12:21:50 2010
New Revision: 82480

Log:
Wrap and use the correct directive.

Modified:
   python/branches/py3k/Doc/library/dis.rst

Modified: python/branches/py3k/Doc/library/dis.rst
==============================================================================
--- python/branches/py3k/Doc/library/dis.rst	(original)
+++ python/branches/py3k/Doc/library/dis.rst	Sat Jul  3 12:21:50 2010
@@ -10,7 +10,13 @@
 input is defined in the file :file:`Include/opcode.h` and used by the compiler
 and the interpreter.
 
-.. warning:: Bytecode is an implementation detail of the CPython interpreter!  No guarantees are made that bytecode will not be added, removed, or changed between versions of Python. Use of this module should not be considered to work across Python VMs or Python releases.
+.. impl-detail::
+
+   Bytecode is an implementation detail of the CPython interpreter!  No
+   guarantees are made that bytecode will not be added, removed, or changed
+   between versions of Python.  Use of this module should not be considered to
+   work across Python VMs or Python releases.
+
 
 Example: Given the function :func:`myfunc`::
 

From python-checkins at python.org  Sat Jul  3 12:22:11 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 12:22:11 +0200 (CEST)
Subject: [Python-checkins] r82481 -
	python/branches/py3k/Doc/library/http.server.rst
Message-ID: <20100703102211.1E6B3EE986@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 12:22:10 2010
New Revision: 82481

Log:
Use the right role.

Modified:
   python/branches/py3k/Doc/library/http.server.rst

Modified: python/branches/py3k/Doc/library/http.server.rst
==============================================================================
--- python/branches/py3k/Doc/library/http.server.rst	(original)
+++ python/branches/py3k/Doc/library/http.server.rst	Sat Jul  3 12:22:10 2010
@@ -301,7 +301,7 @@
    print("serving at port", PORT)
    httpd.serve_forever()
 
-:mod:`http.server` can also be invoked directly using the :cmdoption:`-m`
+:mod:`http.server` can also be invoked directly using the :option:`-m`
 switch of the interpreter a with ``port number`` argument.  Similar to
 the previous example, this serves files relative to the current directory. ::
 

From python-checkins at python.org  Sat Jul  3 12:25:47 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 12:25:47 +0200 (CEST)
Subject: [Python-checkins] r82482 - python/trunk/Doc/library/argparse.rst
Message-ID: <20100703102547.432ABF0BA@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 12:25:47 2010
New Revision: 82482

Log:
Add missing target.

Modified:
   python/trunk/Doc/library/argparse.rst

Modified: python/trunk/Doc/library/argparse.rst
==============================================================================
--- python/trunk/Doc/library/argparse.rst	(original)
+++ python/trunk/Doc/library/argparse.rst	Sat Jul  3 12:25:47 2010
@@ -1694,6 +1694,8 @@
             yield arg
 
 
+.. _argparse-from-optparse:
+
 Upgrading optparse code
 -----------------------
 

From python-checkins at python.org  Sat Jul  3 12:25:54 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 12:25:54 +0200 (CEST)
Subject: [Python-checkins] r82483 - python/trunk/Doc/glossary.rst
Message-ID: <20100703102554.2B838EE996@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 12:25:54 2010
New Revision: 82483

Log:
Add link to bytecode docs.

Modified:
   python/trunk/Doc/glossary.rst

Modified: python/trunk/Doc/glossary.rst
==============================================================================
--- python/trunk/Doc/glossary.rst	(original)
+++ python/trunk/Doc/glossary.rst	Sat Jul  3 12:25:54 2010
@@ -63,6 +63,9 @@
       "intermediate language" is said to run on a :term:`virtual machine`
       that executes the machine code corresponding to each bytecode.
 
+      A list of bytecode instructions can be found in the documentation for
+      :ref:`the dis module <bytecodes>`.
+
    class
       A template for creating user-defined objects. Class definitions
       normally contain method definitions which operate on instances of the

From python-checkins at python.org  Sat Jul  3 12:26:18 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 12:26:18 +0200 (CEST)
Subject: [Python-checkins] r82484 - python/branches/py3k
Message-ID: <20100703102618.28E1FF0BA@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 12:26:17 2010
New Revision: 82484

Log:
Recorded merge of revisions 82474 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82474 | georg.brandl | 2010-07-03 10:40:13 +0200 (Sa, 03 Jul 2010) | 1 line
  
  Fix role name.
........


Modified:
   python/branches/py3k/   (props changed)

From python-checkins at python.org  Sat Jul  3 12:26:54 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 12:26:54 +0200 (CEST)
Subject: [Python-checkins] r82485 - in python/branches/py3k: Doc/glossary.rst
Message-ID: <20100703102654.62ED2F0BA@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 12:26:54 2010
New Revision: 82485

Log:
Merged revisions 82483 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82483 | georg.brandl | 2010-07-03 12:25:54 +0200 (Sa, 03 Jul 2010) | 1 line
  
  Add link to bytecode docs.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/glossary.rst

Modified: python/branches/py3k/Doc/glossary.rst
==============================================================================
--- python/branches/py3k/Doc/glossary.rst	(original)
+++ python/branches/py3k/Doc/glossary.rst	Sat Jul  3 12:26:54 2010
@@ -66,6 +66,9 @@
       different Python virtual machines, nor to be stable between Python
       releases.
 
+      A list of bytecode instructions can be found in the documentation for
+      :ref:`the dis module <bytecodes>`.
+
    class
       A template for creating user-defined objects. Class definitions
       normally contain method definitions which operate on instances of the

From python-checkins at python.org  Sat Jul  3 12:29:21 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 12:29:21 +0200 (CEST)
Subject: [Python-checkins] r82486 -
	python/branches/release26-maint/Doc/library/urllib.rst
Message-ID: <20100703102921.0D863EE982@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 12:29:20 2010
New Revision: 82486

Log:
Fix markup.

Modified:
   python/branches/release26-maint/Doc/library/urllib.rst

Modified: python/branches/release26-maint/Doc/library/urllib.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/urllib.rst	(original)
+++ python/branches/release26-maint/Doc/library/urllib.rst	Sat Jul  3 12:29:20 2010
@@ -245,7 +245,7 @@
    two-element tuples is used as the *query* argument, the first element of
    each tuple is a key and the second is a value. The value element in itself
    can be a sequence and in that case, if the optional parameter *doseq* is
-   evaluates to *True*, individual ``key=value`` pairs separated by ``'&'``are
+   evaluates to *True*, individual ``key=value`` pairs separated by ``'&'`` are
    generated for each element of the value sequence for the key.  The order of
    parameters in the encoded string will match the order of parameter tuples in
    the sequence. The :mod:`urlparse` module provides the functions

From python-checkins at python.org  Sat Jul  3 12:33:26 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 12:33:26 +0200 (CEST)
Subject: [Python-checkins] r82487 - python/branches/py3k/Doc/glossary.rst
Message-ID: <20100703103326.AF6BAEE982@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 12:33:26 2010
New Revision: 82487

Log:
Fix markup.

Modified:
   python/branches/py3k/Doc/glossary.rst

Modified: python/branches/py3k/Doc/glossary.rst
==============================================================================
--- python/branches/py3k/Doc/glossary.rst	(original)
+++ python/branches/py3k/Doc/glossary.rst	Sat Jul  3 12:33:26 2010
@@ -428,7 +428,6 @@
       modules, respectively.
 
    nested scope
-
       The ability to refer to a variable in an enclosing definition.  For
       instance, a function defined inside another function can refer to
       variables in the outer function.  Note that nested scopes by default work

From python-checkins at python.org  Sat Jul  3 12:41:33 2010
From: python-checkins at python.org (georg.brandl)
Date: Sat,  3 Jul 2010 12:41:33 +0200 (CEST)
Subject: [Python-checkins] r82488 - in python/branches/py3k/Doc:
	library/dis.rst tools/sphinxext/pyspecific.py
Message-ID: <20100703104133.CC9D9EE98B@mail.python.org>

Author: georg.brandl
Date: Sat Jul  3 12:41:33 2010
New Revision: 82488

Log:
Remove the need for a "()" empty argument list after opcodes.

Modified:
   python/branches/py3k/Doc/library/dis.rst
   python/branches/py3k/Doc/tools/sphinxext/pyspecific.py

Modified: python/branches/py3k/Doc/library/dis.rst
==============================================================================
--- python/branches/py3k/Doc/library/dis.rst	(original)
+++ python/branches/py3k/Doc/library/dis.rst	Sat Jul  3 12:41:33 2010
@@ -38,9 +38,9 @@
 
 .. function:: dis(x=None)
 
-   Disassemble the *x* object. *x* can denote either a module, a
+   Disassemble the *x* object.  *x* can denote either a module, a
    class, a method, a function, a code object, a string of source code or a
-   byte sequence of raw bytecode.   For a module, it disassembles all
+   byte sequence of raw bytecode.  For a module, it disassembles all
    functions.  For a class, it disassembles all methods.  For a code object
    or sequence of raw bytecode, it prints one line per bytecode instruction.
    Strings are first compiled to code objects with the :func:`compile`
@@ -50,14 +50,15 @@
 
 .. function:: distb(tb=None)
 
-   Disassembles the top-of-stack function of a traceback, using the last traceback
-   if none was passed.  The instruction causing the exception is indicated.
+   Disassemble the top-of-stack function of a traceback, using the last
+   traceback if none was passed.  The instruction causing the exception is
+   indicated.
 
 
 .. function:: disassemble(code, lasti=-1)
               disco(code, lasti=-1)
 
-   Disassembles a code object, indicating the last instruction if *lasti* was
+   Disassemble a code object, indicating the last instruction if *lasti* was
    provided.  The output is divided in the following columns:
 
    #. the line number, for the first instruction of each line
@@ -143,225 +144,233 @@
 The Python compiler currently generates the following bytecode instructions.
 
 
-.. opcode:: STOP_CODE ()
+**General instructions**
+
+.. opcode:: STOP_CODE
 
    Indicates end-of-code to the compiler, not used by the interpreter.
 
 
-.. opcode:: NOP ()
+.. opcode:: NOP
 
    Do nothing code.  Used as a placeholder by the bytecode optimizer.
 
 
-.. opcode:: POP_TOP ()
+.. opcode:: POP_TOP
 
    Removes the top-of-stack (TOS) item.
 
 
-.. opcode:: ROT_TWO ()
+.. opcode:: ROT_TWO
 
    Swaps the two top-most stack items.
 
 
-.. opcode:: ROT_THREE ()
+.. opcode:: ROT_THREE
 
    Lifts second and third stack item one position up, moves top down to position
    three.
 
 
-.. opcode:: ROT_FOUR ()
+.. opcode:: ROT_FOUR
 
    Lifts second, third and forth stack item one position up, moves top down to
    position four.
 
 
-.. opcode:: DUP_TOP ()
+.. opcode:: DUP_TOP
 
    Duplicates the reference on top of the stack.
 
-Unary Operations take the top of the stack, apply the operation, and push the
-result back on the stack.
 
+**Unary operations**
+
+Unary operations take the top of the stack, apply the operation, and push the
+result back on the stack.
 
-.. opcode:: UNARY_POSITIVE ()
+.. opcode:: UNARY_POSITIVE
 
    Implements ``TOS = +TOS``.
 
 
-.. opcode:: UNARY_NEGATIVE ()
+.. opcode:: UNARY_NEGATIVE
 
    Implements ``TOS = -TOS``.
 
 
-.. opcode:: UNARY_NOT ()
+.. opcode:: UNARY_NOT
 
    Implements ``TOS = not TOS``.
 
 
-.. opcode:: UNARY_INVERT ()
+.. opcode:: UNARY_INVERT
 
    Implements ``TOS = ~TOS``.
 
 
-.. opcode:: GET_ITER ()
+.. opcode:: GET_ITER
 
    Implements ``TOS = iter(TOS)``.
 
+
+**Binary operations**
+
 Binary operations remove the top of the stack (TOS) and the second top-most
 stack item (TOS1) from the stack.  They perform the operation, and put the
 result back on the stack.
 
-
-.. opcode:: BINARY_POWER ()
+.. opcode:: BINARY_POWER
 
    Implements ``TOS = TOS1 ** TOS``.
 
 
-.. opcode:: BINARY_MULTIPLY ()
+.. opcode:: BINARY_MULTIPLY
 
    Implements ``TOS = TOS1 * TOS``.
 
 
-.. opcode:: BINARY_FLOOR_DIVIDE ()
+.. opcode:: BINARY_FLOOR_DIVIDE
 
    Implements ``TOS = TOS1 // TOS``.
 
 
-.. opcode:: BINARY_TRUE_DIVIDE ()
+.. opcode:: BINARY_TRUE_DIVIDE
 
    Implements ``TOS = TOS1 / TOS``.
 
 
-.. opcode:: BINARY_MODULO ()
+.. opcode:: BINARY_MODULO
 
    Implements ``TOS = TOS1 % TOS``.
 
 
-.. opcode:: BINARY_ADD ()
+.. opcode:: BINARY_ADD
 
    Implements ``TOS = TOS1 + TOS``.
 
 
-.. opcode:: BINARY_SUBTRACT ()
+.. opcode:: BINARY_SUBTRACT
 
    Implements ``TOS = TOS1 - TOS``.
 
 
-.. opcode:: BINARY_SUBSCR ()
+.. opcode:: BINARY_SUBSCR
 
    Implements ``TOS = TOS1[TOS]``.
 
 
-.. opcode:: BINARY_LSHIFT ()
+.. opcode:: BINARY_LSHIFT
 
    Implements ``TOS = TOS1 << TOS``.
 
 
-.. opcode:: BINARY_RSHIFT ()
+.. opcode:: BINARY_RSHIFT
 
    Implements ``TOS = TOS1 >> TOS``.
 
 
-.. opcode:: BINARY_AND ()
+.. opcode:: BINARY_AND
 
    Implements ``TOS = TOS1 & TOS``.
 
 
-.. opcode:: BINARY_XOR ()
+.. opcode:: BINARY_XOR
 
    Implements ``TOS = TOS1 ^ TOS``.
 
 
-.. opcode:: BINARY_OR ()
+.. opcode:: BINARY_OR
 
    Implements ``TOS = TOS1 | TOS``.
 
+
+**In-place operations**
+
 In-place operations are like binary operations, in that they remove TOS and
 TOS1, and push the result back on the stack, but the operation is done in-place
 when TOS1 supports it, and the resulting TOS may be (but does not have to be)
 the original TOS1.
 
-
-.. opcode:: INPLACE_POWER ()
+.. opcode:: INPLACE_POWER
 
    Implements in-place ``TOS = TOS1 ** TOS``.
 
 
-.. opcode:: INPLACE_MULTIPLY ()
+.. opcode:: INPLACE_MULTIPLY
 
    Implements in-place ``TOS = TOS1 * TOS``.
 
 
-.. opcode:: INPLACE_FLOOR_DIVIDE ()
+.. opcode:: INPLACE_FLOOR_DIVIDE
 
    Implements in-place ``TOS = TOS1 // TOS``.
 
 
-.. opcode:: INPLACE_TRUE_DIVIDE ()
+.. opcode:: INPLACE_TRUE_DIVIDE
 
    Implements in-place ``TOS = TOS1 / TOS``.
 
 
-.. opcode:: INPLACE_MODULO ()
+.. opcode:: INPLACE_MODULO
 
    Implements in-place ``TOS = TOS1 % TOS``.
 
 
-.. opcode:: INPLACE_ADD ()
+.. opcode:: INPLACE_ADD
 
    Implements in-place ``TOS = TOS1 + TOS``.
 
 
-.. opcode:: INPLACE_SUBTRACT ()
+.. opcode:: INPLACE_SUBTRACT
 
    Implements in-place ``TOS = TOS1 - TOS``.
 
 
-.. opcode:: INPLACE_LSHIFT ()
+.. opcode:: INPLACE_LSHIFT
 
    Implements in-place ``TOS = TOS1 << TOS``.
 
 
-.. opcode:: INPLACE_RSHIFT ()
+.. opcode:: INPLACE_RSHIFT
 
    Implements in-place ``TOS = TOS1 >> TOS``.
 
 
-.. opcode:: INPLACE_AND ()
+.. opcode:: INPLACE_AND
 
    Implements in-place ``TOS = TOS1 & TOS``.
 
 
-.. opcode:: INPLACE_XOR ()
+.. opcode:: INPLACE_XOR
 
    Implements in-place ``TOS = TOS1 ^ TOS``.
 
 
-.. opcode:: INPLACE_OR ()
+.. opcode:: INPLACE_OR
 
    Implements in-place ``TOS = TOS1 | TOS``.
 
 
-.. opcode:: STORE_SUBSCR ()
+.. opcode:: STORE_SUBSCR
 
    Implements ``TOS1[TOS] = TOS2``.
 
 
-.. opcode:: DELETE_SUBSCR ()
+.. opcode:: DELETE_SUBSCR
 
    Implements ``del TOS1[TOS]``.
 
-Miscellaneous opcodes.
 
+**Miscellaneous opcodes**
 
-.. opcode:: PRINT_EXPR ()
+.. opcode:: PRINT_EXPR
 
    Implements the expression statement for the interactive mode.  TOS is removed
    from the stack and printed.  In non-interactive mode, an expression statement is
    terminated with ``POP_STACK``.
 
 
-.. opcode:: BREAK_LOOP ()
+.. opcode:: BREAK_LOOP
 
    Terminates a loop due to a :keyword:`break` statement.
 
@@ -387,36 +396,35 @@
    Calls ``dict.setitem(TOS1[-i], TOS, TOS1)``.  Used to implement dict
    comprehensions.
 
-
 For all of the SET_ADD, LIST_APPEND and MAP_ADD instructions, while the
 added value or key/value pair is popped off, the container object remains on
 the stack so that it is available for further iterations of the loop.
 
 
-.. opcode:: RETURN_VALUE ()
+.. opcode:: RETURN_VALUE
 
    Returns with TOS to the caller of the function.
 
 
-.. opcode:: YIELD_VALUE ()
+.. opcode:: YIELD_VALUE
 
    Pops ``TOS`` and yields it from a :term:`generator`.
 
 
-.. opcode:: IMPORT_STAR ()
+.. opcode:: IMPORT_STAR
 
    Loads all symbols not starting with ``'_'`` directly from the module TOS to the
    local namespace. The module is popped after loading all names. This opcode
    implements ``from module import *``.
 
 
-.. opcode:: POP_BLOCK ()
+.. opcode:: POP_BLOCK
 
    Removes one block from the block stack.  Per frame, there is a  stack of blocks,
    denoting nested loops, try statements, and such.
 
 
-.. opcode:: POP_EXCEPT ()
+.. opcode:: POP_EXCEPT
 
    Removes one block from the block stack. The popped block must be an exception
    handler block, as implicitly created when entering an except handler.
@@ -424,14 +432,14 @@
    last three popped values are used to restore the exception state.
 
 
-.. opcode:: END_FINALLY ()
+.. opcode:: END_FINALLY
 
    Terminates a :keyword:`finally` clause.  The interpreter recalls whether the
    exception has to be re-raised, or whether the function returns, and continues
    with the outer-next block.
 
 
-.. opcode:: LOAD_BUILD_CLASS ()
+.. opcode:: LOAD_BUILD_CLASS
 
    Pushes :func:`builtins.__build_class__` onto the stack.  It is later called
    by ``CALL_FUNCTION`` to construct a class.
@@ -449,7 +457,7 @@
    :opcode:`UNPACK_SEQUENCE`).
 
 
-.. opcode:: WITH_CLEANUP ()
+.. opcode:: WITH_CLEANUP
 
    Cleans up the stack when a :keyword:`with` statement block exits.  TOS is
    the context manager's :meth:`__exit__` bound method. Below TOS are 1--3
@@ -659,7 +667,7 @@
    Pushes a try block from a try-except clause onto the block stack. *delta* points
    to the finally block.
 
-.. opcode:: STORE_MAP ()
+.. opcode:: STORE_MAP
 
    Store a key and value pair in a dictionary.  Pops the key and value while leaving
    the dictionary on the stack.
@@ -775,7 +783,7 @@
    variable-arguments tuple, followed by explicit keyword and positional arguments.
 
 
-.. opcode:: HAVE_ARGUMENT ()
+.. opcode:: HAVE_ARGUMENT
 
    This is not really an opcode.  It identifies the dividing line between opcodes
    which don't take arguments ``< HAVE_ARGUMENT`` and those which do ``>=

Modified: python/branches/py3k/Doc/tools/sphinxext/pyspecific.py
==============================================================================
--- python/branches/py3k/Doc/tools/sphinxext/pyspecific.py	(original)
+++ python/branches/py3k/Doc/tools/sphinxext/pyspecific.py	Sat Jul  3 12:41:33 2010
@@ -5,7 +5,7 @@
 
     Sphinx extension with Python doc-specific markup.
 
-    :copyright: 2008, 2009 by Georg Brandl.
+    :copyright: 2008, 2009, 2010 by Georg Brandl.
     :license: Python license.
 """
 
@@ -149,7 +149,7 @@
 import re
 from sphinx import addnodes
 
-opcode_sig_re = re.compile(r'(\w+(?:\+\d)?)\s*\((.*)\)')
+opcode_sig_re = re.compile(r'(\w+(?:\+\d)?)(?:\s*\((.*)\))?')
 
 def parse_opcode_signature(env, sig, signode):
     """Transform an opcode signature into RST nodes."""
@@ -158,9 +158,10 @@
         raise ValueError
     opname, arglist = m.groups()
     signode += addnodes.desc_name(opname, opname)
-    paramlist = addnodes.desc_parameterlist()
-    signode += paramlist
-    paramlist += addnodes.desc_parameter(arglist, arglist)
+    if arglist is not None:
+        paramlist = addnodes.desc_parameterlist()
+        signode += paramlist
+        paramlist += addnodes.desc_parameter(arglist, arglist)
     return opname.strip()
 
 

From python-checkins at python.org  Sat Jul  3 14:26:03 2010
From: python-checkins at python.org (jesse.noller)
Date: Sat,  3 Jul 2010 14:26:03 +0200 (CEST)
Subject: [Python-checkins] r82489 - in python/trunk/Lib/multiprocessing:
	connection.py forking.py heap.py reduction.py
Message-ID: <20100703122603.18CE0F1AE@mail.python.org>

Author: jesse.noller
Date: Sat Jul  3 14:26:02 2010
New Revision: 82489

Log:
Submit patch for bug 9144; broken imports due to r81380

Modified:
   python/trunk/Lib/multiprocessing/connection.py
   python/trunk/Lib/multiprocessing/forking.py
   python/trunk/Lib/multiprocessing/heap.py
   python/trunk/Lib/multiprocessing/reduction.py

Modified: python/trunk/Lib/multiprocessing/connection.py
==============================================================================
--- python/trunk/Lib/multiprocessing/connection.py	(original)
+++ python/trunk/Lib/multiprocessing/connection.py	Sat Jul  3 14:26:02 2010
@@ -173,7 +173,7 @@
 
 else:
 
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     def Pipe(duplex=True):
         '''

Modified: python/trunk/Lib/multiprocessing/forking.py
==============================================================================
--- python/trunk/Lib/multiprocessing/forking.py	(original)
+++ python/trunk/Lib/multiprocessing/forking.py	Sat Jul  3 14:26:02 2010
@@ -155,7 +155,7 @@
     import _subprocess
     import time
 
-    from ._multiprocessing import win32, Connection, PipeConnection
+    from _multiprocessing import win32, Connection, PipeConnection
     from .util import Finalize
 
     #try:

Modified: python/trunk/Lib/multiprocessing/heap.py
==============================================================================
--- python/trunk/Lib/multiprocessing/heap.py	(original)
+++ python/trunk/Lib/multiprocessing/heap.py	Sat Jul  3 14:26:02 2010
@@ -26,7 +26,7 @@
 
 if sys.platform == 'win32':
 
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     class Arena(object):
 

Modified: python/trunk/Lib/multiprocessing/reduction.py
==============================================================================
--- python/trunk/Lib/multiprocessing/reduction.py	(original)
+++ python/trunk/Lib/multiprocessing/reduction.py	Sat Jul  3 14:26:02 2010
@@ -34,7 +34,7 @@
 
 if sys.platform == 'win32':
     import _subprocess
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     def send_handle(conn, handle, destination_pid):
         process_handle = win32.OpenProcess(

From python-checkins at python.org  Sat Jul  3 15:34:32 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 15:34:32 +0200 (CEST)
Subject: [Python-checkins] r82490 - in python/trunk: Doc/license.rst LICENSE
Message-ID: <20100703133432.E3A1DC37F@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 15:34:32 2010
New Revision: 82490

Log:
add 2.7 to the license list

Modified:
   python/trunk/Doc/license.rst
   python/trunk/LICENSE

Modified: python/trunk/Doc/license.rst
==============================================================================
--- python/trunk/Doc/license.rst	(original)
+++ python/trunk/Doc/license.rst	Sat Jul  3 15:34:32 2010
@@ -102,6 +102,8 @@
 +----------------+--------------+-----------+------------+-----------------+
 | 2.6.4          | 2.6.3        | 2009      | PSF        | yes             |
 +----------------+--------------+-----------+------------+-----------------+
+| 2.7            | 2.6          | 2010      | PSF        | yes             |
++----------------+--------------+-----------+------------+-----------------+
 
 .. note::
 

Modified: python/trunk/LICENSE
==============================================================================
--- python/trunk/LICENSE	(original)
+++ python/trunk/LICENSE	Sat Jul  3 15:34:32 2010
@@ -63,6 +63,7 @@
     2.6.3           2.6.2       2009        PSF         yes
     2.6.4           2.6.3       2009        PSF         yes
     2.6.5           2.6.4       2010        PSF         yes
+    2.7             2.6         2010        PSF         yes
 
 Footnotes:
 

From python-checkins at python.org  Sat Jul  3 15:35:13 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 15:35:13 +0200 (CEST)
Subject: [Python-checkins] r82491 - python/trunk/Doc/license.rst
Message-ID: <20100703133513.D1E70C37F@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 15:35:13 2010
New Revision: 82491

Log:
fix date

Modified:
   python/trunk/Doc/license.rst

Modified: python/trunk/Doc/license.rst
==============================================================================
--- python/trunk/Doc/license.rst	(original)
+++ python/trunk/Doc/license.rst	Sat Jul  3 15:35:13 2010
@@ -100,7 +100,7 @@
 +----------------+--------------+-----------+------------+-----------------+
 | 2.6.3          | 2.6.2        | 2009      | PSF        | yes             |
 +----------------+--------------+-----------+------------+-----------------+
-| 2.6.4          | 2.6.3        | 2009      | PSF        | yes             |
+| 2.6.4          | 2.6.3        | 2010      | PSF        | yes             |
 +----------------+--------------+-----------+------------+-----------------+
 | 2.7            | 2.6          | 2010      | PSF        | yes             |
 +----------------+--------------+-----------+------------+-----------------+

From python-checkins at python.org  Sat Jul  3 15:36:20 2010
From: python-checkins at python.org (victor.stinner)
Date: Sat,  3 Jul 2010 15:36:20 +0200 (CEST)
Subject: [Python-checkins] r82492 - in python/trunk:
	Lib/test/test_audioop.py Misc/NEWS Modules/audioop.c
Message-ID: <20100703133620.302BCC37F@mail.python.org>

Author: victor.stinner
Date: Sat Jul  3 15:36:19 2010
New Revision: 82492

Log:
Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
ensure that the input string length is a multiple of the frame size


Modified:
   python/trunk/Lib/test/test_audioop.py
   python/trunk/Misc/NEWS
   python/trunk/Modules/audioop.c

Modified: python/trunk/Lib/test/test_audioop.py
==============================================================================
--- python/trunk/Lib/test/test_audioop.py	(original)
+++ python/trunk/Lib/test/test_audioop.py	Sat Jul  3 15:36:19 2010
@@ -20,6 +20,12 @@
 
 data = [gendata1(), gendata2(), gendata4()]
 
+INVALID_DATA = [
+    ('abc', 0),
+    ('abc', 2),
+    ('abc', 4),
+]
+
 
 class TestAudioop(unittest.TestCase):
 
@@ -166,6 +172,33 @@
         self.assertRaises(audioop.error,
             audioop.findmax, ''.join( chr(x) for x in xrange(256)), -2392392)
 
+    def test_issue7673(self):
+        state = None
+        for data, size in INVALID_DATA:
+            size2 = size
+            self.assertRaises(audioop.error, audioop.getsample, data, size, 0)
+            self.assertRaises(audioop.error, audioop.max, data, size)
+            self.assertRaises(audioop.error, audioop.minmax, data, size)
+            self.assertRaises(audioop.error, audioop.avg, data, size)
+            self.assertRaises(audioop.error, audioop.rms, data, size)
+            self.assertRaises(audioop.error, audioop.avgpp, data, size)
+            self.assertRaises(audioop.error, audioop.maxpp, data, size)
+            self.assertRaises(audioop.error, audioop.cross, data, size)
+            self.assertRaises(audioop.error, audioop.mul, data, size, 1.0)
+            self.assertRaises(audioop.error, audioop.tomono, data, size, 0.5, 0.5)
+            self.assertRaises(audioop.error, audioop.tostereo, data, size, 0.5, 0.5)
+            self.assertRaises(audioop.error, audioop.add, data, data, size)
+            self.assertRaises(audioop.error, audioop.bias, data, size, 0)
+            self.assertRaises(audioop.error, audioop.reverse, data, size)
+            self.assertRaises(audioop.error, audioop.lin2lin, data, size, size2)
+            self.assertRaises(audioop.error, audioop.ratecv, data, size, 1, 1, 1, state)
+            self.assertRaises(audioop.error, audioop.lin2ulaw, data, size)
+            self.assertRaises(audioop.error, audioop.ulaw2lin, data, size)
+            self.assertRaises(audioop.error, audioop.lin2alaw, data, size)
+            self.assertRaises(audioop.error, audioop.alaw2lin, data, size)
+            self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state)
+            self.assertRaises(audioop.error, audioop.adpcm2lin, data, size, state)
+
 def test_main():
     run_unittest(TestAudioop)
 

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Jul  3 15:36:19 2010
@@ -17,6 +17,9 @@
 Library
 -------
 
+- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
+  module, ensure that the input string length is a multiple of the frame size
+
 - Issue #9075: In the ssl module, remove the setting of a ``debug`` flag
   on an OpenSSL structure.
 
@@ -51,7 +54,7 @@
 Library
 -------
 
-- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor 
+- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor
   raises an exception.
 
 - Issue #8959: fix regression caused by using unmodified libffi

Modified: python/trunk/Modules/audioop.c
==============================================================================
--- python/trunk/Modules/audioop.c	(original)
+++ python/trunk/Modules/audioop.c	Sat Jul  3 15:36:19 2010
@@ -295,6 +295,29 @@
 
 static PyObject *AudioopError;
 
+static int
+audioop_check_size(int size)
+{
+    if (size != 1 && size != 2 && size != 4) {
+        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+        return 0;
+    }
+    else
+        return 1;
+}
+
+static int
+audioop_check_parameters(int len, int size)
+{
+    if (!audioop_check_size(size))
+        return 0;
+    if (len % size != 0) {
+        PyErr_SetString(AudioopError, "not a whole number of frames");
+        return 0;
+    }
+    return 1;
+}
+
 static PyObject *
 audioop_getsample(PyObject *self, PyObject *args)
 {
@@ -304,10 +327,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#ii:getsample", &cp, &len, &size, &i) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     if ( i < 0 || i >= len/size ) {
         PyErr_SetString(AudioopError, "Index out of range");
         return 0;
@@ -328,10 +349,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:max", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -352,10 +371,8 @@
 
     if (!PyArg_ParseTuple(args, "s#i:minmax", &cp, &len, &size))
         return NULL;
-    if (size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+    if (!audioop_check_parameters(len, size))
         return NULL;
-    }
     for (i = 0; i < len; i += size) {
         if (size == 1) val = (int) *CHARP(cp, i);
         else if (size == 2) val = (int) *SHORTP(cp, i);
@@ -376,10 +393,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:avg", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -403,10 +418,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:rms", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -612,10 +625,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:avgpp", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     /* Compute first delta value ahead. Also automatically makes us
     ** skip the first extreme value
     */
@@ -669,10 +680,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:maxpp", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     /* Compute first delta value ahead. Also automatically makes us
     ** skip the first extreme value
     */
@@ -720,10 +729,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:cross", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     ncross = -1;
     prevval = 17; /* Anything <> 0,1 */
     for ( i=0; i<len; i+= size) {
@@ -748,6 +755,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#id:mul", &cp, &len, &size, &factor ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -790,6 +799,12 @@
     if ( !PyArg_ParseTuple(args, "s#idd:tomono",
                            &cp, &len, &size, &fac1, &fac2 ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
+    if (((len / size) & 1) != 0) {
+        PyErr_SetString(AudioopError, "not a whole number of frames");
+        return NULL;
+    }
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -835,6 +850,8 @@
     if ( !PyArg_ParseTuple(args, "s#idd:tostereo",
                            &cp, &len, &size, &fac1, &fac2 ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -893,7 +910,8 @@
     if ( !PyArg_ParseTuple(args, "s#s#i:add",
                       &cp1, &len1, &cp2, &len2, &size ) )
         return 0;
-
+    if (!audioop_check_parameters(len1, size))
+        return NULL;
     if ( len1 != len2 ) {
         PyErr_SetString(AudioopError, "Lengths should be the same");
         return 0;
@@ -948,10 +966,8 @@
                       &cp, &len, &size , &bias) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyString_FromStringAndSize(NULL, len);
     if ( rv == 0 )
@@ -984,10 +1000,8 @@
                       &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyString_FromStringAndSize(NULL, len);
     if ( rv == 0 )
@@ -1021,11 +1035,10 @@
                       &cp, &len, &size, &size2) )
         return 0;
 
-    if ( (size != 1 && size != 2 && size != 4) ||
-         (size2 != 1 && size2 != 2 && size2 != 4)) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
+    if (!audioop_check_size(size2))
+        return NULL;
 
     if (len/size > INT_MAX/size2) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1075,10 +1088,8 @@
                           &nchannels, &inrate, &outrate, &state,
                           &weightA, &weightB))
         return NULL;
-    if (size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+    if (!audioop_check_size(size))
         return NULL;
-    }
     if (nchannels < 1) {
         PyErr_SetString(AudioopError, "# of channels should be >= 1");
         return NULL;
@@ -1255,10 +1266,8 @@
                            &cp, &len, &size) )
         return 0 ;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyString_FromStringAndSize(NULL, len/size);
     if ( rv == 0 )
@@ -1289,10 +1298,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if (len > INT_MAX/size) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1328,10 +1335,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyString_FromStringAndSize(NULL, len/size);
     if ( rv == 0 )
@@ -1362,10 +1367,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if (len > INT_MAX/size) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1402,11 +1405,8 @@
                            &cp, &len, &size, &state) )
         return 0;
 
-
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     str = PyString_FromStringAndSize(NULL, len/(size*2));
     if ( str == 0 )
@@ -1509,10 +1509,8 @@
                            &cp, &len, &size, &state) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     /* Decode state, should have (value, step) */
     if ( state == Py_None ) {

From python-checkins at python.org  Sat Jul  3 15:37:39 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 15:37:39 +0200 (CEST)
Subject: [Python-checkins] r82493 - python/trunk/Doc/whatsnew/2.7.rst
Message-ID: <20100703133739.42A72C37F@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 15:37:39 2010
New Revision: 82493

Log:
add release date

Modified:
   python/trunk/Doc/whatsnew/2.7.rst

Modified: python/trunk/Doc/whatsnew/2.7.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.7.rst	(original)
+++ python/trunk/Doc/whatsnew/2.7.rst	Sat Jul  3 15:37:39 2010
@@ -51,9 +51,8 @@
    This saves the maintainer some effort going through the SVN logs
    when researching a change.
 
-This article explains the new features in Python 2.7.  The final
-release of 2.7 is currently scheduled for July 2010; the detailed
-schedule is described in :pep:`373`.
+This article explains the new features in Python 2.7.  Python 2.7 was released
+on July 7, 2010.
 
 Numeric handling has been improved in many ways, for both
 floating-point numbers and for the :class:`~decimal.Decimal` class.

From python-checkins at python.org  Sat Jul  3 15:39:22 2010
From: python-checkins at python.org (victor.stinner)
Date: Sat,  3 Jul 2010 15:39:22 +0200 (CEST)
Subject: [Python-checkins] r82494 - in python/branches/release26-maint:
	Lib/test/test_audioop.py Misc/NEWS Modules/audioop.c
Message-ID: <20100703133922.5F4D4F1AE@mail.python.org>

Author: victor.stinner
Date: Sat Jul  3 15:39:22 2010
New Revision: 82494

Log:
Merged revisions 82492 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82492 | victor.stinner | 2010-07-03 15:36:19 +0200 (sam., 03 juil. 2010) | 3 lines
  
  Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
  ensure that the input string length is a multiple of the frame size
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_audioop.py
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/audioop.c

Modified: python/branches/release26-maint/Lib/test/test_audioop.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_audioop.py	(original)
+++ python/branches/release26-maint/Lib/test/test_audioop.py	Sat Jul  3 15:39:22 2010
@@ -20,6 +20,12 @@
 
 data = [gendata1(), gendata2(), gendata4()]
 
+INVALID_DATA = [
+    ('abc', 0),
+    ('abc', 2),
+    ('abc', 4),
+]
+
 
 class TestAudioop(unittest.TestCase):
 
@@ -166,6 +172,33 @@
         self.assertRaises(audioop.error,
             audioop.findmax, ''.join( chr(x) for x in xrange(256)), -2392392)
 
+    def test_issue7673(self):
+        state = None
+        for data, size in INVALID_DATA:
+            size2 = size
+            self.assertRaises(audioop.error, audioop.getsample, data, size, 0)
+            self.assertRaises(audioop.error, audioop.max, data, size)
+            self.assertRaises(audioop.error, audioop.minmax, data, size)
+            self.assertRaises(audioop.error, audioop.avg, data, size)
+            self.assertRaises(audioop.error, audioop.rms, data, size)
+            self.assertRaises(audioop.error, audioop.avgpp, data, size)
+            self.assertRaises(audioop.error, audioop.maxpp, data, size)
+            self.assertRaises(audioop.error, audioop.cross, data, size)
+            self.assertRaises(audioop.error, audioop.mul, data, size, 1.0)
+            self.assertRaises(audioop.error, audioop.tomono, data, size, 0.5, 0.5)
+            self.assertRaises(audioop.error, audioop.tostereo, data, size, 0.5, 0.5)
+            self.assertRaises(audioop.error, audioop.add, data, data, size)
+            self.assertRaises(audioop.error, audioop.bias, data, size, 0)
+            self.assertRaises(audioop.error, audioop.reverse, data, size)
+            self.assertRaises(audioop.error, audioop.lin2lin, data, size, size2)
+            self.assertRaises(audioop.error, audioop.ratecv, data, size, 1, 1, 1, state)
+            self.assertRaises(audioop.error, audioop.lin2ulaw, data, size)
+            self.assertRaises(audioop.error, audioop.ulaw2lin, data, size)
+            self.assertRaises(audioop.error, audioop.lin2alaw, data, size)
+            self.assertRaises(audioop.error, audioop.alaw2lin, data, size)
+            self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state)
+            self.assertRaises(audioop.error, audioop.adpcm2lin, data, size, state)
+
 def test_main():
     run_unittest(TestAudioop)
 

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sat Jul  3 15:39:22 2010
@@ -81,7 +81,10 @@
 Library
 -------
 
-- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor 
+- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
+  module, ensure that the input string length is a multiple of the frame size
+
+- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor
   raises an exception.
 
 - Issue #9125: Add recognition of 'except ... as ...' syntax to parser module.

Modified: python/branches/release26-maint/Modules/audioop.c
==============================================================================
--- python/branches/release26-maint/Modules/audioop.c	(original)
+++ python/branches/release26-maint/Modules/audioop.c	Sat Jul  3 15:39:22 2010
@@ -295,6 +295,29 @@
 
 static PyObject *AudioopError;
 
+static int
+audioop_check_size(int size)
+{
+    if (size != 1 && size != 2 && size != 4) {
+        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+        return 0;
+    }
+    else
+        return 1;
+}
+
+static int
+audioop_check_parameters(int len, int size)
+{
+    if (!audioop_check_size(size))
+        return 0;
+    if (len % size != 0) {
+        PyErr_SetString(AudioopError, "not a whole number of frames");
+        return 0;
+    }
+    return 1;
+}
+
 static PyObject *
 audioop_getsample(PyObject *self, PyObject *args)
 {
@@ -304,10 +327,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#ii:getsample", &cp, &len, &size, &i) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     if ( i < 0 || i >= len/size ) {
         PyErr_SetString(AudioopError, "Index out of range");
         return 0;
@@ -328,10 +349,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:max", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -352,10 +371,8 @@
 
     if (!PyArg_ParseTuple(args, "s#i:minmax", &cp, &len, &size))
         return NULL;
-    if (size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+    if (!audioop_check_parameters(len, size))
         return NULL;
-    }
     for (i = 0; i < len; i += size) {
         if (size == 1) val = (int) *CHARP(cp, i);
         else if (size == 2) val = (int) *SHORTP(cp, i);
@@ -376,10 +393,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:avg", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -403,10 +418,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:rms", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -614,10 +627,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:avgpp", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     /* Compute first delta value ahead. Also automatically makes us
     ** skip the first extreme value
     */
@@ -671,10 +682,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:maxpp", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     /* Compute first delta value ahead. Also automatically makes us
     ** skip the first extreme value
     */
@@ -722,10 +731,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:cross", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     ncross = -1;
     prevval = 17; /* Anything <> 0,1 */
     for ( i=0; i<len; i+= size) {
@@ -750,6 +757,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#id:mul", &cp, &len, &size, &factor ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -792,6 +801,12 @@
     if ( !PyArg_ParseTuple(args, "s#idd:tomono",
                            &cp, &len, &size, &fac1, &fac2 ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
+    if (((len / size) & 1) != 0) {
+        PyErr_SetString(AudioopError, "not a whole number of frames");
+        return NULL;
+    }
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -837,6 +852,8 @@
     if ( !PyArg_ParseTuple(args, "s#idd:tostereo",
                            &cp, &len, &size, &fac1, &fac2 ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -895,7 +912,8 @@
     if ( !PyArg_ParseTuple(args, "s#s#i:add",
                       &cp1, &len1, &cp2, &len2, &size ) )
         return 0;
-
+    if (!audioop_check_parameters(len1, size))
+        return NULL;
     if ( len1 != len2 ) {
         PyErr_SetString(AudioopError, "Lengths should be the same");
         return 0;
@@ -950,10 +968,8 @@
                       &cp, &len, &size , &bias) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyString_FromStringAndSize(NULL, len);
     if ( rv == 0 )
@@ -986,10 +1002,8 @@
                       &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyString_FromStringAndSize(NULL, len);
     if ( rv == 0 )
@@ -1023,11 +1037,10 @@
                       &cp, &len, &size, &size2) )
         return 0;
 
-    if ( (size != 1 && size != 2 && size != 4) ||
-         (size2 != 1 && size2 != 2 && size2 != 4)) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
+    if (!audioop_check_size(size2))
+        return NULL;
 
     if (len/size > INT_MAX/size2) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1077,10 +1090,8 @@
                           &nchannels, &inrate, &outrate, &state,
                           &weightA, &weightB))
         return NULL;
-    if (size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+    if (!audioop_check_size(size))
         return NULL;
-    }
     if (nchannels < 1) {
         PyErr_SetString(AudioopError, "# of channels should be >= 1");
         return NULL;
@@ -1257,10 +1268,8 @@
                            &cp, &len, &size) )
         return 0 ;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyString_FromStringAndSize(NULL, len/size);
     if ( rv == 0 )
@@ -1291,10 +1300,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if (len > INT_MAX/size) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1330,10 +1337,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyString_FromStringAndSize(NULL, len/size);
     if ( rv == 0 )
@@ -1364,10 +1369,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if (len > INT_MAX/size) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1404,11 +1407,8 @@
                            &cp, &len, &size, &state) )
         return 0;
 
-
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     str = PyString_FromStringAndSize(NULL, len/(size*2));
     if ( str == 0 )
@@ -1512,10 +1512,8 @@
                            &cp, &len, &size, &state) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     /* Decode state, should have (value, step) */
     if ( state == Py_None ) {

From python-checkins at python.org  Sat Jul  3 15:44:22 2010
From: python-checkins at python.org (victor.stinner)
Date: Sat,  3 Jul 2010 15:44:22 +0200 (CEST)
Subject: [Python-checkins] r82495 - in python/branches/py3k:
	Lib/test/test_audioop.py Misc/NEWS Modules/audioop.c
Message-ID: <20100703134422.437CFED67@mail.python.org>

Author: victor.stinner
Date: Sat Jul  3 15:44:22 2010
New Revision: 82495

Log:
Merged revisions 82492 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/trunk

........
  r82492 | victor.stinner | 2010-07-03 15:36:19 +0200 (sam., 03 juil. 2010) | 3 lines
  
  Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
  ensure that the input string length is a multiple of the frame size
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_audioop.py
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/audioop.c

Modified: python/branches/py3k/Lib/test/test_audioop.py
==============================================================================
--- python/branches/py3k/Lib/test/test_audioop.py	(original)
+++ python/branches/py3k/Lib/test/test_audioop.py	Sat Jul  3 15:44:22 2010
@@ -20,6 +20,12 @@
 
 data = [gendata1(), gendata2(), gendata4()]
 
+INVALID_DATA = [
+    ('abc', 0),
+    ('abc', 2),
+    ('abc', 4),
+]
+
 
 class TestAudioop(unittest.TestCase):
 
@@ -168,6 +174,33 @@
         self.assertRaises(audioop.error,
             audioop.findmax, ''.join(chr(x) for x in range(256)), -2392392)
 
+    def test_issue7673(self):
+        state = None
+        for data, size in INVALID_DATA:
+            size2 = size
+            self.assertRaises(audioop.error, audioop.getsample, data, size, 0)
+            self.assertRaises(audioop.error, audioop.max, data, size)
+            self.assertRaises(audioop.error, audioop.minmax, data, size)
+            self.assertRaises(audioop.error, audioop.avg, data, size)
+            self.assertRaises(audioop.error, audioop.rms, data, size)
+            self.assertRaises(audioop.error, audioop.avgpp, data, size)
+            self.assertRaises(audioop.error, audioop.maxpp, data, size)
+            self.assertRaises(audioop.error, audioop.cross, data, size)
+            self.assertRaises(audioop.error, audioop.mul, data, size, 1.0)
+            self.assertRaises(audioop.error, audioop.tomono, data, size, 0.5, 0.5)
+            self.assertRaises(audioop.error, audioop.tostereo, data, size, 0.5, 0.5)
+            self.assertRaises(audioop.error, audioop.add, data, data, size)
+            self.assertRaises(audioop.error, audioop.bias, data, size, 0)
+            self.assertRaises(audioop.error, audioop.reverse, data, size)
+            self.assertRaises(audioop.error, audioop.lin2lin, data, size, size2)
+            self.assertRaises(audioop.error, audioop.ratecv, data, size, 1, 1, 1, state)
+            self.assertRaises(audioop.error, audioop.lin2ulaw, data, size)
+            self.assertRaises(audioop.error, audioop.ulaw2lin, data, size)
+            self.assertRaises(audioop.error, audioop.lin2alaw, data, size)
+            self.assertRaises(audioop.error, audioop.alaw2lin, data, size)
+            self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state)
+            self.assertRaises(audioop.error, audioop.adpcm2lin, data, size, state)
+
 def test_main():
     run_unittest(TestAudioop)
 

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Jul  3 15:44:22 2010
@@ -468,13 +468,16 @@
 Library
 -------
 
+- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
+  module, ensure that the input string length is a multiple of the frame size
+
 - Issue #6507: Accept source strings in dis.dis(). Original patch by
   Daniel Urban.
 
 - Issue #7829: Clearly document that the dis module is exposing an
   implementation detail that is not stable between Python VMs or releases.
 
-- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor 
+- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor
   raises an exception.
 
 - Issue #9110: Addition of ContextDecorator to contextlib, for creating APIs

Modified: python/branches/py3k/Modules/audioop.c
==============================================================================
--- python/branches/py3k/Modules/audioop.c	(original)
+++ python/branches/py3k/Modules/audioop.c	Sat Jul  3 15:44:22 2010
@@ -297,6 +297,29 @@
 
 static PyObject *AudioopError;
 
+static int
+audioop_check_size(int size)
+{
+    if (size != 1 && size != 2 && size != 4) {
+        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+        return 0;
+    }
+    else
+        return 1;
+}
+
+static int
+audioop_check_parameters(int len, int size)
+{
+    if (!audioop_check_size(size))
+        return 0;
+    if (len % size != 0) {
+        PyErr_SetString(AudioopError, "not a whole number of frames");
+        return 0;
+    }
+    return 1;
+}
+
 static PyObject *
 audioop_getsample(PyObject *self, PyObject *args)
 {
@@ -306,10 +329,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#in:getsample", &cp, &len, &size, &i) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     if ( i < 0 || i >= len/size ) {
         PyErr_SetString(AudioopError, "Index out of range");
         return 0;
@@ -330,10 +351,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:max", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -354,10 +373,8 @@
 
     if (!PyArg_ParseTuple(args, "s#i:minmax", &cp, &len, &size))
         return NULL;
-    if (size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+    if (!audioop_check_parameters(len, size))
         return NULL;
-    }
     for (i = 0; i < len; i += size) {
         if (size == 1) val = (int) *CHARP(cp, i);
         else if (size == 2) val = (int) *SHORTP(cp, i);
@@ -378,10 +395,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:avg", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -405,10 +420,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:rms", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -616,10 +629,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:avgpp", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     /* Compute first delta value ahead. Also automatically makes us
     ** skip the first extreme value
     */
@@ -673,10 +684,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:maxpp", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     /* Compute first delta value ahead. Also automatically makes us
     ** skip the first extreme value
     */
@@ -725,10 +734,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:cross", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     ncross = -1;
     prevval = 17; /* Anything <> 0,1 */
     for ( i=0; i<len; i+= size) {
@@ -753,6 +760,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#id:mul", &cp, &len, &size, &factor ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -798,6 +807,12 @@
         return 0;
     cp = pcp.buf;
     len = pcp.len;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
+    if (((len / size) & 1) != 0) {
+        PyErr_SetString(AudioopError, "not a whole number of frames");
+        return NULL;
+    }
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -845,6 +860,8 @@
     if ( !PyArg_ParseTuple(args, "s#idd:tostereo",
                            &cp, &len, &size, &fac1, &fac2 ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -903,7 +920,8 @@
     if ( !PyArg_ParseTuple(args, "s#s#i:add",
                       &cp1, &len1, &cp2, &len2, &size ) )
         return 0;
-
+    if (!audioop_check_parameters(len1, size))
+        return NULL;
     if ( len1 != len2 ) {
         PyErr_SetString(AudioopError, "Lengths should be the same");
         return 0;
@@ -958,10 +976,8 @@
                       &cp, &len, &size , &bias) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyBytes_FromStringAndSize(NULL, len);
     if ( rv == 0 )
@@ -994,10 +1010,8 @@
                       &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyBytes_FromStringAndSize(NULL, len);
     if ( rv == 0 )
@@ -1031,11 +1045,10 @@
                       &cp, &len, &size, &size2) )
         return 0;
 
-    if ( (size != 1 && size != 2 && size != 4) ||
-         (size2 != 1 && size2 != 2 && size2 != 4)) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
+    if (!audioop_check_size(size2))
+        return NULL;
 
     if (len/size > PY_SSIZE_T_MAX/size2) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1086,10 +1099,8 @@
                           &nchannels, &inrate, &outrate, &state,
                           &weightA, &weightB))
         return NULL;
-    if (size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+    if (!audioop_check_size(size))
         return NULL;
-    }
     if (nchannels < 1) {
         PyErr_SetString(AudioopError, "# of channels should be >= 1");
         return NULL;
@@ -1265,10 +1276,8 @@
                            &cp, &len, &size) )
         return 0 ;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyBytes_FromStringAndSize(NULL, len/size);
     if ( rv == 0 )
@@ -1299,10 +1308,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if (len > PY_SSIZE_T_MAX/size) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1338,10 +1345,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyBytes_FromStringAndSize(NULL, len/size);
     if ( rv == 0 )
@@ -1372,10 +1377,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if (len > PY_SSIZE_T_MAX/size) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1413,11 +1416,8 @@
                            &cp, &len, &size, &state) )
         return 0;
 
-
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     str = PyBytes_FromStringAndSize(NULL, len/(size*2));
     if ( str == 0 )
@@ -1522,10 +1522,8 @@
                            &cp, &len, &size, &state) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     /* Decode state, should have (value, step) */
     if ( state == Py_None ) {

From python-checkins at python.org  Sat Jul  3 15:46:02 2010
From: python-checkins at python.org (victor.stinner)
Date: Sat,  3 Jul 2010 15:46:02 +0200 (CEST)
Subject: [Python-checkins] r82496 - in python/branches/release31-maint:
	Lib/test/test_audioop.py Misc/NEWS Modules/audioop.c
Message-ID: <20100703134602.3247DED67@mail.python.org>

Author: victor.stinner
Date: Sat Jul  3 15:46:01 2010
New Revision: 82496

Log:
Merged revisions 82495 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/branches/py3k

................
  r82495 | victor.stinner | 2010-07-03 15:44:22 +0200 (sam., 03 juil. 2010) | 10 lines
  
  Merged revisions 82492 via svnmerge from 
  svn+ssh://pythondev at svn.python.org/python/trunk
  
  ........
    r82492 | victor.stinner | 2010-07-03 15:36:19 +0200 (sam., 03 juil. 2010) | 3 lines
    
    Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
    ensure that the input string length is a multiple of the frame size
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_audioop.py
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/audioop.c

Modified: python/branches/release31-maint/Lib/test/test_audioop.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_audioop.py	(original)
+++ python/branches/release31-maint/Lib/test/test_audioop.py	Sat Jul  3 15:46:01 2010
@@ -20,6 +20,12 @@
 
 data = [gendata1(), gendata2(), gendata4()]
 
+INVALID_DATA = [
+    ('abc', 0),
+    ('abc', 2),
+    ('abc', 4),
+]
+
 
 class TestAudioop(unittest.TestCase):
 
@@ -168,6 +174,33 @@
         self.assertRaises(audioop.error,
             audioop.findmax, ''.join(chr(x) for x in range(256)), -2392392)
 
+    def test_issue7673(self):
+        state = None
+        for data, size in INVALID_DATA:
+            size2 = size
+            self.assertRaises(audioop.error, audioop.getsample, data, size, 0)
+            self.assertRaises(audioop.error, audioop.max, data, size)
+            self.assertRaises(audioop.error, audioop.minmax, data, size)
+            self.assertRaises(audioop.error, audioop.avg, data, size)
+            self.assertRaises(audioop.error, audioop.rms, data, size)
+            self.assertRaises(audioop.error, audioop.avgpp, data, size)
+            self.assertRaises(audioop.error, audioop.maxpp, data, size)
+            self.assertRaises(audioop.error, audioop.cross, data, size)
+            self.assertRaises(audioop.error, audioop.mul, data, size, 1.0)
+            self.assertRaises(audioop.error, audioop.tomono, data, size, 0.5, 0.5)
+            self.assertRaises(audioop.error, audioop.tostereo, data, size, 0.5, 0.5)
+            self.assertRaises(audioop.error, audioop.add, data, data, size)
+            self.assertRaises(audioop.error, audioop.bias, data, size, 0)
+            self.assertRaises(audioop.error, audioop.reverse, data, size)
+            self.assertRaises(audioop.error, audioop.lin2lin, data, size, size2)
+            self.assertRaises(audioop.error, audioop.ratecv, data, size, 1, 1, 1, state)
+            self.assertRaises(audioop.error, audioop.lin2ulaw, data, size)
+            self.assertRaises(audioop.error, audioop.ulaw2lin, data, size)
+            self.assertRaises(audioop.error, audioop.lin2alaw, data, size)
+            self.assertRaises(audioop.error, audioop.alaw2lin, data, size)
+            self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state)
+            self.assertRaises(audioop.error, audioop.adpcm2lin, data, size, state)
+
 def test_main():
     run_unittest(TestAudioop)
 

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sat Jul  3 15:46:01 2010
@@ -75,7 +75,10 @@
 Library
 -------
 
-- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor 
+- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
+  module, ensure that the input string length is a multiple of the frame size
+
+- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor
   raises an exception.
 
 - Issue #9075: In the ssl module, remove the setting of a ``debug`` flag

Modified: python/branches/release31-maint/Modules/audioop.c
==============================================================================
--- python/branches/release31-maint/Modules/audioop.c	(original)
+++ python/branches/release31-maint/Modules/audioop.c	Sat Jul  3 15:46:01 2010
@@ -295,6 +295,29 @@
 
 static PyObject *AudioopError;
 
+static int
+audioop_check_size(int size)
+{
+    if (size != 1 && size != 2 && size != 4) {
+        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+        return 0;
+    }
+    else
+        return 1;
+}
+
+static int
+audioop_check_parameters(int len, int size)
+{
+    if (!audioop_check_size(size))
+        return 0;
+    if (len % size != 0) {
+        PyErr_SetString(AudioopError, "not a whole number of frames");
+        return 0;
+    }
+    return 1;
+}
+
 static PyObject *
 audioop_getsample(PyObject *self, PyObject *args)
 {
@@ -304,10 +327,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#ii:getsample", &cp, &len, &size, &i) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     if ( i < 0 || i >= len/size ) {
         PyErr_SetString(AudioopError, "Index out of range");
         return 0;
@@ -328,10 +349,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:max", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -352,10 +371,8 @@
 
     if (!PyArg_ParseTuple(args, "s#i:minmax", &cp, &len, &size))
         return NULL;
-    if (size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+    if (!audioop_check_parameters(len, size))
         return NULL;
-    }
     for (i = 0; i < len; i += size) {
         if (size == 1) val = (int) *CHARP(cp, i);
         else if (size == 2) val = (int) *SHORTP(cp, i);
@@ -376,10 +393,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:avg", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -403,10 +418,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:rms", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     for ( i=0; i<len; i+= size) {
         if ( size == 1 )      val = (int)*CHARP(cp, i);
         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
@@ -614,10 +627,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:avgpp", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     /* Compute first delta value ahead. Also automatically makes us
     ** skip the first extreme value
     */
@@ -671,10 +682,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:maxpp", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     /* Compute first delta value ahead. Also automatically makes us
     ** skip the first extreme value
     */
@@ -722,10 +731,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#i:cross", &cp, &len, &size) )
         return 0;
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
     ncross = -1;
     prevval = 17; /* Anything <> 0,1 */
     for ( i=0; i<len; i+= size) {
@@ -750,6 +757,8 @@
 
     if ( !PyArg_ParseTuple(args, "s#id:mul", &cp, &len, &size, &factor ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -795,6 +804,12 @@
         return 0;
     cp = pcp.buf;
     len = pcp.len;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
+    if (((len / size) & 1) != 0) {
+        PyErr_SetString(AudioopError, "not a whole number of frames");
+        return NULL;
+    }
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -842,6 +857,8 @@
     if ( !PyArg_ParseTuple(args, "s#idd:tostereo",
                            &cp, &len, &size, &fac1, &fac2 ) )
         return 0;
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if ( size == 1 ) maxval = (double) 0x7f;
     else if ( size == 2 ) maxval = (double) 0x7fff;
@@ -900,7 +917,8 @@
     if ( !PyArg_ParseTuple(args, "s#s#i:add",
                       &cp1, &len1, &cp2, &len2, &size ) )
         return 0;
-
+    if (!audioop_check_parameters(len1, size))
+        return NULL;
     if ( len1 != len2 ) {
         PyErr_SetString(AudioopError, "Lengths should be the same");
         return 0;
@@ -955,10 +973,8 @@
                       &cp, &len, &size , &bias) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyBytes_FromStringAndSize(NULL, len);
     if ( rv == 0 )
@@ -991,10 +1007,8 @@
                       &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4 ) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyBytes_FromStringAndSize(NULL, len);
     if ( rv == 0 )
@@ -1028,11 +1042,10 @@
                       &cp, &len, &size, &size2) )
         return 0;
 
-    if ( (size != 1 && size != 2 && size != 4) ||
-         (size2 != 1 && size2 != 2 && size2 != 4)) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
+    if (!audioop_check_size(size2))
+        return NULL;
 
     if (len/size > INT_MAX/size2) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1082,10 +1095,8 @@
                           &nchannels, &inrate, &outrate, &state,
                           &weightA, &weightB))
         return NULL;
-    if (size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+    if (!audioop_check_size(size))
         return NULL;
-    }
     if (nchannels < 1) {
         PyErr_SetString(AudioopError, "# of channels should be >= 1");
         return NULL;
@@ -1261,10 +1272,8 @@
                            &cp, &len, &size) )
         return 0 ;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyBytes_FromStringAndSize(NULL, len/size);
     if ( rv == 0 )
@@ -1295,10 +1304,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if (len > INT_MAX/size) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1334,10 +1341,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     rv = PyBytes_FromStringAndSize(NULL, len/size);
     if ( rv == 0 )
@@ -1368,10 +1373,8 @@
                            &cp, &len, &size) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     if (len > INT_MAX/size) {
         PyErr_SetString(PyExc_MemoryError,
@@ -1408,11 +1411,8 @@
                            &cp, &len, &size, &state) )
         return 0;
 
-
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     str = PyBytes_FromStringAndSize(NULL, len/(size*2));
     if ( str == 0 )
@@ -1516,10 +1516,8 @@
                            &cp, &len, &size, &state) )
         return 0;
 
-    if ( size != 1 && size != 2 && size != 4) {
-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
-        return 0;
-    }
+    if (!audioop_check_parameters(len, size))
+        return NULL;
 
     /* Decode state, should have (value, step) */
     if ( state == Py_None ) {

From python-checkins at python.org  Sat Jul  3 15:49:03 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 15:49:03 +0200 (CEST)
Subject: [Python-checkins] r82497 - python/trunk/Lib/idlelib/NEWS.txt
Message-ID: <20100703134903.2B054ED67@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 15:49:03 2010
New Revision: 82497

Log:
add release date

Modified:
   python/trunk/Lib/idlelib/NEWS.txt

Modified: python/trunk/Lib/idlelib/NEWS.txt
==============================================================================
--- python/trunk/Lib/idlelib/NEWS.txt	(original)
+++ python/trunk/Lib/idlelib/NEWS.txt	Sat Jul  3 15:49:03 2010
@@ -1,7 +1,7 @@
-What's New in IDLE 2.7a0?
-=========================
+What's New in IDLE 2.7?
+=======================
 
-*Release date: XX-XXX-2010*
+*Release date: 07-03-2010*
 
 - idle.py modified and simplified to better support developing experimental
   versions of IDLE which are not installed in the standard location.

From python-checkins at python.org  Sat Jul  3 15:49:24 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 15:49:24 +0200 (CEST)
Subject: [Python-checkins] r82498 - python/trunk/Misc/NEWS
Message-ID: <20100703134924.3EB9DED67@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 15:49:23 2010
New Revision: 82498

Log:
add period; rewrap

Modified:
   python/trunk/Misc/NEWS

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Jul  3 15:49:23 2010
@@ -17,8 +17,8 @@
 Library
 -------
 
-- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
-  module, ensure that the input string length is a multiple of the frame size
+- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
+  ensure that the input string length is a multiple of the frame size.
 
 - Issue #9075: In the ssl module, remove the setting of a ``debug`` flag
   on an OpenSSL structure.

From python-checkins at python.org  Sat Jul  3 15:53:45 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 15:53:45 +0200 (CEST)
Subject: [Python-checkins] r82499 - python/trunk/Lib/pydoc_data/topics.py
Message-ID: <20100703135345.CCBF7EFBC@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 15:53:45 2010
New Revision: 82499

Log:
update pydoc-topics

Modified:
   python/trunk/Lib/pydoc_data/topics.py

Modified: python/trunk/Lib/pydoc_data/topics.py
==============================================================================
--- python/trunk/Lib/pydoc_data/topics.py	(original)
+++ python/trunk/Lib/pydoc_data/topics.py	Sat Jul  3 15:53:45 2010
@@ -1,4 +1,4 @@
-# Autogenerated by Sphinx on Sun Jun 20 10:55:52 2010
+# Autogenerated by Sphinx on Sat Jul  3 08:52:04 2010
 topics = {'assert': u'\nThe ``assert`` statement\n************************\n\nAssert statements are a convenient way to insert debugging assertions\ninto a program:\n\n   assert_stmt ::= "assert" expression ["," expression]\n\nThe simple form, ``assert expression``, is equivalent to\n\n   if __debug__:\n      if not expression: raise AssertionError\n\nThe extended form, ``assert expression1, expression2``, is equivalent\nto\n\n   if __debug__:\n      if not expression1: raise AssertionError(expression2)\n\nThese equivalences assume that ``__debug__`` and ``AssertionError``\nrefer to the built-in variables with those names.  In the current\nimplementation, the built-in variable ``__debug__`` is ``True`` under\nnormal circumstances, ``False`` when optimization is requested\n(command line option -O).  The current code generator emits no code\nfor an assert statement when optimization is requested at compile\ntime.  Note that it is unnecessary to include the source code for the\nexpression that failed in the error message; it will be displayed as\npart of the stack trace.\n\nAssignments to ``__debug__`` are illegal.  The value for the built-in\nvariable is determined when the interpreter starts.\n',
  'assignment': u'\nAssignment statements\n*********************\n\nAssignment statements are used to (re)bind names to values and to\nmodify attributes or items of mutable objects:\n\n   assignment_stmt ::= (target_list "=")+ (expression_list | yield_expression)\n   target_list     ::= target ("," target)* [","]\n   target          ::= identifier\n              | "(" target_list ")"\n              | "[" target_list "]"\n              | attributeref\n              | subscription\n              | slicing\n\n(See section *Primaries* for the syntax definitions for the last three\nsymbols.)\n\nAn assignment statement evaluates the expression list (remember that\nthis can be a single expression or a comma-separated list, the latter\nyielding a tuple) and assigns the single resulting object to each of\nthe target lists, from left to right.\n\nAssignment is defined recursively depending on the form of the target\n(list). When a target is part of a mutable object (an attribute\nreference, subscription or slicing), the mutable object must\nultimately perform the assignment and decide about its validity, and\nmay raise an exception if the assignment is unacceptable.  The rules\nobserved by various types and the exceptions raised are given with the\ndefinition of the object types (see section *The standard type\nhierarchy*).\n\nAssignment of an object to a target list is recursively defined as\nfollows.\n\n* If the target list is a single target: The object is assigned to\n  that target.\n\n* If the target list is a comma-separated list of targets: The object\n  must be an iterable with the same number of items as there are\n  targets in the target list, and the items are assigned, from left to\n  right, to the corresponding targets. (This rule is relaxed as of\n  Python 1.5; in earlier versions, the object had to be a tuple.\n  Since strings are sequences, an assignment like ``a, b = "xy"`` is\n  now legal as long as the string has the right length.)\n\nAssignment of an object to a single target is recursively defined as\nfollows.\n\n* If the target is an identifier (name):\n\n  * If the name does not occur in a ``global`` statement in the\n    current code block: the name is bound to the object in the current\n    local namespace.\n\n  * Otherwise: the name is bound to the object in the current global\n    namespace.\n\n  The name is rebound if it was already bound.  This may cause the\n  reference count for the object previously bound to the name to reach\n  zero, causing the object to be deallocated and its destructor (if it\n  has one) to be called.\n\n* If the target is a target list enclosed in parentheses or in square\n  brackets: The object must be an iterable with the same number of\n  items as there are targets in the target list, and its items are\n  assigned, from left to right, to the corresponding targets.\n\n* If the target is an attribute reference: The primary expression in\n  the reference is evaluated.  It should yield an object with\n  assignable attributes; if this is not the case, ``TypeError`` is\n  raised.  That object is then asked to assign the assigned object to\n  the given attribute; if it cannot perform the assignment, it raises\n  an exception (usually but not necessarily ``AttributeError``).\n\n  Note: If the object is a class instance and the attribute reference\n  occurs on both sides of the assignment operator, the RHS expression,\n  ``a.x`` can access either an instance attribute or (if no instance\n  attribute exists) a class attribute.  The LHS target ``a.x`` is\n  always set as an instance attribute, creating it if necessary.\n  Thus, the two occurrences of ``a.x`` do not necessarily refer to the\n  same attribute: if the RHS expression refers to a class attribute,\n  the LHS creates a new instance attribute as the target of the\n  assignment:\n\n     class Cls:\n         x = 3             # class variable\n     inst = Cls()\n     inst.x = inst.x + 1   # writes inst.x as 4 leaving Cls.x as 3\n\n  This description does not necessarily apply to descriptor\n  attributes, such as properties created with ``property()``.\n\n* If the target is a subscription: The primary expression in the\n  reference is evaluated.  It should yield either a mutable sequence\n  object (such as a list) or a mapping object (such as a dictionary).\n  Next, the subscript expression is evaluated.\n\n  If the primary is a mutable sequence object (such as a list), the\n  subscript must yield a plain integer.  If it is negative, the\n  sequence\'s length is added to it. The resulting value must be a\n  nonnegative integer less than the sequence\'s length, and the\n  sequence is asked to assign the assigned object to its item with\n  that index.  If the index is out of range, ``IndexError`` is raised\n  (assignment to a subscripted sequence cannot add new items to a\n  list).\n\n  If the primary is a mapping object (such as a dictionary), the\n  subscript must have a type compatible with the mapping\'s key type,\n  and the mapping is then asked to create a key/datum pair which maps\n  the subscript to the assigned object.  This can either replace an\n  existing key/value pair with the same key value, or insert a new\n  key/value pair (if no key with the same value existed).\n\n* If the target is a slicing: The primary expression in the reference\n  is evaluated.  It should yield a mutable sequence object (such as a\n  list).  The assigned object should be a sequence object of the same\n  type.  Next, the lower and upper bound expressions are evaluated,\n  insofar they are present; defaults are zero and the sequence\'s\n  length.  The bounds should evaluate to (small) integers.  If either\n  bound is negative, the sequence\'s length is added to it. The\n  resulting bounds are clipped to lie between zero and the sequence\'s\n  length, inclusive.  Finally, the sequence object is asked to replace\n  the slice with the items of the assigned sequence.  The length of\n  the slice may be different from the length of the assigned sequence,\n  thus changing the length of the target sequence, if the object\n  allows it.\n\n**CPython implementation detail:** In the current implementation, the\nsyntax for targets is taken to be the same as for expressions, and\ninvalid syntax is rejected during the code generation phase, causing\nless detailed error messages.\n\nWARNING: Although the definition of assignment implies that overlaps\nbetween the left-hand side and the right-hand side are \'safe\' (for\nexample ``a, b = b, a`` swaps two variables), overlaps *within* the\ncollection of assigned-to variables are not safe!  For instance, the\nfollowing program prints ``[0, 2]``:\n\n   x = [0, 1]\n   i = 0\n   i, x[i] = 1, 2\n   print x\n\n\nAugmented assignment statements\n===============================\n\nAugmented assignment is the combination, in a single statement, of a\nbinary operation and an assignment statement:\n\n   augmented_assignment_stmt ::= augtarget augop (expression_list | yield_expression)\n   augtarget                 ::= identifier | attributeref | subscription | slicing\n   augop                     ::= "+=" | "-=" | "*=" | "/=" | "//=" | "%=" | "**="\n             | ">>=" | "<<=" | "&=" | "^=" | "|="\n\n(See section *Primaries* for the syntax definitions for the last three\nsymbols.)\n\nAn augmented assignment evaluates the target (which, unlike normal\nassignment statements, cannot be an unpacking) and the expression\nlist, performs the binary operation specific to the type of assignment\non the two operands, and assigns the result to the original target.\nThe target is only evaluated once.\n\nAn augmented assignment expression like ``x += 1`` can be rewritten as\n``x = x + 1`` to achieve a similar, but not exactly equal effect. In\nthe augmented version, ``x`` is only evaluated once. Also, when\npossible, the actual operation is performed *in-place*, meaning that\nrather than creating a new object and assigning that to the target,\nthe old object is modified instead.\n\nWith the exception of assigning to tuples and multiple targets in a\nsingle statement, the assignment done by augmented assignment\nstatements is handled the same way as normal assignments. Similarly,\nwith the exception of the possible *in-place* behavior, the binary\noperation performed by augmented assignment is the same as the normal\nbinary operations.\n\nFor targets which are attribute references, the same *caveat about\nclass and instance attributes* applies as for regular assignments.\n',
  'atom-identifiers': u'\nIdentifiers (Names)\n*******************\n\nAn identifier occurring as an atom is a name.  See section\n*Identifiers and keywords* for lexical definition and section *Naming\nand binding* for documentation of naming and binding.\n\nWhen the name is bound to an object, evaluation of the atom yields\nthat object. When a name is not bound, an attempt to evaluate it\nraises a ``NameError`` exception.\n\n**Private name mangling:** When an identifier that textually occurs in\na class definition begins with two or more underscore characters and\ndoes not end in two or more underscores, it is considered a *private\nname* of that class. Private names are transformed to a longer form\nbefore code is generated for them.  The transformation inserts the\nclass name in front of the name, with leading underscores removed, and\na single underscore inserted in front of the class name.  For example,\nthe identifier ``__spam`` occurring in a class named ``Ham`` will be\ntransformed to ``_Ham__spam``.  This transformation is independent of\nthe syntactical context in which the identifier is used.  If the\ntransformed name is extremely long (longer than 255 characters),\nimplementation defined truncation may happen.  If the class name\nconsists only of underscores, no transformation is done.\n',
@@ -36,7 +36,7 @@
  'exprlists': u'\nExpression lists\n****************\n\n   expression_list ::= expression ( "," expression )* [","]\n\nAn expression list containing at least one comma yields a tuple.  The\nlength of the tuple is the number of expressions in the list.  The\nexpressions are evaluated from left to right.\n\nThe trailing comma is required only to create a single tuple (a.k.a. a\n*singleton*); it is optional in all other cases.  A single expression\nwithout a trailing comma doesn\'t create a tuple, but rather yields the\nvalue of that expression. (To create an empty tuple, use an empty pair\nof parentheses: ``()``.)\n',
  'floating': u'\nFloating point literals\n***********************\n\nFloating point literals are described by the following lexical\ndefinitions:\n\n   floatnumber   ::= pointfloat | exponentfloat\n   pointfloat    ::= [intpart] fraction | intpart "."\n   exponentfloat ::= (intpart | pointfloat) exponent\n   intpart       ::= digit+\n   fraction      ::= "." digit+\n   exponent      ::= ("e" | "E") ["+" | "-"] digit+\n\nNote that the integer and exponent parts of floating point numbers can\nlook like octal integers, but are interpreted using radix 10.  For\nexample, ``077e010`` is legal, and denotes the same number as\n``77e10``. The allowed range of floating point literals is\nimplementation-dependent. Some examples of floating point literals:\n\n   3.14    10.    .001    1e100    3.14e-10    0e0\n\nNote that numeric literals do not include a sign; a phrase like ``-1``\nis actually an expression composed of the unary operator ``-`` and the\nliteral ``1``.\n',
  'for': u'\nThe ``for`` statement\n*********************\n\nThe ``for`` statement is used to iterate over the elements of a\nsequence (such as a string, tuple or list) or other iterable object:\n\n   for_stmt ::= "for" target_list "in" expression_list ":" suite\n                ["else" ":" suite]\n\nThe expression list is evaluated once; it should yield an iterable\nobject.  An iterator is created for the result of the\n``expression_list``.  The suite is then executed once for each item\nprovided by the iterator, in the order of ascending indices.  Each\nitem in turn is assigned to the target list using the standard rules\nfor assignments, and then the suite is executed.  When the items are\nexhausted (which is immediately when the sequence is empty), the suite\nin the ``else`` clause, if present, is executed, and the loop\nterminates.\n\nA ``break`` statement executed in the first suite terminates the loop\nwithout executing the ``else`` clause\'s suite.  A ``continue``\nstatement executed in the first suite skips the rest of the suite and\ncontinues with the next item, or with the ``else`` clause if there was\nno next item.\n\nThe suite may assign to the variable(s) in the target list; this does\nnot affect the next item assigned to it.\n\nThe target list is not deleted when the loop is finished, but if the\nsequence is empty, it will not have been assigned to at all by the\nloop.  Hint: the built-in function ``range()`` returns a sequence of\nintegers suitable to emulate the effect of Pascal\'s ``for i := a to b\ndo``; e.g., ``range(3)`` returns the list ``[0, 1, 2]``.\n\nNote: There is a subtlety when the sequence is being modified by the loop\n  (this can only occur for mutable sequences, i.e. lists). An internal\n  counter is used to keep track of which item is used next, and this\n  is incremented on each iteration.  When this counter has reached the\n  length of the sequence the loop terminates.  This means that if the\n  suite deletes the current (or a previous) item from the sequence,\n  the next item will be skipped (since it gets the index of the\n  current item which has already been treated).  Likewise, if the\n  suite inserts an item in the sequence before the current item, the\n  current item will be treated again the next time through the loop.\n  This can lead to nasty bugs that can be avoided by making a\n  temporary copy using a slice of the whole sequence, e.g.,\n\n     for x in a[:]:\n         if x < 0: a.remove(x)\n',
- 'formatstrings': u'\nFormat String Syntax\n********************\n\nThe ``str.format()`` method and the ``Formatter`` class share the same\nsyntax for format strings (although in the case of ``Formatter``,\nsubclasses can define their own format string syntax.)\n\nFormat strings contain "replacement fields" surrounded by curly braces\n``{}``. Anything that is not contained in braces is considered literal\ntext, which is copied unchanged to the output.  If you need to include\na brace character in the literal text, it can be escaped by doubling:\n``{{`` and ``}}``.\n\nThe grammar for a replacement field is as follows:\n\n      replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"\n      field_name        ::= arg_name ("." attribute_name | "[" element_index "]")*\n      arg_name          ::= (identifier | integer)?\n      attribute_name    ::= identifier\n      element_index     ::= integer | index_string\n      index_string      ::= <any source character except "]"> +\n      conversion        ::= "r" | "s"\n      format_spec       ::= <described in the next section>\n\nIn less formal terms, the replacement field can start with a\n*field_name* that specifies the object whose value is to be formatted\nand inserted into the output instead of the replacement field. The\n*field_name* is optionally followed by a  *conversion* field, which is\npreceded by an exclamation point ``\'!\'``, and a *format_spec*, which\nis preceded by a colon ``\':\'``.  These specify a non-default format\nfor the replacement value.\n\nThe *field_name* itself begins with an *arg_name* that is either\neither a number or a keyword.  If it\'s a number, it refers to a\npositional argument, and if it\'s a keyword, it refers to a named\nkeyword argument.  If the numerical arg_names in a format string are\n0, 1, 2, ... in sequence, they can all be omitted (not just some) and\nthe numbers 0, 1, 2, ... will be automatically inserted in that order.\nThe *arg_name* can be followed by any number of index or attribute\nexpressions. An expression of the form ``\'.name\'`` selects the named\nattribute using ``getattr()``, while an expression of the form\n``\'[index]\'`` does an index lookup using ``__getitem__()``.\n\nSome simple format string examples:\n\n   "First, thou shalt count to {0}" # References first positional argument\n   "Bring me a {}"                  # Implicitly references the first positional argument\n   "From {} to {}"                  # Same as "From {0} to {1}"\n   "My quest is {name}"             # References keyword argument \'name\'\n   "Weight in tons {0.weight}"      # \'weight\' attribute of first positional arg\n   "Units destroyed: {players[0]}"  # First element of keyword argument \'players\'.\n\nThe *conversion* field causes a type coercion before formatting.\nNormally, the job of formatting a value is done by the\n``__format__()`` method of the value itself.  However, in some cases\nit is desirable to force a type to be formatted as a string,\noverriding its own definition of formatting.  By converting the value\nto a string before calling ``__format__()``, the normal formatting\nlogic is bypassed.\n\nTwo conversion flags are currently supported: ``\'!s\'`` which calls\n``str()`` on the value, and ``\'!r\'`` which calls ``repr()``.\n\nSome examples:\n\n   "Harold\'s a clever {0!s}"        # Calls str() on the argument first\n   "Bring out the holy {name!r}"    # Calls repr() on the argument first\n\nThe *format_spec* field contains a specification of how the value\nshould be presented, including such details as field width, alignment,\npadding, decimal precision and so on.  Each value type can define its\nown "formatting mini-language" or interpretation of the *format_spec*.\n\nMost built-in types support a common formatting mini-language, which\nis described in the next section.\n\nA *format_spec* field can also include nested replacement fields\nwithin it. These nested replacement fields can contain only a field\nname; conversion flags and format specifications are not allowed.  The\nreplacement fields within the format_spec are substituted before the\n*format_spec* string is interpreted. This allows the formatting of a\nvalue to be dynamically specified.\n\nFor example, suppose you wanted to have a replacement field whose\nfield width is determined by another variable:\n\n   "A man with two {0:{1}}".format("noses", 10)\n\nThis would first evaluate the inner replacement field, making the\nformat string effectively:\n\n   "A man with two {0:10}"\n\nThen the outer replacement field would be evaluated, producing:\n\n   "noses     "\n\nWhich is substituted into the string, yielding:\n\n   "A man with two noses     "\n\n(The extra space is because we specified a field width of 10, and\nbecause left alignment is the default for strings.)\n\n\nFormat Specification Mini-Language\n==================================\n\n"Format specifications" are used within replacement fields contained\nwithin a format string to define how individual values are presented\n(see *Format String Syntax*.)  They can also be passed directly to the\nbuilt-in ``format()`` function.  Each formattable type may define how\nthe format specification is to be interpreted.\n\nMost built-in types implement the following options for format\nspecifications, although some of the formatting options are only\nsupported by the numeric types.\n\nA general convention is that an empty format string (``""``) produces\nthe same result as if you had called ``str()`` on the value. A non-\nempty format string typically modifies the result.\n\nThe general form of a *standard format specifier* is:\n\n   format_spec ::= [[fill]align][sign][#][0][width][,][.precision][type]\n   fill        ::= <a character other than \'}\'>\n   align       ::= "<" | ">" | "=" | "^"\n   sign        ::= "+" | "-" | " "\n   width       ::= integer\n   precision   ::= integer\n   type        ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"\n\nThe *fill* character can be any character other than \'}\' (which\nsignifies the end of the field).  The presence of a fill character is\nsignaled by the *next* character, which must be one of the alignment\noptions. If the second character of *format_spec* is not a valid\nalignment option, then it is assumed that both the fill character and\nthe alignment option are absent.\n\nThe meaning of the various alignment options is as follows:\n\n   +-----------+------------------------------------------------------------+\n   | Option    | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'<\'``   | Forces the field to be left-aligned within the available   |\n   |           | space (This is the default.)                               |\n   +-----------+------------------------------------------------------------+\n   | ``\'>\'``   | Forces the field to be right-aligned within the available  |\n   |           | space.                                                     |\n   +-----------+------------------------------------------------------------+\n   | ``\'=\'``   | Forces the padding to be placed after the sign (if any)    |\n   |           | but before the digits.  This is used for printing fields   |\n   |           | in the form \'+000000120\'. This alignment option is only    |\n   |           | valid for numeric types.                                   |\n   +-----------+------------------------------------------------------------+\n   | ``\'^\'``   | Forces the field to be centered within the available       |\n   |           | space.                                                     |\n   +-----------+------------------------------------------------------------+\n\nNote that unless a minimum field width is defined, the field width\nwill always be the same size as the data to fill it, so that the\nalignment option has no meaning in this case.\n\nThe *sign* option is only valid for number types, and can be one of\nthe following:\n\n   +-----------+------------------------------------------------------------+\n   | Option    | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'+\'``   | indicates that a sign should be used for both positive as  |\n   |           | well as negative numbers.                                  |\n   +-----------+------------------------------------------------------------+\n   | ``\'-\'``   | indicates that a sign should be used only for negative     |\n   |           | numbers (this is the default behavior).                    |\n   +-----------+------------------------------------------------------------+\n   | space     | indicates that a leading space should be used on positive  |\n   |           | numbers, and a minus sign on negative numbers.             |\n   +-----------+------------------------------------------------------------+\n\nThe ``\'#\'`` option is only valid for integers, and only for binary,\noctal, or hexadecimal output.  If present, it specifies that the\noutput will be prefixed by ``\'0b\'``, ``\'0o\'``, or ``\'0x\'``,\nrespectively.\n\nThe ``\',\'`` option signals the use of a comma for a thousands\nseparator. For a locale aware separator, use the ``\'n\'`` integer\npresentation type instead.\n\n*width* is a decimal integer defining the minimum field width.  If not\nspecified, then the field width will be determined by the content.\n\nIf the *width* field is preceded by a zero (``\'0\'``) character, this\nenables zero-padding.  This is equivalent to an *alignment* type of\n``\'=\'`` and a *fill* character of ``\'0\'``.\n\nThe *precision* is a decimal number indicating how many digits should\nbe displayed after the decimal point for a floating point value\nformatted with ``\'f\'`` and ``\'F\'``, or before and after the decimal\npoint for a floating point value formatted with ``\'g\'`` or ``\'G\'``.\nFor non-number types the field indicates the maximum field size - in\nother words, how many characters will be used from the field content.\nThe *precision* is not allowed for integer values.\n\nFinally, the *type* determines how the data should be presented.\n\nThe available string presentation types are:\n\n   +-----------+------------------------------------------------------------+\n   | Type      | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'s\'``   | String format. This is the default type for strings and    |\n   |           | may be omitted.                                            |\n   +-----------+------------------------------------------------------------+\n   | None      | The same as ``\'s\'``.                                       |\n   +-----------+------------------------------------------------------------+\n\nThe available integer presentation types are:\n\n   +-----------+------------------------------------------------------------+\n   | Type      | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'b\'``   | Binary format. Outputs the number in base 2.               |\n   +-----------+------------------------------------------------------------+\n   | ``\'c\'``   | Character. Converts the integer to the corresponding       |\n   |           | unicode character before printing.                         |\n   +-----------+------------------------------------------------------------+\n   | ``\'d\'``   | Decimal Integer. Outputs the number in base 10.            |\n   +-----------+------------------------------------------------------------+\n   | ``\'o\'``   | Octal format. Outputs the number in base 8.                |\n   +-----------+------------------------------------------------------------+\n   | ``\'x\'``   | Hex format. Outputs the number in base 16, using lower-    |\n   |           | case letters for the digits above 9.                       |\n   +-----------+------------------------------------------------------------+\n   | ``\'X\'``   | Hex format. Outputs the number in base 16, using upper-    |\n   |           | case letters for the digits above 9.                       |\n   +-----------+------------------------------------------------------------+\n   | ``\'n\'``   | Number. This is the same as ``\'d\'``, except that it uses   |\n   |           | the current locale setting to insert the appropriate       |\n   |           | number separator characters.                               |\n   +-----------+------------------------------------------------------------+\n   | None      | The same as ``\'d\'``.                                       |\n   +-----------+------------------------------------------------------------+\n\nIn addition to the above presentation types, integers can be formatted\nwith the floating point presentation types listed below (except\n``\'n\'`` and None). When doing so, ``float()`` is used to convert the\ninteger to a floating point number before formatting.\n\nThe available presentation types for floating point and decimal values\nare:\n\n   +-----------+------------------------------------------------------------+\n   | Type      | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'e\'``   | Exponent notation. Prints the number in scientific         |\n   |           | notation using the letter \'e\' to indicate the exponent.    |\n   +-----------+------------------------------------------------------------+\n   | ``\'E\'``   | Exponent notation. Same as ``\'e\'`` except it uses an upper |\n   |           | case \'E\' as the separator character.                       |\n   +-----------+------------------------------------------------------------+\n   | ``\'f\'``   | Fixed point. Displays the number as a fixed-point number.  |\n   +-----------+------------------------------------------------------------+\n   | ``\'F\'``   | Fixed point. Same as ``\'f\'``.                              |\n   +-----------+------------------------------------------------------------+\n   | ``\'g\'``   | General format.  For a given precision ``p >= 1``, this    |\n   |           | rounds the number to ``p`` significant digits and then     |\n   |           | formats the result in either fixed-point format or in      |\n   |           | scientific notation, depending on its magnitude.  The      |\n   |           | precise rules are as follows: suppose that the result      |\n   |           | formatted with presentation type ``\'e\'`` and precision     |\n   |           | ``p-1`` would have exponent ``exp``.  Then if ``-4 <= exp  |\n   |           | < p``, the number is formatted with presentation type      |\n   |           | ``\'f\'`` and precision ``p-1-exp``. Otherwise, the number   |\n   |           | is formatted with presentation type ``\'e\'`` and precision  |\n   |           | ``p-1``. In both cases insignificant trailing zeros are    |\n   |           | removed from the significand, and the decimal point is     |\n   |           | also removed if there are no remaining digits following    |\n   |           | it.  Postive and negative infinity, positive and negative  |\n   |           | zero, and nans, are formatted as ``inf``, ``-inf``, ``0``, |\n   |           | ``-0`` and ``nan`` respectively, regardless of the         |\n   |           | precision.  A precision of ``0`` is treated as equivalent  |\n   |           | to a precision of ``1``.                                   |\n   +-----------+------------------------------------------------------------+\n   | ``\'G\'``   | General format. Same as ``\'g\'`` except switches to ``\'E\'`` |\n   |           | if the number gets too large. The representations of       |\n   |           | infinity and NaN are uppercased, too.                      |\n   +-----------+------------------------------------------------------------+\n   | ``\'n\'``   | Number. This is the same as ``\'g\'``, except that it uses   |\n   |           | the current locale setting to insert the appropriate       |\n   |           | number separator characters.                               |\n   +-----------+------------------------------------------------------------+\n   | ``\'%\'``   | Percentage. Multiplies the number by 100 and displays in   |\n   |           | fixed (``\'f\'``) format, followed by a percent sign.        |\n   +-----------+------------------------------------------------------------+\n   | None      | The same as ``\'g\'``.                                       |\n   +-----------+------------------------------------------------------------+\n',
+ 'formatstrings': u'\nFormat String Syntax\n********************\n\nThe ``str.format()`` method and the ``Formatter`` class share the same\nsyntax for format strings (although in the case of ``Formatter``,\nsubclasses can define their own format string syntax).\n\nFormat strings contain "replacement fields" surrounded by curly braces\n``{}``. Anything that is not contained in braces is considered literal\ntext, which is copied unchanged to the output.  If you need to include\na brace character in the literal text, it can be escaped by doubling:\n``{{`` and ``}}``.\n\nThe grammar for a replacement field is as follows:\n\n      replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"\n      field_name        ::= arg_name ("." attribute_name | "[" element_index "]")*\n      arg_name          ::= [identifier | integer]\n      attribute_name    ::= identifier\n      element_index     ::= integer | index_string\n      index_string      ::= <any source character except "]"> +\n      conversion        ::= "r" | "s"\n      format_spec       ::= <described in the next section>\n\nIn less formal terms, the replacement field can start with a\n*field_name* that specifies the object whose value is to be formatted\nand inserted into the output instead of the replacement field. The\n*field_name* is optionally followed by a  *conversion* field, which is\npreceded by an exclamation point ``\'!\'``, and a *format_spec*, which\nis preceded by a colon ``\':\'``.  These specify a non-default format\nfor the replacement value.\n\nSee also the *Format Specification Mini-Language* section.\n\nThe *field_name* itself begins with an *arg_name* that is either\neither a number or a keyword.  If it\'s a number, it refers to a\npositional argument, and if it\'s a keyword, it refers to a named\nkeyword argument.  If the numerical arg_names in a format string are\n0, 1, 2, ... in sequence, they can all be omitted (not just some) and\nthe numbers 0, 1, 2, ... will be automatically inserted in that order.\nThe *arg_name* can be followed by any number of index or attribute\nexpressions. An expression of the form ``\'.name\'`` selects the named\nattribute using ``getattr()``, while an expression of the form\n``\'[index]\'`` does an index lookup using ``__getitem__()``.\n\nChanged in version 2.7: The positional argument specifiers can be\nomitted, so ``\'{} {}\'`` is equivalent to ``\'{0} {1}\'``.\n\nSome simple format string examples:\n\n   "First, thou shalt count to {0}" # References first positional argument\n   "Bring me a {}"                  # Implicitly references the first positional argument\n   "From {} to {}"                  # Same as "From {0} to {1}"\n   "My quest is {name}"             # References keyword argument \'name\'\n   "Weight in tons {0.weight}"      # \'weight\' attribute of first positional arg\n   "Units destroyed: {players[0]}"  # First element of keyword argument \'players\'.\n\nThe *conversion* field causes a type coercion before formatting.\nNormally, the job of formatting a value is done by the\n``__format__()`` method of the value itself.  However, in some cases\nit is desirable to force a type to be formatted as a string,\noverriding its own definition of formatting.  By converting the value\nto a string before calling ``__format__()``, the normal formatting\nlogic is bypassed.\n\nTwo conversion flags are currently supported: ``\'!s\'`` which calls\n``str()`` on the value, and ``\'!r\'`` which calls ``repr()``.\n\nSome examples:\n\n   "Harold\'s a clever {0!s}"        # Calls str() on the argument first\n   "Bring out the holy {name!r}"    # Calls repr() on the argument first\n\nThe *format_spec* field contains a specification of how the value\nshould be presented, including such details as field width, alignment,\npadding, decimal precision and so on.  Each value type can define its\nown "formatting mini-language" or interpretation of the *format_spec*.\n\nMost built-in types support a common formatting mini-language, which\nis described in the next section.\n\nA *format_spec* field can also include nested replacement fields\nwithin it. These nested replacement fields can contain only a field\nname; conversion flags and format specifications are not allowed.  The\nreplacement fields within the format_spec are substituted before the\n*format_spec* string is interpreted. This allows the formatting of a\nvalue to be dynamically specified.\n\nSee the *Format examples* section for some examples.\n\n\nFormat Specification Mini-Language\n==================================\n\n"Format specifications" are used within replacement fields contained\nwithin a format string to define how individual values are presented\n(see *Format String Syntax*).  They can also be passed directly to the\nbuilt-in ``format()`` function.  Each formattable type may define how\nthe format specification is to be interpreted.\n\nMost built-in types implement the following options for format\nspecifications, although some of the formatting options are only\nsupported by the numeric types.\n\nA general convention is that an empty format string (``""``) produces\nthe same result as if you had called ``str()`` on the value. A non-\nempty format string typically modifies the result.\n\nThe general form of a *standard format specifier* is:\n\n   format_spec ::= [[fill]align][sign][#][0][width][,][.precision][type]\n   fill        ::= <a character other than \'}\'>\n   align       ::= "<" | ">" | "=" | "^"\n   sign        ::= "+" | "-" | " "\n   width       ::= integer\n   precision   ::= integer\n   type        ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"\n\nThe *fill* character can be any character other than \'}\' (which\nsignifies the end of the field).  The presence of a fill character is\nsignaled by the *next* character, which must be one of the alignment\noptions. If the second character of *format_spec* is not a valid\nalignment option, then it is assumed that both the fill character and\nthe alignment option are absent.\n\nThe meaning of the various alignment options is as follows:\n\n   +-----------+------------------------------------------------------------+\n   | Option    | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'<\'``   | Forces the field to be left-aligned within the available   |\n   |           | space (this is the default).                               |\n   +-----------+------------------------------------------------------------+\n   | ``\'>\'``   | Forces the field to be right-aligned within the available  |\n   |           | space.                                                     |\n   +-----------+------------------------------------------------------------+\n   | ``\'=\'``   | Forces the padding to be placed after the sign (if any)    |\n   |           | but before the digits.  This is used for printing fields   |\n   |           | in the form \'+000000120\'. This alignment option is only    |\n   |           | valid for numeric types.                                   |\n   +-----------+------------------------------------------------------------+\n   | ``\'^\'``   | Forces the field to be centered within the available       |\n   |           | space.                                                     |\n   +-----------+------------------------------------------------------------+\n\nNote that unless a minimum field width is defined, the field width\nwill always be the same size as the data to fill it, so that the\nalignment option has no meaning in this case.\n\nThe *sign* option is only valid for number types, and can be one of\nthe following:\n\n   +-----------+------------------------------------------------------------+\n   | Option    | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'+\'``   | indicates that a sign should be used for both positive as  |\n   |           | well as negative numbers.                                  |\n   +-----------+------------------------------------------------------------+\n   | ``\'-\'``   | indicates that a sign should be used only for negative     |\n   |           | numbers (this is the default behavior).                    |\n   +-----------+------------------------------------------------------------+\n   | space     | indicates that a leading space should be used on positive  |\n   |           | numbers, and a minus sign on negative numbers.             |\n   +-----------+------------------------------------------------------------+\n\nThe ``\'#\'`` option is only valid for integers, and only for binary,\noctal, or hexadecimal output.  If present, it specifies that the\noutput will be prefixed by ``\'0b\'``, ``\'0o\'``, or ``\'0x\'``,\nrespectively.\n\nThe ``\',\'`` option signals the use of a comma for a thousands\nseparator. For a locale aware separator, use the ``\'n\'`` integer\npresentation type instead.\n\nChanged in version 2.7: Added the ``\',\'`` option (see also **PEP\n378**).\n\n*width* is a decimal integer defining the minimum field width.  If not\nspecified, then the field width will be determined by the content.\n\nIf the *width* field is preceded by a zero (``\'0\'``) character, this\nenables zero-padding.  This is equivalent to an *alignment* type of\n``\'=\'`` and a *fill* character of ``\'0\'``.\n\nThe *precision* is a decimal number indicating how many digits should\nbe displayed after the decimal point for a floating point value\nformatted with ``\'f\'`` and ``\'F\'``, or before and after the decimal\npoint for a floating point value formatted with ``\'g\'`` or ``\'G\'``.\nFor non-number types the field indicates the maximum field size - in\nother words, how many characters will be used from the field content.\nThe *precision* is not allowed for integer values.\n\nFinally, the *type* determines how the data should be presented.\n\nThe available string presentation types are:\n\n   +-----------+------------------------------------------------------------+\n   | Type      | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'s\'``   | String format. This is the default type for strings and    |\n   |           | may be omitted.                                            |\n   +-----------+------------------------------------------------------------+\n   | None      | The same as ``\'s\'``.                                       |\n   +-----------+------------------------------------------------------------+\n\nThe available integer presentation types are:\n\n   +-----------+------------------------------------------------------------+\n   | Type      | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'b\'``   | Binary format. Outputs the number in base 2.               |\n   +-----------+------------------------------------------------------------+\n   | ``\'c\'``   | Character. Converts the integer to the corresponding       |\n   |           | unicode character before printing.                         |\n   +-----------+------------------------------------------------------------+\n   | ``\'d\'``   | Decimal Integer. Outputs the number in base 10.            |\n   +-----------+------------------------------------------------------------+\n   | ``\'o\'``   | Octal format. Outputs the number in base 8.                |\n   +-----------+------------------------------------------------------------+\n   | ``\'x\'``   | Hex format. Outputs the number in base 16, using lower-    |\n   |           | case letters for the digits above 9.                       |\n   +-----------+------------------------------------------------------------+\n   | ``\'X\'``   | Hex format. Outputs the number in base 16, using upper-    |\n   |           | case letters for the digits above 9.                       |\n   +-----------+------------------------------------------------------------+\n   | ``\'n\'``   | Number. This is the same as ``\'d\'``, except that it uses   |\n   |           | the current locale setting to insert the appropriate       |\n   |           | number separator characters.                               |\n   +-----------+------------------------------------------------------------+\n   | None      | The same as ``\'d\'``.                                       |\n   +-----------+------------------------------------------------------------+\n\nIn addition to the above presentation types, integers can be formatted\nwith the floating point presentation types listed below (except\n``\'n\'`` and None). When doing so, ``float()`` is used to convert the\ninteger to a floating point number before formatting.\n\nThe available presentation types for floating point and decimal values\nare:\n\n   +-----------+------------------------------------------------------------+\n   | Type      | Meaning                                                    |\n   +===========+============================================================+\n   | ``\'e\'``   | Exponent notation. Prints the number in scientific         |\n   |           | notation using the letter \'e\' to indicate the exponent.    |\n   +-----------+------------------------------------------------------------+\n   | ``\'E\'``   | Exponent notation. Same as ``\'e\'`` except it uses an upper |\n   |           | case \'E\' as the separator character.                       |\n   +-----------+------------------------------------------------------------+\n   | ``\'f\'``   | Fixed point. Displays the number as a fixed-point number.  |\n   +-----------+------------------------------------------------------------+\n   | ``\'F\'``   | Fixed point. Same as ``\'f\'``.                              |\n   +-----------+------------------------------------------------------------+\n   | ``\'g\'``   | General format.  For a given precision ``p >= 1``, this    |\n   |           | rounds the number to ``p`` significant digits and then     |\n   |           | formats the result in either fixed-point format or in      |\n   |           | scientific notation, depending on its magnitude.  The      |\n   |           | precise rules are as follows: suppose that the result      |\n   |           | formatted with presentation type ``\'e\'`` and precision     |\n   |           | ``p-1`` would have exponent ``exp``.  Then if ``-4 <= exp  |\n   |           | < p``, the number is formatted with presentation type      |\n   |           | ``\'f\'`` and precision ``p-1-exp``. Otherwise, the number   |\n   |           | is formatted with presentation type ``\'e\'`` and precision  |\n   |           | ``p-1``. In both cases insignificant trailing zeros are    |\n   |           | removed from the significand, and the decimal point is     |\n   |           | also removed if there are no remaining digits following    |\n   |           | it.  Postive and negative infinity, positive and negative  |\n   |           | zero, and nans, are formatted as ``inf``, ``-inf``, ``0``, |\n   |           | ``-0`` and ``nan`` respectively, regardless of the         |\n   |           | precision.  A precision of ``0`` is treated as equivalent  |\n   |           | to a precision of ``1``.                                   |\n   +-----------+------------------------------------------------------------+\n   | ``\'G\'``   | General format. Same as ``\'g\'`` except switches to ``\'E\'`` |\n   |           | if the number gets too large. The representations of       |\n   |           | infinity and NaN are uppercased, too.                      |\n   +-----------+------------------------------------------------------------+\n   | ``\'n\'``   | Number. This is the same as ``\'g\'``, except that it uses   |\n   |           | the current locale setting to insert the appropriate       |\n   |           | number separator characters.                               |\n   +-----------+------------------------------------------------------------+\n   | ``\'%\'``   | Percentage. Multiplies the number by 100 and displays in   |\n   |           | fixed (``\'f\'``) format, followed by a percent sign.        |\n   +-----------+------------------------------------------------------------+\n   | None      | The same as ``\'g\'``.                                       |\n   +-----------+------------------------------------------------------------+\n\n\nFormat examples\n===============\n\nThis section contains examples of the new format syntax and comparison\nwith the old ``%``-formatting.\n\nIn most of the cases the syntax is similar to the old\n``%``-formatting, with the addition of the ``{}`` and with ``:`` used\ninstead of ``%``. For example, ``\'%03.2f\'`` can be translated to\n``\'{:03.2f}\'``.\n\nThe new format syntax also supports new and different options, shown\nin the follow examples.\n\nAccessing arguments by position:\n\n   >>> \'{0}, {1}, {2}\'.format(\'a\', \'b\', \'c\')\n   \'a, b, c\'\n   >>> \'{}, {}, {}\'.format(\'a\', \'b\', \'c\')  # 2.7+ only\n   \'a, b, c\'\n   >>> \'{2}, {1}, {0}\'.format(\'a\', \'b\', \'c\')\n   \'c, b, a\'\n   >>> \'{2}, {1}, {0}\'.format(*\'abc\')      # unpacking argument sequence\n   \'c, b, a\'\n   >>> \'{0}{1}{0}\'.format(\'abra\', \'cad\')   # arguments\' indices can be repeated\n   \'abracadabra\'\n\nAccessing arguments by name:\n\n   >>> \'Coordinates: {latitude}, {longitude}\'.format(latitude=\'37.24N\', longitude=\'-115.81W\')\n   \'Coordinates: 37.24N, -115.81W\'\n   >>> coord = {\'latitude\': \'37.24N\', \'longitude\': \'-115.81W\'}\n   >>> \'Coordinates: {latitude}, {longitude}\'.format(**coord)\n   \'Coordinates: 37.24N, -115.81W\'\n\nAccessing arguments\' attributes:\n\n   >>> c = 3-5j\n   >>> (\'The complex number {0} is formed from the real part {0.real} \'\n   ...  \'and the imaginary part {0.imag}.\').format(c)\n   \'The complex number (3-5j) is formed from the real part 3.0 and the imaginary part -5.0.\'\n   >>> class Point(object):\n   ...     def __init__(self, x, y):\n   ...         self.x, self.y = x, y\n   ...     def __str__(self):\n   ...         return \'Point({self.x}, {self.y})\'.format(self=self)\n   ...\n   >>> str(Point(4, 2))\n   \'Point(4, 2)\'\n\nAccessing arguments\' items:\n\n   >>> coord = (3, 5)\n   >>> \'X: {0[0]};  Y: {0[1]}\'.format(coord)\n   \'X: 3;  Y: 5\'\n\nReplacing ``%s`` and ``%r``:\n\n   >>> "repr() shows quotes: {!r}; str() doesn\'t: {!s}".format(\'test1\', \'test2\')\n   "repr() shows quotes: \'test1\'; str() doesn\'t: test2"\n\nAligning the text and specifying a width:\n\n   >>> \'{:<30}\'.format(\'left aligned\')\n   \'left aligned                  \'\n   >>> \'{:>30}\'.format(\'right aligned\')\n   \'                 right aligned\'\n   >>> \'{:^30}\'.format(\'centered\')\n   \'           centered           \'\n   >>> \'{:*^30}\'.format(\'centered\')  # use \'*\' as a fill char\n   \'***********centered***********\'\n\nReplacing ``%+f``, ``%-f``, and ``% f`` and specifying a sign:\n\n   >>> \'{:+f}; {:+f}\'.format(3.14, -3.14)  # show it always\n   \'+3.140000; -3.140000\'\n   >>> \'{: f}; {: f}\'.format(3.14, -3.14)  # show a space for positive numbers\n   \' 3.140000; -3.140000\'\n   >>> \'{:-f}; {:-f}\'.format(3.14, -3.14)  # show only the minus -- same as \'{:f}; {:f}\'\n   \'3.140000; -3.140000\'\n\nReplacing ``%x`` and ``%o`` and converting the value to different\nbases:\n\n   >>> # format also supports binary numbers\n   >>> "int: {0:d};  hex: {0:x};  oct: {0:o};  bin: {0:b}".format(42)\n   \'int: 42;  hex: 2a;  oct: 52;  bin: 101010\'\n   >>> # with 0x, 0o, or 0b as prefix:\n   >>> "int: {0:d};  hex: {0:#x};  oct: {0:#o};  bin: {0:#b}".format(42)\n   \'int: 42;  hex: 0x2a;  oct: 0o52;  bin: 0b101010\'\n\nUsing the comma as a thousands separator:\n\n   >>> \'{:,}\'.format(1234567890)\n   \'1,234,567,890\'\n\nExpressing a percentage:\n\n   >>> points = 19.5\n   >>> total = 22\n   >>> \'Correct answers: {:.2%}.\'.format(points/total)\n   \'Correct answers: 88.64%\'\n\nUsing type-specific formatting:\n\n   >>> import datetime\n   >>> d = datetime.datetime(2010, 7, 4, 12, 15, 58)\n   >>> \'{:%Y-%m-%d %H:%M:%S}\'.format(d)\n   \'2010-07-04 12:15:58\'\n\nNesting arguments and more complex examples:\n\n   >>> for align, text in zip(\'<^>\', [\'left\', \'center\', \'right\']):\n   ...     \'{0:{align}{fill}16}\'.format(text, fill=align, align=align)\n   ...\n   \'left<<<<<<<<<<<<\'\n   \'^^^^^center^^^^^\'\n   \'>>>>>>>>>>>right\'\n   >>>\n   >>> octets = [192, 168, 0, 1]\n   >>> \'{:02X}{:02X}{:02X}{:02X}\'.format(*octets)\n   \'C0A80001\'\n   >>> int(_, 16)\n   3232235521\n   >>>\n   >>> width = 5\n   >>> for num in range(5,12):\n   ...     for base in \'dXob\':\n   ...         print \'{0:{width}{base}}\'.format(num, base=base, width=width),\n   ...     print\n   ...\n       5     5     5   101\n       6     6     6   110\n       7     7     7   111\n       8     8    10  1000\n       9     9    11  1001\n      10     A    12  1010\n      11     B    13  1011\n',
  'function': u'\nFunction definitions\n********************\n\nA function definition defines a user-defined function object (see\nsection *The standard type hierarchy*):\n\n   decorated      ::= decorators (classdef | funcdef)\n   decorators     ::= decorator+\n   decorator      ::= "@" dotted_name ["(" [argument_list [","]] ")"] NEWLINE\n   funcdef        ::= "def" funcname "(" [parameter_list] ")" ":" suite\n   dotted_name    ::= identifier ("." identifier)*\n   parameter_list ::= (defparameter ",")*\n                      (  "*" identifier [, "**" identifier]\n                      | "**" identifier\n                      | defparameter [","] )\n   defparameter   ::= parameter ["=" expression]\n   sublist        ::= parameter ("," parameter)* [","]\n   parameter      ::= identifier | "(" sublist ")"\n   funcname       ::= identifier\n\nA function definition is an executable statement.  Its execution binds\nthe function name in the current local namespace to a function object\n(a wrapper around the executable code for the function).  This\nfunction object contains a reference to the current global namespace\nas the global namespace to be used when the function is called.\n\nThe function definition does not execute the function body; this gets\nexecuted only when the function is called. [3]\n\nA function definition may be wrapped by one or more *decorator*\nexpressions. Decorator expressions are evaluated when the function is\ndefined, in the scope that contains the function definition.  The\nresult must be a callable, which is invoked with the function object\nas the only argument. The returned value is bound to the function name\ninstead of the function object.  Multiple decorators are applied in\nnested fashion. For example, the following code:\n\n   @f1(arg)\n   @f2\n   def func(): pass\n\nis equivalent to:\n\n   def func(): pass\n   func = f1(arg)(f2(func))\n\nWhen one or more top-level parameters have the form *parameter* ``=``\n*expression*, the function is said to have "default parameter values."\nFor a parameter with a default value, the corresponding argument may\nbe omitted from a call, in which case the parameter\'s default value is\nsubstituted.  If a parameter has a default value, all following\nparameters must also have a default value --- this is a syntactic\nrestriction that is not expressed by the grammar.\n\n**Default parameter values are evaluated when the function definition\nis executed.**  This means that the expression is evaluated once, when\nthe function is defined, and that that same "pre-computed" value is\nused for each call.  This is especially important to understand when a\ndefault parameter is a mutable object, such as a list or a dictionary:\nif the function modifies the object (e.g. by appending an item to a\nlist), the default value is in effect modified. This is generally not\nwhat was intended.  A way around this  is to use ``None`` as the\ndefault, and explicitly test for it in the body of the function, e.g.:\n\n   def whats_on_the_telly(penguin=None):\n       if penguin is None:\n           penguin = []\n       penguin.append("property of the zoo")\n       return penguin\n\nFunction call semantics are described in more detail in section\n*Calls*. A function call always assigns values to all parameters\nmentioned in the parameter list, either from position arguments, from\nkeyword arguments, or from default values.  If the form\n"``*identifier``" is present, it is initialized to a tuple receiving\nany excess positional parameters, defaulting to the empty tuple.  If\nthe form "``**identifier``" is present, it is initialized to a new\ndictionary receiving any excess keyword arguments, defaulting to a new\nempty dictionary.\n\nIt is also possible to create anonymous functions (functions not bound\nto a name), for immediate use in expressions.  This uses lambda forms,\ndescribed in section *Lambdas*.  Note that the lambda form is merely a\nshorthand for a simplified function definition; a function defined in\na "``def``" statement can be passed around or assigned to another name\njust like a function defined by a lambda form.  The "``def``" form is\nactually more powerful since it allows the execution of multiple\nstatements.\n\n**Programmer\'s note:** Functions are first-class objects.  A "``def``"\nform executed inside a function definition defines a local function\nthat can be returned or passed around.  Free variables used in the\nnested function can access the local variables of the function\ncontaining the def.  See section *Naming and binding* for details.\n',
  'global': u'\nThe ``global`` statement\n************************\n\n   global_stmt ::= "global" identifier ("," identifier)*\n\nThe ``global`` statement is a declaration which holds for the entire\ncurrent code block.  It means that the listed identifiers are to be\ninterpreted as globals.  It would be impossible to assign to a global\nvariable without ``global``, although free variables may refer to\nglobals without being declared global.\n\nNames listed in a ``global`` statement must not be used in the same\ncode block textually preceding that ``global`` statement.\n\nNames listed in a ``global`` statement must not be defined as formal\nparameters or in a ``for`` loop control target, ``class`` definition,\nfunction definition, or ``import`` statement.\n\n**CPython implementation detail:** The current implementation does not\nenforce the latter two restrictions, but programs should not abuse\nthis freedom, as future implementations may enforce them or silently\nchange the meaning of the program.\n\n**Programmer\'s note:** the ``global`` is a directive to the parser.\nIt applies only to code parsed at the same time as the ``global``\nstatement. In particular, a ``global`` statement contained in an\n``exec`` statement does not affect the code block *containing* the\n``exec`` statement, and code contained in an ``exec`` statement is\nunaffected by ``global`` statements in the code containing the\n``exec`` statement.  The same applies to the ``eval()``,\n``execfile()`` and ``compile()`` functions.\n',
  'id-classes': u'\nReserved classes of identifiers\n*******************************\n\nCertain classes of identifiers (besides keywords) have special\nmeanings.  These classes are identified by the patterns of leading and\ntrailing underscore characters:\n\n``_*``\n   Not imported by ``from module import *``.  The special identifier\n   ``_`` is used in the interactive interpreter to store the result of\n   the last evaluation; it is stored in the ``__builtin__`` module.\n   When not in interactive mode, ``_`` has no special meaning and is\n   not defined. See section *The import statement*.\n\n   Note: The name ``_`` is often used in conjunction with\n     internationalization; refer to the documentation for the\n     ``gettext`` module for more information on this convention.\n\n``__*__``\n   System-defined names.  These names are defined by the interpreter\n   and its implementation (including the standard library);\n   applications should not expect to define additional names using\n   this convention.  The set of names of this class defined by Python\n   may be extended in future versions. See section *Special method\n   names*.\n\n``__*``\n   Class-private names.  Names in this category, when used within the\n   context of a class definition, are re-written to use a mangled form\n   to help avoid name clashes between "private" attributes of base and\n   derived classes. See section *Identifiers (Names)*.\n',

From python-checkins at python.org  Sat Jul  3 15:56:13 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 15:56:13 +0200 (CEST)
Subject: [Python-checkins] r82500 - in python/trunk: Include/patchlevel.h
	Lib/distutils/__init__.py Lib/idlelib/idlever.py Misc/NEWS
	Misc/RPM/python-2.7.spec README
Message-ID: <20100703135613.CAE51F2EA@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 15:56:13 2010
New Revision: 82500

Log:
update to 2.7 final

Modified:
   python/trunk/Include/patchlevel.h
   python/trunk/Lib/distutils/__init__.py
   python/trunk/Lib/idlelib/idlever.py
   python/trunk/Misc/NEWS
   python/trunk/Misc/RPM/python-2.7.spec
   python/trunk/README

Modified: python/trunk/Include/patchlevel.h
==============================================================================
--- python/trunk/Include/patchlevel.h	(original)
+++ python/trunk/Include/patchlevel.h	Sat Jul  3 15:56:13 2010
@@ -23,11 +23,11 @@
 #define PY_MAJOR_VERSION	2
 #define PY_MINOR_VERSION	7
 #define PY_MICRO_VERSION	0
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	2
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"2.7rc2+"
+#define PY_VERSION      	"2.7"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository) */

Modified: python/trunk/Lib/distutils/__init__.py
==============================================================================
--- python/trunk/Lib/distutils/__init__.py	(original)
+++ python/trunk/Lib/distutils/__init__.py	Sat Jul  3 15:56:13 2010
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7rc2"
+__version__ = "2.7"
 #--end constants--

Modified: python/trunk/Lib/idlelib/idlever.py
==============================================================================
--- python/trunk/Lib/idlelib/idlever.py	(original)
+++ python/trunk/Lib/idlelib/idlever.py	Sat Jul  3 15:56:13 2010
@@ -1 +1 @@
-IDLE_VERSION = "2.7rc2"
+IDLE_VERSION = "2.7"

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Jul  3 15:56:13 2010
@@ -7,7 +7,7 @@
 What's New in Python 2.7?
 =========================
 
-*Release date: XXXX-XX-XX*
+*Release date: 2010-07-03*
 
 Core and Builtins
 -----------------

Modified: python/trunk/Misc/RPM/python-2.7.spec
==============================================================================
--- python/trunk/Misc/RPM/python-2.7.spec	(original)
+++ python/trunk/Misc/RPM/python-2.7.spec	Sat Jul  3 15:56:13 2010
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 2.7rc2
+%define version 2.7
 %define libver 2.7
 #--end constants--
 %define release 1pydotorg

Modified: python/trunk/README
==============================================================================
--- python/trunk/README	(original)
+++ python/trunk/README	Sat Jul  3 15:56:13 2010
@@ -1,5 +1,5 @@
-This is Python version 2.7 release candidate 2
-==============================================
+This is Python version 2.7
+===========================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 Python Software Foundation.

From python-checkins at python.org  Sat Jul  3 15:56:57 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 15:56:57 +0200 (CEST)
Subject: [Python-checkins] r82501 - python/trunk/Misc/NEWS
Message-ID: <20100703135657.0229DF2EA@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 15:56:56 2010
New Revision: 82501

Log:
add another line between sections

Modified:
   python/trunk/Misc/NEWS

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Jul  3 15:56:56 2010
@@ -25,6 +25,7 @@
 
 - Issue #9125: Add recognition of 'except ... as ...' syntax to parser module.
 
+
 What's New in Python 2.7 release candidate 2?
 =============================================
 

From python-checkins at python.org  Sat Jul  3 15:57:30 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 15:57:30 +0200 (CEST)
Subject: [Python-checkins] r82502 - python/trunk/Misc/NEWS
Message-ID: <20100703135730.727D9F2EA@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 15:57:30 2010
New Revision: 82502

Log:
move sections

Modified:
   python/trunk/Misc/NEWS

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Jul  3 15:57:30 2010
@@ -17,14 +17,17 @@
 Library
 -------
 
+- Issue #9125: Add recognition of 'except ... as ...' syntax to parser module.
+
+Extension Modules
+-----------------
+
 - Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
   ensure that the input string length is a multiple of the frame size.
 
 - Issue #9075: In the ssl module, remove the setting of a ``debug`` flag
   on an OpenSSL structure.
 
-- Issue #9125: Add recognition of 'except ... as ...' syntax to parser module.
-
 
 What's New in Python 2.7 release candidate 2?
 =============================================

From python-checkins at python.org  Sat Jul  3 16:00:41 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 16:00:41 +0200 (CEST)
Subject: [Python-checkins] r82503 - python/branches/release27-maint
Message-ID: <20100703140041.C4855EE982@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 16:00:41 2010
New Revision: 82503

Log:
make 2.7 maintenance branch


Added:
   python/branches/release27-maint/
      - copied from r82502, /python/trunk/

From python-checkins at python.org  Sat Jul  3 16:02:14 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 16:02:14 +0200 (CEST)
Subject: [Python-checkins] r82504 - python/tags/r27
Message-ID: <20100703140214.85959EE982@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 16:02:14 2010
New Revision: 82504

Log:
Tag Python 2.7 final!


Added:
   python/tags/r27/
      - copied from r82503, /python/trunk/

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Added default
	implementation/documentation for the	external API
Message-ID: <E1OV3Yg-0002JW-Aa@dinsdale.python.org>

tarek.ziade pushed 8fb85c777536 to distutils2:

http://hg.python.org/distutils2/rev/8fb85c777536
changeset:   231:8fb85c777536
parent:      188:b7fd258b33e7
user:        Jeremy Kloth <jeremy.kloth at gmail.com>
date:        Thu Jun 03 15:42:12 2010 -0600
summary:     Added default implementation/documentation for the external API
files:       src/distutils2/cmd.py

diff --git a/src/distutils2/cmd.py b/src/distutils2/cmd.py
--- a/src/distutils2/cmd.py
+++ b/src/distutils2/cmd.py
@@ -189,6 +189,31 @@
         """
         log.log(level, msg)
 
+    # -- External interface --------------------------------------------
+    # (called by outsiders)
+
+    def get_source_files(self):
+        """Return the list of files that are used as inputs to this command,
+        i.e. the files used to generate the output files.  The result is used
+        by the `sdist` command in determining the set of default files.
+
+        Command classes should implement this method if they operate on files
+        from the source tree.
+        """
+        return []
+
+    def get_outputs(self):
+        """Return the list of files that would be produced if this command
+        were actually run.  Not affected by the "dry-run" flag or whether
+        any other commands have been run.
+
+        Command classes should implement this method if they produce any
+        output files that get consumed by another command.  e.g., `build_ext`
+        returns the list of built extension modules, but not any temporary
+        files used in the compilation process.
+        """
+        return []
+
     # -- Option validation methods -------------------------------------
     # (these are very handy in writing the 'finalize_options()' method)
     #

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Don?t use deprecated name (see
	comment in unittest2.case)
Message-ID: <E1OV3Yg-0002JK-9m@dinsdale.python.org>

tarek.ziade pushed 0b1b57c04665 to distutils2:

http://hg.python.org/distutils2/rev/0b1b57c04665
changeset:   230:0b1b57c04665
user:        ?ric Araujo <merwok at netwok.org>
date:        Thu Jun 24 16:36:34 2010 +0200
summary:     Don?t use deprecated name (see comment in unittest2.case)
files:       src/distutils2/_backport/tests/test_sysconfig.py, src/distutils2/tests/test_bdist.py, src/distutils2/tests/test_bdist_dumb.py, src/distutils2/tests/test_build.py, src/distutils2/tests/test_build_clib.py, src/distutils2/tests/test_build_ext.py, src/distutils2/tests/test_ccompiler.py, src/distutils2/tests/test_check.py, src/distutils2/tests/test_cmd.py, src/distutils2/tests/test_config.py, src/distutils2/tests/test_config_cmd.py, src/distutils2/tests/test_converter.py, src/distutils2/tests/test_cygwinccompiler.py, src/distutils2/tests/test_dist.py, src/distutils2/tests/test_install.py, src/distutils2/tests/test_install_data.py, src/distutils2/tests/test_install_headers.py, src/distutils2/tests/test_install_lib.py, src/distutils2/tests/test_manifest.py, src/distutils2/tests/test_metadata.py, src/distutils2/tests/test_msvc9compiler.py, src/distutils2/tests/test_register.py, src/distutils2/tests/test_sdist.py, src/distutils2/tests/test_spawn.py, src/distutils2/tests/test_upload.py, src/distutils2/tests/test_util.py, src/distutils2/tests/test_version.py

diff --git a/src/distutils2/_backport/tests/test_sysconfig.py b/src/distutils2/_backport/tests/test_sysconfig.py
--- a/src/distutils2/_backport/tests/test_sysconfig.py
+++ b/src/distutils2/_backport/tests/test_sysconfig.py
@@ -107,7 +107,7 @@
         wanted.sort()
         scheme = scheme.items()
         scheme.sort()
-        self.assertEquals(scheme, wanted)
+        self.assertEqual(scheme, wanted)
 
     def test_get_config_vars(self):
         cvars = get_config_vars()
@@ -120,21 +120,21 @@
         sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
                        '[MSC v.1310 32 bit (Intel)]')
         sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win32')
+        self.assertEqual(get_platform(), 'win32')
 
         # windows XP, amd64
         os.name = 'nt'
         sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
                        '[MSC v.1310 32 bit (Amd64)]')
         sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-amd64')
+        self.assertEqual(get_platform(), 'win-amd64')
 
         # windows XP, itanium
         os.name = 'nt'
         sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
                        '[MSC v.1310 32 bit (Itanium)]')
         sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-ia64')
+        self.assertEqual(get_platform(), 'win-ia64')
 
         # macbook
         os.name = 'posix'
@@ -153,9 +153,9 @@
         maxint = sys.maxint
         try:
             sys.maxint = 2147483647
-            self.assertEquals(get_platform(), 'macosx-10.3-ppc')
+            self.assertEqual(get_platform(), 'macosx-10.3-ppc')
             sys.maxint = 9223372036854775807
-            self.assertEquals(get_platform(), 'macosx-10.3-ppc64')
+            self.assertEqual(get_platform(), 'macosx-10.3-ppc64')
         finally:
             sys.maxint = maxint
 
@@ -173,9 +173,9 @@
         maxint = sys.maxint
         try:
             sys.maxint = 2147483647
-            self.assertEquals(get_platform(), 'macosx-10.3-i386')
+            self.assertEqual(get_platform(), 'macosx-10.3-i386')
             sys.maxint = 9223372036854775807
-            self.assertEquals(get_platform(), 'macosx-10.3-x86_64')
+            self.assertEqual(get_platform(), 'macosx-10.3-x86_64')
         finally:
             sys.maxint = maxint
 
@@ -186,33 +186,33 @@
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
-        self.assertEquals(get_platform(), 'macosx-10.4-fat')
+        self.assertEqual(get_platform(), 'macosx-10.4-fat')
 
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
-        self.assertEquals(get_platform(), 'macosx-10.4-intel')
+        self.assertEqual(get_platform(), 'macosx-10.4-intel')
 
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-fat3')
+        self.assertEqual(get_platform(), 'macosx-10.4-fat3')
 
         get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-universal')
+        self.assertEqual(get_platform(), 'macosx-10.4-universal')
 
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
-        self.assertEquals(get_platform(), 'macosx-10.4-fat64')
+        self.assertEqual(get_platform(), 'macosx-10.4-fat64')
 
         for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
             get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
@@ -220,7 +220,7 @@
                                            '-fno-strict-aliasing -fno-common '
                                            '-dynamic -DNDEBUG -g -O3'%(arch,))
 
-            self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
+            self.assertEqual(get_platform(), 'macosx-10.4-%s'%(arch,))
 
         # linux debian sarge
         os.name = 'posix'
@@ -230,7 +230,7 @@
         self._set_uname(('Linux', 'aglae', '2.6.21.1dedibox-r7',
                     '#1 Mon Apr 30 17:25:38 CEST 2007', 'i686'))
 
-        self.assertEquals(get_platform(), 'linux-i686')
+        self.assertEqual(get_platform(), 'linux-i686')
 
         # XXX more platforms to tests here
 
@@ -241,7 +241,7 @@
     def test_get_scheme_names(self):
         wanted = ('nt', 'nt_user', 'os2', 'os2_home', 'posix_home',
                   'posix_prefix', 'posix_user')
-        self.assertEquals(get_scheme_names(), wanted)
+        self.assertEqual(get_scheme_names(), wanted)
 
     def test_expand_globals(self):
 
@@ -254,8 +254,8 @@
 
         _expand_globals(config)
 
-        self.assertEquals(config.get('posix', 'foo'), 'ok')
-        self.assertEquals(config.get('posix', 'more'), '/etc/ok')
+        self.assertEqual(config.get('posix', 'foo'), 'ok')
+        self.assertEqual(config.get('posix', 'more'), '/etc/ok')
 
         # we might not have globals after all
         # extending again (==no more globals section)
diff --git a/src/distutils2/tests/test_bdist.py b/src/distutils2/tests/test_bdist.py
--- a/src/distutils2/tests/test_bdist.py
+++ b/src/distutils2/tests/test_bdist.py
@@ -23,7 +23,7 @@
         cmd = bdist(dist)
         cmd.formats = ['msi']
         cmd.ensure_finalized()
-        self.assertEquals(cmd.formats, ['msi'])
+        self.assertEqual(cmd.formats, ['msi'])
 
         # what format bdist offers ?
         # XXX an explicit list in bdist is
@@ -33,7 +33,7 @@
         formats.sort()
         found = cmd.format_command.keys()
         found.sort()
-        self.assertEquals(found, formats)
+        self.assertEqual(found, formats)
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)
diff --git a/src/distutils2/tests/test_bdist_dumb.py b/src/distutils2/tests/test_bdist_dumb.py
--- a/src/distutils2/tests/test_bdist_dumb.py
+++ b/src/distutils2/tests/test_bdist_dumb.py
@@ -78,7 +78,7 @@
             base = base.replace(':', '-')
 
         wanted = ['%s.zip' % base]
-        self.assertEquals(dist_created, wanted)
+        self.assertEqual(dist_created, wanted)
 
         # now let's check what we have in the zip file
         # XXX to be done
@@ -87,16 +87,16 @@
         pkg_dir, dist = self.create_dist()
         os.chdir(pkg_dir)
         cmd = bdist_dumb(dist)
-        self.assertEquals(cmd.bdist_dir, None)
+        self.assertEqual(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'))
+        self.assertEqual(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)
+        self.assertEqual(cmd.format, default)
 
 def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
diff --git a/src/distutils2/tests/test_build.py b/src/distutils2/tests/test_build.py
--- a/src/distutils2/tests/test_build.py
+++ b/src/distutils2/tests/test_build.py
@@ -20,11 +20,11 @@
         cmd.finalize_options()
 
         # if not specified, plat_name gets the current platform
-        self.assertEquals(cmd.plat_name, get_platform())
+        self.assertEqual(cmd.plat_name, get_platform())
 
         # build_purelib is build + lib
         wanted = os.path.join(cmd.build_base, 'lib')
-        self.assertEquals(cmd.build_purelib, wanted)
+        self.assertEqual(cmd.build_purelib, wanted)
 
         # build_platlib is 'build/lib.platform-x.x[-pydebug]'
         # examples:
@@ -34,21 +34,21 @@
             self.assertTrue(cmd.build_platlib.endswith('-pydebug'))
             plat_spec += '-pydebug'
         wanted = os.path.join(cmd.build_base, 'lib' + plat_spec)
-        self.assertEquals(cmd.build_platlib, wanted)
+        self.assertEqual(cmd.build_platlib, wanted)
 
         # by default, build_lib = build_purelib
-        self.assertEquals(cmd.build_lib, cmd.build_purelib)
+        self.assertEqual(cmd.build_lib, cmd.build_purelib)
 
         # build_temp is build/temp.<plat>
         wanted = os.path.join(cmd.build_base, 'temp' + plat_spec)
-        self.assertEquals(cmd.build_temp, wanted)
+        self.assertEqual(cmd.build_temp, wanted)
 
         # build_scripts is build/scripts-x.x
         wanted = os.path.join(cmd.build_base, 'scripts-' +  sys.version[0:3])
-        self.assertEquals(cmd.build_scripts, wanted)
+        self.assertEqual(cmd.build_scripts, wanted)
 
         # executable is os.path.normpath(sys.executable)
-        self.assertEquals(cmd.executable, os.path.normpath(sys.executable))
+        self.assertEqual(cmd.executable, os.path.normpath(sys.executable))
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)
diff --git a/src/distutils2/tests/test_build_clib.py b/src/distutils2/tests/test_build_clib.py
--- a/src/distutils2/tests/test_build_clib.py
+++ b/src/distutils2/tests/test_build_clib.py
@@ -55,14 +55,14 @@
         self.assertRaises(DistutilsSetupError, cmd.get_source_files)
 
         cmd.libraries = [('name', {'sources': ['a', 'b']})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b'])
 
         cmd.libraries = [('name', {'sources': ('a', 'b')})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b'])
 
         cmd.libraries = [('name', {'sources': ('a', 'b')}),
                          ('name2', {'sources': ['c', 'd']})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
 
     def test_build_libraries(self):
 
@@ -91,11 +91,11 @@
 
         cmd.include_dirs = 'one-dir'
         cmd.finalize_options()
-        self.assertEquals(cmd.include_dirs, ['one-dir'])
+        self.assertEqual(cmd.include_dirs, ['one-dir'])
 
         cmd.include_dirs = None
         cmd.finalize_options()
-        self.assertEquals(cmd.include_dirs, [])
+        self.assertEqual(cmd.include_dirs, [])
 
         cmd.distribution.libraries = 'WONTWORK'
         self.assertRaises(DistutilsSetupError, cmd.finalize_options)
diff --git a/src/distutils2/tests/test_build_ext.py b/src/distutils2/tests/test_build_ext.py
--- a/src/distutils2/tests/test_build_ext.py
+++ b/src/distutils2/tests/test_build_ext.py
@@ -80,11 +80,11 @@
         for attr in ('error', 'foo', 'new', 'roj'):
             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)
+        self.assertEqual(xx.foo(2, 5), 7)
+        self.assertEqual(xx.foo(13,15), 28)
+        self.assertEqual(xx.new().demo(), None)
         doc = 'This is a template module just for instruction.'
-        self.assertEquals(xx.__doc__, doc)
+        self.assertEqual(xx.__doc__, doc)
         self.assertTrue(isinstance(xx.Null(), xx.Null))
         self.assertTrue(isinstance(xx.Str(), xx.Str))
 
@@ -194,7 +194,7 @@
         cmd = build_ext(dist)
         cmd.libraries = 'my_lib'
         cmd.finalize_options()
-        self.assertEquals(cmd.libraries, ['my_lib'])
+        self.assertEqual(cmd.libraries, ['my_lib'])
 
         # make sure cmd.library_dirs is turned into a list
         # if it's a string
@@ -208,7 +208,7 @@
         cmd = build_ext(dist)
         cmd.rpath = os.pathsep.join(['one', 'two'])
         cmd.finalize_options()
-        self.assertEquals(cmd.rpath, ['one', 'two'])
+        self.assertEqual(cmd.rpath, ['one', 'two'])
 
         # XXX more tests to perform for win32
 
@@ -217,25 +217,25 @@
         cmd = build_ext(dist)
         cmd.define = 'one,two'
         cmd.finalize_options()
-        self.assertEquals(cmd.define, [('one', '1'), ('two', '1')])
+        self.assertEqual(cmd.define, [('one', '1'), ('two', '1')])
 
         # make sure undef is turned into a list of
         # strings if they are ','-separated strings
         cmd = build_ext(dist)
         cmd.undef = 'one,two'
         cmd.finalize_options()
-        self.assertEquals(cmd.undef, ['one', 'two'])
+        self.assertEqual(cmd.undef, ['one', 'two'])
 
         # make sure swig_opts is turned into a list
         cmd = build_ext(dist)
         cmd.swig_opts = None
         cmd.finalize_options()
-        self.assertEquals(cmd.swig_opts, [])
+        self.assertEqual(cmd.swig_opts, [])
 
         cmd = build_ext(dist)
         cmd.swig_opts = '1 2'
         cmd.finalize_options()
-        self.assertEquals(cmd.swig_opts, ['1', '2'])
+        self.assertEqual(cmd.swig_opts, ['1', '2'])
 
     def test_check_extensions_list(self):
         dist = Distribution()
@@ -271,7 +271,7 @@
         # 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.assertEqual(ext.libraries, 'foo')
         self.assertTrue(not hasattr(ext, 'some'))
 
         # 'macros' element of build info dict must be 1- or 2-tuple
@@ -281,15 +281,15 @@
 
         exts[0][1]['macros'] = [('1', '2'), ('3',)]
         cmd.check_extensions_list(exts)
-        self.assertEquals(exts[0].undef_macros, ['3'])
-        self.assertEquals(exts[0].define_macros, [('1', '2')])
+        self.assertEqual(exts[0].undef_macros, ['3'])
+        self.assertEqual(exts[0].define_macros, [('1', '2')])
 
     def test_get_source_files(self):
         modules = [Extension('foo', ['xxx'], optional=False)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
-        self.assertEquals(cmd.get_source_files(), ['xxx'])
+        self.assertEqual(cmd.get_source_files(), ['xxx'])
 
     def test_compiler_option(self):
         # cmd.compiler is an option and
@@ -300,7 +300,7 @@
         cmd.compiler = 'unix'
         cmd.ensure_finalized()
         cmd.run()
-        self.assertEquals(cmd.compiler, 'unix')
+        self.assertEqual(cmd.compiler, 'unix')
 
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
@@ -311,7 +311,7 @@
                              'ext_modules': [ext]})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
-        self.assertEquals(len(cmd.get_outputs()), 1)
+        self.assertEqual(len(cmd.get_outputs()), 1)
 
         if os.name == "nt":
             cmd.debug = sys.executable.endswith("_d.exe")
@@ -331,19 +331,19 @@
         finally:
             os.chdir(old_wd)
         self.assertTrue(os.path.exists(so_file))
-        self.assertEquals(os.path.splitext(so_file)[-1],
+        self.assertEqual(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, other_tmp_dir)
+        self.assertEqual(so_dir, other_tmp_dir)
 
         cmd.inplace = 0
         cmd.run()
         so_file = cmd.get_outputs()[0]
         self.assertTrue(os.path.exists(so_file))
-        self.assertEquals(os.path.splitext(so_file)[-1],
+        self.assertEqual(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)
+        self.assertEqual(so_dir, cmd.build_lib)
 
         # inplace = 0, cmd.package = 'bar'
         build_py = cmd.get_finalized_command('build_py')
@@ -351,7 +351,7 @@
         path = cmd.get_ext_fullpath('foo')
         # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
-        self.assertEquals(path, cmd.build_lib)
+        self.assertEqual(path, cmd.build_lib)
 
         # inplace = 1, cmd.package = 'bar'
         cmd.inplace = 1
@@ -365,7 +365,7 @@
         # checking that the last directory is bar
         path = os.path.split(path)[0]
         lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, 'bar')
+        self.assertEqual(lastdir, 'bar')
 
     def test_ext_fullpath(self):
         ext = sysconfig.get_config_vars()['SO']
@@ -381,14 +381,14 @@
         curdir = os.getcwd()
         wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
-        self.assertEquals(wanted, path)
+        self.assertEqual(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)
+        self.assertEqual(wanted, path)
 
         # building twisted.runner.portmap not inplace
         build_py = cmd.get_finalized_command('build_py')
@@ -397,13 +397,13 @@
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
                               'portmap' + ext)
-        self.assertEquals(wanted, path)
+        self.assertEqual(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)
+        self.assertEqual(wanted, path)
 
 def test_suite():
     src = _get_source_filename()
diff --git a/src/distutils2/tests/test_ccompiler.py b/src/distutils2/tests/test_ccompiler.py
--- a/src/distutils2/tests/test_ccompiler.py
+++ b/src/distutils2/tests/test_ccompiler.py
@@ -31,7 +31,7 @@
         opts = gen_lib_options(compiler, libdirs, runlibdirs, libs)
         wanted = ['-Llib1', '-Llib2', '-cool', '-Rrunlib1', 'found',
                   '-lname2']
-        self.assertEquals(opts, wanted)
+        self.assertEqual(opts, wanted)
 
     def test_customize_compiler(self):
 
@@ -51,7 +51,7 @@
 
         comp = compiler()
         customize_compiler(comp)
-        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
+        self.assertEqual(comp.exes['archiver'], 'my_ar -arflags')
 
 def test_suite():
     return unittest.makeSuite(CCompilerTestCase)
diff --git a/src/distutils2/tests/test_check.py b/src/distutils2/tests/test_check.py
--- a/src/distutils2/tests/test_check.py
+++ b/src/distutils2/tests/test_check.py
@@ -37,7 +37,7 @@
                     'name': 'xxx', 'version': 'xxx'
                     }
         cmd = self._run(metadata)
-        self.assertEquals(len(cmd._warnings), 0)
+        self.assertEqual(len(cmd._warnings), 0)
 
         # now with the strict mode, we should
         # get an error if there are missing metadata
@@ -45,7 +45,7 @@
 
         # and of course, no error when all metadata are present
         cmd = self._run(metadata, strict=1)
-        self.assertEquals(len(cmd._warnings), 0)
+        self.assertEqual(len(cmd._warnings), 0)
 
     def test_check_restructuredtext(self):
         if not _HAS_DOCUTILS: # won't test without docutils
@@ -55,7 +55,7 @@
         pkg_info, dist = self.create_dist(description=broken_rest)
         cmd = check(dist)
         cmd.check_restructuredtext()
-        self.assertEquals(len(cmd._warnings), 1)
+        self.assertEqual(len(cmd._warnings), 1)
 
         # let's see if we have an error with strict=1
         metadata = {'home_page': 'xxx', 'author': 'xxx',
@@ -69,7 +69,7 @@
         # and non-broken rest
         metadata['description'] = 'title\n=====\n\ntest'
         cmd = self._run(metadata, strict=1, restructuredtext=1)
-        self.assertEquals(len(cmd._warnings), 0)
+        self.assertEqual(len(cmd._warnings), 0)
 
     def test_check_all(self):
 
diff --git a/src/distutils2/tests/test_cmd.py b/src/distutils2/tests/test_cmd.py
--- a/src/distutils2/tests/test_cmd.py
+++ b/src/distutils2/tests/test_cmd.py
@@ -43,7 +43,7 @@
 
         # making sure execute gets called properly
         def _execute(func, args, exec_msg, level):
-            self.assertEquals(exec_msg, 'generating out from in')
+            self.assertEqual(exec_msg, 'generating out from in')
         cmd.force = True
         cmd.execute = _execute
         cmd.make_file(infiles='in', outfile='out', func='func', args=())
@@ -62,7 +62,7 @@
 
         wanted = ["command options for 'MyCmd':", '  option1 = 1',
                   '  option2 = 1']
-        self.assertEquals(msgs, wanted)
+        self.assertEqual(msgs, wanted)
 
     def test_ensure_string(self):
         cmd = self.cmd
@@ -80,7 +80,7 @@
         cmd = self.cmd
         cmd.option1 = 'ok,dok'
         cmd.ensure_string_list('option1')
-        self.assertEquals(cmd.option1, ['ok', 'dok'])
+        self.assertEqual(cmd.option1, ['ok', 'dok'])
 
         cmd.option2 = ['xxx', 'www']
         cmd.ensure_string_list('option2')
diff --git a/src/distutils2/tests/test_config.py b/src/distutils2/tests/test_config.py
--- a/src/distutils2/tests/test_config.py
+++ b/src/distutils2/tests/test_config.py
@@ -89,7 +89,7 @@
         expected = [('password', 'secret'), ('realm', 'pypi'),
                     ('repository', 'http://pypi.python.org/pypi'),
                     ('server', 'server1'), ('username', 'me')]
-        self.assertEquals(config, expected)
+        self.assertEqual(config, expected)
 
         # old format
         self.write_file(self.rc, PYPIRC_OLD)
@@ -99,7 +99,7 @@
         expected = [('password', 'secret'), ('realm', 'pypi'),
                     ('repository', 'http://pypi.python.org/pypi'),
                     ('server', 'server-login'), ('username', 'tarek')]
-        self.assertEquals(config, expected)
+        self.assertEqual(config, expected)
 
     def test_server_empty_registration(self):
         cmd = self._cmd(self.dist)
@@ -108,7 +108,7 @@
         cmd._store_pypirc('tarek', 'xxx')
         self.assertTrue(os.path.exists(rc))
         content = open(rc).read()
-        self.assertEquals(content, WANTED)
+        self.assertEqual(content, WANTED)
 
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
diff --git a/src/distutils2/tests/test_config_cmd.py b/src/distutils2/tests/test_config_cmd.py
--- a/src/distutils2/tests/test_config_cmd.py
+++ b/src/distutils2/tests/test_config_cmd.py
@@ -34,7 +34,7 @@
             f.close()
 
         dump_file(this_file, 'I am the header')
-        self.assertEquals(len(self._logs), numlines+1)
+        self.assertEqual(len(self._logs), numlines+1)
 
     def test_search_cpp(self):
         if sys.platform == 'win32':
@@ -44,10 +44,10 @@
 
         # simple pattern searches
         match = cmd.search_cpp(pattern='xxx', body='// xxx')
-        self.assertEquals(match, 0)
+        self.assertEqual(match, 0)
 
         match = cmd.search_cpp(pattern='_configtest', body='// xxx')
-        self.assertEquals(match, 1)
+        self.assertEqual(match, 1)
 
     def test_finalize_options(self):
         # finalize_options does a bit of transformation
@@ -59,9 +59,9 @@
         cmd.library_dirs = 'three%sfour' % os.pathsep
         cmd.ensure_finalized()
 
-        self.assertEquals(cmd.include_dirs, ['one', 'two'])
-        self.assertEquals(cmd.libraries, ['one'])
-        self.assertEquals(cmd.library_dirs, ['three', 'four'])
+        self.assertEqual(cmd.include_dirs, ['one', 'two'])
+        self.assertEqual(cmd.libraries, ['one'])
+        self.assertEqual(cmd.library_dirs, ['three', 'four'])
 
     def test_clean(self):
         # _clean removes files
diff --git a/src/distutils2/tests/test_converter.py b/src/distutils2/tests/test_converter.py
--- a/src/distutils2/tests/test_converter.py
+++ b/src/distutils2/tests/test_converter.py
@@ -30,7 +30,7 @@
             wanted = file_.replace('before', 'after')
             wanted = _read_file(os.path.join(convdir, wanted))
             res = ref.refactor_string(original, 'setup.py')
-            self.assertEquals(str(res), wanted)
+            self.assertEqual(str(res), wanted)
 
 def test_suite():
     return unittest.makeSuite(ConverterTestCase)
diff --git a/src/distutils2/tests/test_cygwinccompiler.py b/src/distutils2/tests/test_cygwinccompiler.py
--- a/src/distutils2/tests/test_cygwinccompiler.py
+++ b/src/distutils2/tests/test_cygwinccompiler.py
@@ -44,48 +44,48 @@
         sys.version = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) \n[GCC '
                        '4.0.1 (Apple Computer, Inc. build 5370)]')
 
-        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+        self.assertEqual(check_config_h()[0], CONFIG_H_OK)
 
         # then it tries to see if it can find "__GNUC__" in pyconfig.h
         sys.version = 'something without the *CC word'
 
         # if the file doesn't exist it returns  CONFIG_H_UNCERTAIN
-        self.assertEquals(check_config_h()[0], CONFIG_H_UNCERTAIN)
+        self.assertEqual(check_config_h()[0], CONFIG_H_UNCERTAIN)
 
         # if it exists but does not contain __GNUC__, it returns CONFIG_H_NOTOK
         self.write_file(self.python_h, 'xxx')
-        self.assertEquals(check_config_h()[0], CONFIG_H_NOTOK)
+        self.assertEqual(check_config_h()[0], CONFIG_H_NOTOK)
 
         # and CONFIG_H_OK if __GNUC__ is found
         self.write_file(self.python_h, 'xxx __GNUC__ xxx')
-        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+        self.assertEqual(check_config_h()[0], CONFIG_H_OK)
 
     def test_get_msvcr(self):
 
         # none
         sys.version  = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) '
                         '\n[GCC 4.0.1 (Apple Computer, Inc. build 5370)]')
-        self.assertEquals(get_msvcr(), None)
+        self.assertEqual(get_msvcr(), None)
 
         # MSVC 7.0
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1300 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr70'])
+        self.assertEqual(get_msvcr(), ['msvcr70'])
 
         # MSVC 7.1
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1310 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr71'])
+        self.assertEqual(get_msvcr(), ['msvcr71'])
 
         # VS2005 / MSVC 8.0
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1400 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr80'])
+        self.assertEqual(get_msvcr(), ['msvcr80'])
 
         # VS2008 / MSVC 9.0
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1500 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr90'])
+        self.assertEqual(get_msvcr(), ['msvcr90'])
 
         # unknown
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py
--- a/src/distutils2/tests/test_dist.py
+++ b/src/distutils2/tests/test_dist.py
@@ -71,11 +71,11 @@
         sys.argv.append("build")
 
         __, stdout = captured_stdout(self.create_distribution, files)
-        self.assertEquals(stdout, '')
+        self.assertEqual(stdout, '')
         distutils2.dist.DEBUG = True
         try:
             __, stdout = captured_stdout(self.create_distribution, files)
-            self.assertEquals(stdout, '')
+            self.assertEqual(stdout, '')
         finally:
             distutils2.dist.DEBUG = False
 
@@ -174,7 +174,7 @@
         finally:
             warnings.warn = old_warn
 
-        self.assertEquals(len(warns), 0)
+        self.assertEqual(len(warns), 0)
 
     def test_finalize_options(self):
 
@@ -185,20 +185,20 @@
         dist.finalize_options()
 
         # finalize_option splits platforms and keywords
-        self.assertEquals(dist.metadata['platform'], ['one', 'two'])
-        self.assertEquals(dist.metadata['keywords'], ['one', 'two'])
+        self.assertEqual(dist.metadata['platform'], ['one', 'two'])
+        self.assertEqual(dist.metadata['keywords'], ['one', 'two'])
 
     def test_get_command_packages(self):
         dist = Distribution()
-        self.assertEquals(dist.command_packages, None)
+        self.assertEqual(dist.command_packages, None)
         cmds = dist.get_command_packages()
-        self.assertEquals(cmds, ['distutils2.command'])
-        self.assertEquals(dist.command_packages,
+        self.assertEqual(cmds, ['distutils2.command'])
+        self.assertEqual(dist.command_packages,
                           ['distutils2.command'])
 
         dist.command_packages = 'one,two'
         cmds = dist.get_command_packages()
-        self.assertEquals(cmds, ['distutils2.command', 'one', 'two'])
+        self.assertEqual(cmds, ['distutils2.command', 'one', 'two'])
 
 
     def test_announce(self):
@@ -238,7 +238,7 @@
             os.path.expanduser = old_expander
 
         # make sure --no-user-cfg disables the user cfg file
-        self.assertEquals(len(all_files)-1, len(files))
+        self.assertEqual(len(all_files)-1, len(files))
 
 
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
@@ -365,8 +365,8 @@
     def test_fix_help_options(self):
         help_tuples = [('a', 'b', 'c', 'd'), (1, 2, 3, 4)]
         fancy_options = fix_help_options(help_tuples)
-        self.assertEquals(fancy_options[0], ('a', 'b', 'c'))
-        self.assertEquals(fancy_options[1], (1, 2, 3))
+        self.assertEqual(fancy_options[0], ('a', 'b', 'c'))
+        self.assertEqual(fancy_options[1], (1, 2, 3))
 
     def test_show_help(self):
         # smoke test, just makes sure some help is displayed
@@ -412,14 +412,14 @@
         PKG_INFO.seek(0)
 
         metadata.read_file(PKG_INFO)
-        self.assertEquals(metadata['name'], "package")
-        self.assertEquals(metadata['version'], "1.0")
-        self.assertEquals(metadata['summary'], "xxx")
-        self.assertEquals(metadata['download_url'], 'http://example.com')
-        self.assertEquals(metadata['keywords'], ['one', 'two'])
-        self.assertEquals(metadata['platform'], [])
-        self.assertEquals(metadata['obsoletes'], [])
-        self.assertEquals(metadata['requires-dist'], ['foo'])
+        self.assertEqual(metadata['name'], "package")
+        self.assertEqual(metadata['version'], "1.0")
+        self.assertEqual(metadata['summary'], "xxx")
+        self.assertEqual(metadata['download_url'], 'http://example.com')
+        self.assertEqual(metadata['keywords'], ['one', 'two'])
+        self.assertEqual(metadata['platform'], [])
+        self.assertEqual(metadata['obsoletes'], [])
+        self.assertEqual(metadata['requires-dist'], ['foo'])
 
 def test_suite():
     suite = unittest.TestSuite()
diff --git a/src/distutils2/tests/test_install.py b/src/distutils2/tests/test_install.py
--- a/src/distutils2/tests/test_install.py
+++ b/src/distutils2/tests/test_install.py
@@ -139,23 +139,23 @@
 
         # two elements
         cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, ['path', 'dirs'])
-        self.assertEquals(cmd.extra_dirs, 'dirs')
-        self.assertEquals(cmd.path_file, 'path')
+        self.assertEqual(cmd.extra_path, ['path', 'dirs'])
+        self.assertEqual(cmd.extra_dirs, 'dirs')
+        self.assertEqual(cmd.path_file, 'path')
 
         # one element
         cmd.extra_path = ['path']
         cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, ['path'])
-        self.assertEquals(cmd.extra_dirs, 'path')
-        self.assertEquals(cmd.path_file, 'path')
+        self.assertEqual(cmd.extra_path, ['path'])
+        self.assertEqual(cmd.extra_dirs, 'path')
+        self.assertEqual(cmd.path_file, 'path')
 
         # none
         dist.extra_path = cmd.extra_path = None
         cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, None)
-        self.assertEquals(cmd.extra_dirs, '')
-        self.assertEquals(cmd.path_file, None)
+        self.assertEqual(cmd.extra_path, None)
+        self.assertEqual(cmd.extra_dirs, '')
+        self.assertEqual(cmd.path_file, None)
 
         # three elements (no way !)
         cmd.extra_path = 'path,dirs,again'
@@ -199,7 +199,7 @@
         # line (the egg info file)
         f = open(cmd.record)
         try:
-            self.assertEquals(len(f.readlines()), 1)
+            self.assertEqual(len(f.readlines()), 1)
         finally:
             f.close()
 
diff --git a/src/distutils2/tests/test_install_data.py b/src/distutils2/tests/test_install_data.py
--- a/src/distutils2/tests/test_install_data.py
+++ b/src/distutils2/tests/test_install_data.py
@@ -27,14 +27,14 @@
         self.write_file(two, 'xxx')
 
         cmd.data_files = [one, (inst2, [two])]
-        self.assertEquals(cmd.get_inputs(), [one, (inst2, [two])])
+        self.assertEqual(cmd.get_inputs(), [one, (inst2, [two])])
 
         # let's run the command
         cmd.ensure_finalized()
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
         rtwo = os.path.split(two)[-1]
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         rone = os.path.split(one)[-1]
@@ -47,7 +47,7 @@
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
@@ -65,7 +65,7 @@
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 4)
+        self.assertEqual(len(cmd.get_outputs()), 4)
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         self.assertTrue(os.path.exists(os.path.join(inst, rone)))
 
diff --git a/src/distutils2/tests/test_install_headers.py b/src/distutils2/tests/test_install_headers.py
--- a/src/distutils2/tests/test_install_headers.py
+++ b/src/distutils2/tests/test_install_headers.py
@@ -23,7 +23,7 @@
 
         pkg_dir, dist = self.create_dist(headers=headers)
         cmd = install_headers(dist)
-        self.assertEquals(cmd.get_inputs(), headers)
+        self.assertEqual(cmd.get_inputs(), headers)
 
         # let's run the command
         cmd.install_dir = os.path.join(pkg_dir, 'inst')
@@ -31,7 +31,7 @@
         cmd.run()
 
         # let's check the results
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
 
 def test_suite():
     return unittest.makeSuite(InstallHeadersTestCase)
diff --git a/src/distutils2/tests/test_install_lib.py b/src/distutils2/tests/test_install_lib.py
--- a/src/distutils2/tests/test_install_lib.py
+++ b/src/distutils2/tests/test_install_lib.py
@@ -25,8 +25,8 @@
         cmd = install_lib(dist)
 
         cmd.finalize_options()
-        self.assertEquals(cmd.compile, 1)
-        self.assertEquals(cmd.optimize, 0)
+        self.assertEqual(cmd.compile, 1)
+        self.assertEqual(cmd.optimize, 0)
 
         # optimize must be 0, 1, or 2
         cmd.optimize = 'foo'
@@ -36,7 +36,7 @@
 
         cmd.optimize = '2'
         cmd.finalize_options()
-        self.assertEquals(cmd.optimize, 2)
+        self.assertEqual(cmd.optimize, 2)
 
     @unittest.skipIf(no_bytecode, 'byte-compile not supported')
     def test_byte_compile(self):
@@ -82,7 +82,7 @@
         cmd.distribution.script_name = 'setup.py'
 
         # get_input should return 2 elements
-        self.assertEquals(len(cmd.get_inputs()), 2)
+        self.assertEqual(len(cmd.get_inputs()), 2)
 
     @unittest.skipUnless(bytecode_support, 'sys.dont_write_bytecode not supported')
     def test_dont_write_bytecode(self):
diff --git a/src/distutils2/tests/test_manifest.py b/src/distutils2/tests/test_manifest.py
--- a/src/distutils2/tests/test_manifest.py
+++ b/src/distutils2/tests/test_manifest.py
@@ -44,7 +44,7 @@
 
         # the manifest should have been read
         # and 3 warnings issued (we ddidn't provided the files)
-        self.assertEquals(len(warns), 3)
+        self.assertEqual(len(warns), 3)
         for warn in warns:
             self.assertIn('warning: no files found matching', warn)
 
diff --git a/src/distutils2/tests/test_metadata.py b/src/distutils2/tests/test_metadata.py
--- a/src/distutils2/tests/test_metadata.py
+++ b/src/distutils2/tests/test_metadata.py
@@ -75,14 +75,14 @@
         content = content % sys.platform
         metadata = DistributionMetadata(platform_dependent=True)
         metadata.read_file(StringIO(content))
-        self.assertEquals(metadata['Requires-Dist'], ['bar'])
+        self.assertEqual(metadata['Requires-Dist'], ['bar'])
 
         # test with context
         context = {'sys.platform': 'okook'}
         metadata = DistributionMetadata(platform_dependent=True,
                                         execution_context=context)
         metadata.read_file(StringIO(content))
-        self.assertEquals(metadata['Requires-Dist'], ['foo'])
+        self.assertEqual(metadata['Requires-Dist'], ['foo'])
 
     def test_description(self):
         PKG_INFO = os.path.join(os.path.dirname(__file__), 'PKG-INFO')
@@ -94,14 +94,14 @@
         # see if we can read the description now
         DESC = os.path.join(os.path.dirname(__file__), 'LONG_DESC.txt')
         wanted = open(DESC).read()
-        self.assertEquals(wanted, metadata['Description'])
+        self.assertEqual(wanted, metadata['Description'])
 
         # save the file somewhere and make sure we can read it back
         out = StringIO()
         metadata.write_file(out)
         out.seek(0)
         metadata.read_file(out)
-        self.assertEquals(wanted, metadata['Description'])
+        self.assertEqual(wanted, metadata['Description'])
 
     def test_mapper_apis(self):
         PKG_INFO = os.path.join(os.path.dirname(__file__), 'PKG-INFO')
@@ -116,25 +116,25 @@
     def test_versions(self):
         metadata = DistributionMetadata()
         metadata['Obsoletes'] = 'ok'
-        self.assertEquals(metadata['Metadata-Version'], '1.1')
+        self.assertEqual(metadata['Metadata-Version'], '1.1')
 
         del metadata['Obsoletes']
         metadata['Obsoletes-Dist'] = 'ok'
-        self.assertEquals(metadata['Metadata-Version'], '1.2')
+        self.assertEqual(metadata['Metadata-Version'], '1.2')
 
         del metadata['Obsoletes-Dist']
         metadata['Version'] = '1'
-        self.assertEquals(metadata['Metadata-Version'], '1.0')
+        self.assertEqual(metadata['Metadata-Version'], '1.0')
 
         PKG_INFO = os.path.join(os.path.dirname(__file__),
                                 'SETUPTOOLS-PKG-INFO')
         metadata.read_file(StringIO(open(PKG_INFO).read()))
-        self.assertEquals(metadata['Metadata-Version'], '1.0')
+        self.assertEqual(metadata['Metadata-Version'], '1.0')
 
         PKG_INFO = os.path.join(os.path.dirname(__file__),
                                 'SETUPTOOLS-PKG-INFO2')
         metadata.read_file(StringIO(open(PKG_INFO).read()))
-        self.assertEquals(metadata['Metadata-Version'], '1.1')
+        self.assertEqual(metadata['Metadata-Version'], '1.1')
 
     def test_warnings(self):
         metadata = DistributionMetadata()
@@ -162,7 +162,7 @@
 
         # we should have a certain amount of warnings
         num_wanted = len(values)
-        self.assertEquals(num_wanted, res)
+        self.assertEqual(num_wanted, res)
 
     def test_multiple_predicates(self):
         metadata = DistributionMetadata()
@@ -185,29 +185,29 @@
             res = m.warns
             del m.warns
 
-        self.assertEquals(res, 0)
+        self.assertEqual(res, 0)
 
     def test_project_url(self):
         metadata = DistributionMetadata()
         metadata['Project-URL'] = [('one', 'http://ok')]
-        self.assertEquals(metadata['Project-URL'],
+        self.assertEqual(metadata['Project-URL'],
                           [('one', 'http://ok')])
-        self.assertEquals(metadata.version, '1.2')
+        self.assertEqual(metadata.version, '1.2')
 
     def test_check(self):
         metadata = DistributionMetadata()
         metadata['Version'] = 'rr'
         metadata['Requires-dist'] = ['Foo (a)']
         missing, warnings = metadata.check()
-        self.assertEquals(missing, ['Name', 'Home-page'])
-        self.assertEquals(len(warnings), 2)
+        self.assertEqual(missing, ['Name', 'Home-page'])
+        self.assertEqual(len(warnings), 2)
 
     def test_best_choice(self):
         metadata = DistributionMetadata()
         metadata['Version'] = '1.0'
-        self.assertEquals(metadata.version, PKG_INFO_PREFERRED_VERSION)
+        self.assertEqual(metadata.version, PKG_INFO_PREFERRED_VERSION)
         metadata['Classifier'] = ['ok']
-        self.assertEquals(metadata.version, '1.2')
+        self.assertEqual(metadata.version, '1.2')
 
     def test_project_urls(self):
         # project-url is a bit specific, make sure we write it
@@ -215,7 +215,7 @@
         metadata = DistributionMetadata()
         metadata['Version'] = '1.0'
         metadata['Project-Url'] = [('one', 'http://ok')]
-        self.assertEquals(metadata['Project-Url'], [('one', 'http://ok')])
+        self.assertEqual(metadata['Project-Url'], [('one', 'http://ok')])
         file_ = StringIO()
         metadata.write_file(file_)
         file_.seek(0)
@@ -225,7 +225,7 @@
         file_.seek(0)
         metadata = DistributionMetadata()
         metadata.read_file(file_)
-        self.assertEquals(metadata['Project-Url'], [('one', 'http://ok')])
+        self.assertEqual(metadata['Project-Url'], [('one', 'http://ok')])
 
 
 def test_suite():
diff --git a/src/distutils2/tests/test_msvc9compiler.py b/src/distutils2/tests/test_msvc9compiler.py
--- a/src/distutils2/tests/test_msvc9compiler.py
+++ b/src/distutils2/tests/test_msvc9compiler.py
@@ -105,7 +105,7 @@
         import _winreg
         HKCU = _winreg.HKEY_CURRENT_USER
         keys = Reg.read_keys(HKCU, 'xxxx')
-        self.assertEquals(keys, None)
+        self.assertEqual(keys, None)
 
         keys = Reg.read_keys(HKCU, r'Control Panel')
         self.assertTrue('Desktop' in keys)
@@ -129,7 +129,7 @@
         f.close()
 
         # makes sure the manifest was properly cleaned
-        self.assertEquals(content, _CLEANED_MANIFEST)
+        self.assertEqual(content, _CLEANED_MANIFEST)
 
 
 def test_suite():
diff --git a/src/distutils2/tests/test_register.py b/src/distutils2/tests/test_register.py
--- a/src/distutils2/tests/test_register.py
+++ b/src/distutils2/tests/test_register.py
@@ -124,7 +124,7 @@
 
         # with the content similar to WANTED_PYPIRC
         content = open(self.rc).read()
-        self.assertEquals(content, WANTED_PYPIRC)
+        self.assertEqual(content, WANTED_PYPIRC)
 
         # now let's make sure the .pypirc file generated
         # really works : we shouldn't be asked anything
@@ -141,7 +141,7 @@
         self.assertTrue(self.conn.reqs, 2)
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
-        self.assertEquals(req2['Content-length'], req1['Content-length'])
+        self.assertEqual(req2['Content-length'], req1['Content-length'])
         self.assertTrue('xxx' in self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
@@ -154,7 +154,7 @@
 
         # dist.password should be set
         # therefore used afterwards by other commands
-        self.assertEquals(cmd.distribution.password, 'password')
+        self.assertEqual(cmd.distribution.password, 'password')
 
     def test_registering(self):
         # this test runs choice 2
@@ -171,7 +171,7 @@
         self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
-        self.assertEquals(headers['Content-length'], '608')
+        self.assertEqual(headers['Content-length'], '608')
         self.assertTrue('tarek' in req.data)
 
     def test_password_reset(self):
@@ -189,7 +189,7 @@
         self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
-        self.assertEquals(headers['Content-length'], '290')
+        self.assertEqual(headers['Content-length'], '290')
         self.assertTrue('tarek' in req.data)
 
     @unittest.skipUnless(DOCUTILS_SUPPORT, 'needs docutils')
@@ -246,8 +246,8 @@
         cmd.ensure_finalized()
         cmd.distribution.metadata['Requires-Dist'] = ['lxml']
         data = cmd.build_post_data('submit')
-        self.assertEquals(data['metadata_version'], '1.2')
-        self.assertEquals(data['requires_dist'], ['lxml'])
+        self.assertEqual(data['metadata_version'], '1.2')
+        self.assertEqual(data['requires_dist'], ['lxml'])
 
 def test_suite():
     return unittest.makeSuite(RegisterTestCase)
diff --git a/src/distutils2/tests/test_sdist.py b/src/distutils2/tests/test_sdist.py
--- a/src/distutils2/tests/test_sdist.py
+++ b/src/distutils2/tests/test_sdist.py
@@ -127,7 +127,7 @@
         # now let's check what we have
         dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
-        self.assertEquals(files, ['fake-1.0.zip'])
+        self.assertEqual(files, ['fake-1.0.zip'])
 
         zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
         try:
@@ -136,7 +136,7 @@
             zip_file.close()
 
         # making sure everything has been pruned correctly
-        self.assertEquals(len(content), 4)
+        self.assertEqual(len(content), 4)
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_make_distribution(self):
@@ -158,7 +158,7 @@
         dist_folder = join(self.tmp_dir, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEquals(result,
+        self.assertEqual(result,
                           ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
 
         os.remove(join(dist_folder, 'fake-1.0.tar'))
@@ -172,7 +172,7 @@
 
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEquals(result,
+        self.assertEqual(result,
                 ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
     @unittest.skipUnless(zlib, "requires zlib")
@@ -222,7 +222,7 @@
         # now let's check what we have
         dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
-        self.assertEquals(files, ['fake-1.0.zip'])
+        self.assertEqual(files, ['fake-1.0.zip'])
 
         zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
         try:
@@ -231,11 +231,11 @@
             zip_file.close()
 
         # making sure everything was added
-        self.assertEquals(len(content), 11)
+        self.assertEqual(len(content), 11)
 
         # checking the MANIFEST
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
-        self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+        self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_metadata_check_option(self):
@@ -247,7 +247,7 @@
         cmd.ensure_finalized()
         cmd.run()
         warnings = self.get_logs(WARN)
-        self.assertEquals(len(warnings), 1)
+        self.assertEqual(len(warnings), 1)
 
         # trying with a complete set of metadata
         self.clear_logs()
@@ -259,7 +259,7 @@
         # removing manifest generated warnings
         warnings = [warn for warn in warnings if
                     not warn.endswith('-- skipping')]
-        self.assertEquals(len(warnings), 0)
+        self.assertEqual(len(warnings), 0)
 
 
     def test_show_formats(self):
@@ -269,7 +269,7 @@
         num_formats = len(get_archive_formats())
         output = [line for line in stdout.split('\n')
                   if line.strip().startswith('--formats=')]
-        self.assertEquals(len(output), num_formats)
+        self.assertEqual(len(output), num_formats)
 
     def test_finalize_options(self):
 
@@ -277,9 +277,9 @@
         cmd.finalize_options()
 
         # default options set by finalize
-        self.assertEquals(cmd.manifest, 'MANIFEST')
-        self.assertEquals(cmd.template, 'MANIFEST.in')
-        self.assertEquals(cmd.dist_dir, 'dist')
+        self.assertEqual(cmd.manifest, 'MANIFEST')
+        self.assertEqual(cmd.template, 'MANIFEST.in')
+        self.assertEqual(cmd.dist_dir, 'dist')
 
         # formats has to be a string splitable on (' ', ',') or
         # a stringlist
@@ -316,8 +316,8 @@
         archive = tarfile.open(archive_name)
         try:
             for member in archive.getmembers():
-                self.assertEquals(member.uid, 0)
-                self.assertEquals(member.gid, 0)
+                self.assertEqual(member.uid, 0)
+                self.assertEqual(member.gid, 0)
         finally:
             archive.close()
 
@@ -338,7 +338,7 @@
         # rights (see #7408)
         try:
             for member in archive.getmembers():
-                self.assertEquals(member.uid, os.getuid())
+                self.assertEqual(member.uid, os.getuid())
         finally:
             archive.close()
 
diff --git a/src/distutils2/tests/test_spawn.py b/src/distutils2/tests/test_spawn.py
--- a/src/distutils2/tests/test_spawn.py
+++ b/src/distutils2/tests/test_spawn.py
@@ -20,7 +20,7 @@
                                (['nochange', 'nospace'],
                                 ['nochange', 'nospace'])):
             res = _nt_quote_args(args)
-            self.assertEquals(res, wanted)
+            self.assertEqual(res, wanted)
 
 
     @unittest.skipUnless(os.name in ('nt', 'posix'),
diff --git a/src/distutils2/tests/test_upload.py b/src/distutils2/tests/test_upload.py
--- a/src/distutils2/tests/test_upload.py
+++ b/src/distutils2/tests/test_upload.py
@@ -80,7 +80,7 @@
         for attr, expected in (('username', 'me'), ('password', 'secret'),
                                ('realm', 'pypi'),
                                ('repository', 'http://pypi.python.org/pypi')):
-            self.assertEquals(getattr(cmd, attr), expected)
+            self.assertEqual(getattr(cmd, attr), expected)
 
     def test_saved_password(self):
         # file with no password
@@ -90,14 +90,14 @@
         dist = Distribution()
         cmd = upload(dist)
         cmd.finalize_options()
-        self.assertEquals(cmd.password, None)
+        self.assertEqual(cmd.password, None)
 
         # make sure we get it as well, if another command
         # initialized it at the dist level
         dist.password = 'xxx'
         cmd = upload(dist)
         cmd.finalize_options()
-        self.assertEquals(cmd.password, 'xxx')
+        self.assertEqual(cmd.password, 'xxx')
 
     def test_upload(self):
         tmp = self.mkdtemp()
@@ -118,8 +118,8 @@
         headers = dict(self.last_open.req.headers)
         self.assertTrue(int(headers['Content-length']) < 2000)
         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(),
+        self.assertEqual(self.last_open.req.get_method(), 'POST')
+        self.assertEqual(self.last_open.req.get_full_url(),
                           'http://pypi.python.org/pypi')
         self.assertTrue('xxx' in self.last_open.req.data)
         auth = self.last_open.req.headers['Authorization']
diff --git a/src/distutils2/tests/test_util.py b/src/distutils2/tests/test_util.py
--- a/src/distutils2/tests/test_util.py
+++ b/src/distutils2/tests/test_util.py
@@ -100,7 +100,7 @@
             return '/'.join(path)
         os.path.join = _join
 
-        self.assertEquals(convert_path('/home/to/my/stuff'),
+        self.assertEqual(convert_path('/home/to/my/stuff'),
                           '/home/to/my/stuff')
 
         # win
@@ -112,9 +112,9 @@
         self.assertRaises(ValueError, convert_path, '/home/to/my/stuff')
         self.assertRaises(ValueError, convert_path, 'home/to/my/stuff/')
 
-        self.assertEquals(convert_path('home/to/my/stuff'),
+        self.assertEqual(convert_path('home/to/my/stuff'),
                           'home\\to\\my\\stuff')
-        self.assertEquals(convert_path('.'),
+        self.assertEqual(convert_path('.'),
                           os.curdir)
 
     def test_change_root(self):
@@ -127,9 +127,9 @@
             return '/'.join(path)
         os.path.join = _join
 
-        self.assertEquals(change_root('/root', '/old/its/here'),
+        self.assertEqual(change_root('/root', '/old/its/here'),
                           '/root/old/its/here')
-        self.assertEquals(change_root('/root', 'its/here'),
+        self.assertEqual(change_root('/root', 'its/here'),
                           '/root/its/here')
 
         # windows
@@ -146,9 +146,9 @@
             return '\\'.join(path)
         os.path.join = _join
 
-        self.assertEquals(change_root('c:\\root', 'c:\\old\\its\\here'),
+        self.assertEqual(change_root('c:\\root', 'c:\\old\\its\\here'),
                           'c:\\root\\old\\its\\here')
-        self.assertEquals(change_root('c:\\root', 'its\\here'),
+        self.assertEqual(change_root('c:\\root', 'its\\here'),
                           'c:\\root\\its\\here')
 
         # BugsBunny os (it's a great os)
@@ -159,7 +159,7 @@
         # XXX platforms to be covered: os2, mac
 
     def test_split_quoted(self):
-        self.assertEquals(split_quoted('""one"" "two" \'three\' \\four'),
+        self.assertEqual(split_quoted('""one"" "two" \'three\' \\four'),
                           ['one', 'two', 'three', 'four'])
 
     def test_strtobool(self):
@@ -177,7 +177,7 @@
         res = rfc822_escape(header)
         wanted = ('I am a%(8s)spoor%(8s)slonesome%(8s)s'
                   'header%(8s)s') % {'8s': '\n'+8*' '}
-        self.assertEquals(res, wanted)
+        self.assertEqual(res, wanted)
 
     def test_find_exe_version(self):
         # the ld version scheme under MAC OS is:
@@ -195,7 +195,7 @@
                                 ('@(#)PROGRAM:ld  PROJECT:ld64-95.2.12',
                                  '95.2.12')):
             result = _MAC_OS_X_LD_VERSION.search(output)
-            self.assertEquals(result.group(1), version)
+            self.assertEqual(result.group(1), version)
 
     def _find_executable(self, name):
         if name in self._exes:
@@ -205,43 +205,43 @@
     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))
+        self.assertEqual(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')
+        self.assertEqual(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)
+        self.assertEqual(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.assertEqual(str(res[1]), '2.17.50')
             self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
             res = get_compiler_versions()
-            self.assertEquals(res[1], None)
+            self.assertEqual(res[1], None)
         else:
             self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
             res = get_compiler_versions()
-            self.assertEquals(res[1], None)
+            self.assertEqual(res[1], None)
             self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
             res = get_compiler_versions()
-            self.assertEquals(str(res[1]), '77')
+            self.assertEqual(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.assertEqual(str(res[2]), '2.17.50')
         self._exes['dllwrap'] = 'Cheese Wrap'
         res = get_compiler_versions()
-        self.assertEquals(res[2], None)
+        self.assertEqual(res[2], None)
 
     @unittest.skipUnless(hasattr(sys, 'dont_write_bytecode'),
                           'no dont_write_bytecode support')
@@ -294,7 +294,7 @@
         self.write_file(os.path.join(pkg5, '__init__.py'))
 
         res = find_packages([root], ['pkg1.pkg2'])
-        self.assertEquals(set(res), set(['pkg1', 'pkg5', 'pkg1.pkg3', 'pkg1.pkg3.pkg6']))
+        self.assertEqual(set(res), set(['pkg1', 'pkg5', 'pkg1.pkg3', 'pkg1.pkg3.pkg6']))
 
 
 def test_suite():
diff --git a/src/distutils2/tests/test_version.py b/src/distutils2/tests/test_version.py
--- a/src/distutils2/tests/test_version.py
+++ b/src/distutils2/tests/test_version.py
@@ -25,15 +25,15 @@
     def test_basic_versions(self):
 
         for v, s in self.versions:
-            self.assertEquals(str(v), s)
+            self.assertEqual(str(v), s)
 
     def test_from_parts(self):
 
         for v, s in self.versions:
             parts = v.parts
             v2 = V.from_parts(*v.parts)
-            self.assertEquals(v, v2)
-            self.assertEquals(str(v), str(v2))
+            self.assertEqual(v, v2)
+            self.assertEqual(str(v), str(v2))
 
     def test_irrational_versions(self):
 
@@ -96,34 +96,34 @@
 
     def test_suggest_normalized_version(self):
 
-        self.assertEquals(suggest('1.0'), '1.0')
-        self.assertEquals(suggest('1.0-alpha1'), '1.0a1')
-        self.assertEquals(suggest('1.0c2'), '1.0c2')
-        self.assertEquals(suggest('walla walla washington'), None)
-        self.assertEquals(suggest('2.4c1'), '2.4c1')
+        self.assertEqual(suggest('1.0'), '1.0')
+        self.assertEqual(suggest('1.0-alpha1'), '1.0a1')
+        self.assertEqual(suggest('1.0c2'), '1.0c2')
+        self.assertEqual(suggest('walla walla washington'), None)
+        self.assertEqual(suggest('2.4c1'), '2.4c1')
 
         # from setuptools
-        self.assertEquals(suggest('0.4a1.r10'), '0.4a1.post10')
-        self.assertEquals(suggest('0.7a1dev-r66608'), '0.7a1.dev66608')
-        self.assertEquals(suggest('0.6a9.dev-r41475'), '0.6a9.dev41475')
-        self.assertEquals(suggest('2.4preview1'), '2.4c1')
-        self.assertEquals(suggest('2.4pre1') , '2.4c1')
-        self.assertEquals(suggest('2.1-rc2'), '2.1c2')
+        self.assertEqual(suggest('0.4a1.r10'), '0.4a1.post10')
+        self.assertEqual(suggest('0.7a1dev-r66608'), '0.7a1.dev66608')
+        self.assertEqual(suggest('0.6a9.dev-r41475'), '0.6a9.dev41475')
+        self.assertEqual(suggest('2.4preview1'), '2.4c1')
+        self.assertEqual(suggest('2.4pre1') , '2.4c1')
+        self.assertEqual(suggest('2.1-rc2'), '2.1c2')
 
         # from pypi
-        self.assertEquals(suggest('0.1dev'), '0.1.dev0')
-        self.assertEquals(suggest('0.1.dev'), '0.1.dev0')
+        self.assertEqual(suggest('0.1dev'), '0.1.dev0')
+        self.assertEqual(suggest('0.1.dev'), '0.1.dev0')
 
         # we want to be able to parse Twisted
         # development versions are like post releases in Twisted
-        self.assertEquals(suggest('9.0.0+r2363'), '9.0.0.post2363')
+        self.assertEqual(suggest('9.0.0+r2363'), '9.0.0.post2363')
 
         # pre-releases are using markers like "pre1"
-        self.assertEquals(suggest('9.0.0pre1'), '9.0.0c1')
+        self.assertEqual(suggest('9.0.0pre1'), '9.0.0c1')
 
         # we want to be able to parse Tcl-TK
         # they us "p1" "p2" for post releases
-        self.assertEquals(suggest('1.4p1'), '1.4.post1')
+        self.assertEqual(suggest('1.4p1'), '1.4.post1')
 
     def test_predicate(self):
         # VersionPredicate knows how to parse stuff like:

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Add jkloth to contributors and sort
	list again
Message-ID: <E1OV3Yg-0002Jd-C9@dinsdale.python.org>

tarek.ziade pushed 658ed3f08df8 to distutils2:

http://hg.python.org/distutils2/rev/658ed3f08df8
changeset:   233:658ed3f08df8
user:        ?ric Araujo <merwok at netwok.org>
date:        Thu Jun 24 17:39:52 2010 +0200
summary:     Add jkloth to contributors and sort list again
files:       src/CONTRIBUTORS.txt

diff --git a/src/CONTRIBUTORS.txt b/src/CONTRIBUTORS.txt
--- a/src/CONTRIBUTORS.txt
+++ b/src/CONTRIBUTORS.txt
@@ -5,7 +5,7 @@
 Distutils2 is a project that was started and that is maintained by
 Tarek Ziad??, and many people are contributing to the project.
 
-If you did, please add your name below in alphabetical order !
+If you did, please add your name below in alphabetical order!
 
 Thanks to:
 
@@ -15,6 +15,8 @@
 - Nicolas Cadou
 - Josip Djolonga
 - Yannick Gringas
+- Jeremy Kloth
+- Martin von L??wis
 - Carl Meyer
 - Michael Mulich
 - George Peris
@@ -22,5 +24,3 @@
 - Erik Rose
 - Brian Rosner
 - Alexandre Vassalotti
-- Martin von L??wis
-

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Pull changeset with new docstrings
	from jkloth
Message-ID: <E1OV3Yg-0002Ja-BY@dinsdale.python.org>

tarek.ziade pushed ba4aa1e016db to distutils2:

http://hg.python.org/distutils2/rev/ba4aa1e016db
changeset:   232:ba4aa1e016db
parent:      230:0b1b57c04665
parent:      231:8fb85c777536
user:        ?ric Araujo <merwok at netwok.org>
date:        Thu Jun 24 17:39:49 2010 +0200
summary:     Pull changeset with new docstrings from jkloth
files:       src/distutils2/command/cmd.py

diff --git a/src/distutils2/command/cmd.py b/src/distutils2/command/cmd.py
--- a/src/distutils2/command/cmd.py
+++ b/src/distutils2/command/cmd.py
@@ -189,6 +189,31 @@
         """
         log.log(level, msg)
 
+    # -- External interface --------------------------------------------
+    # (called by outsiders)
+
+    def get_source_files(self):
+        """Return the list of files that are used as inputs to this command,
+        i.e. the files used to generate the output files.  The result is used
+        by the `sdist` command in determining the set of default files.
+
+        Command classes should implement this method if they operate on files
+        from the source tree.
+        """
+        return []
+
+    def get_outputs(self):
+        """Return the list of files that would be produced if this command
+        were actually run.  Not affected by the "dry-run" flag or whether
+        any other commands have been run.
+
+        Command classes should implement this method if they produce any
+        output files that get consumed by another command.  e.g., `build_ext`
+        returns the list of built extension modules, but not any temporary
+        files used in the compilation process.
+        """
+        return []
+
     # -- Option validation methods -------------------------------------
     # (these are very handy in writing the 'finalize_options()' method)
     #

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Make all classes new-style classes.
Message-ID: <E1OV3Yg-0002Jm-Du@dinsdale.python.org>

tarek.ziade pushed 1c2ab153640e to distutils2:

http://hg.python.org/distutils2/rev/1c2ab153640e
changeset:   235:1c2ab153640e
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Jun 26 01:43:30 2010 +0200
summary:     Make all classes new-style classes.
files:       src/distutils2/_backport/pkgutil.py, src/distutils2/_backport/tarfile.py, src/distutils2/command/cmd.py, src/distutils2/compiler/ccompiler.py, src/distutils2/compiler/msvc9compiler.py, src/distutils2/compiler/msvccompiler.py, src/distutils2/extension.py, src/distutils2/fancy_getopt.py, src/distutils2/log.py, src/distutils2/mkpkg.py, src/distutils2/tests/__init__.py

diff --git a/src/distutils2/_backport/pkgutil.py b/src/distutils2/_backport/pkgutil.py
--- a/src/distutils2/_backport/pkgutil.py
+++ b/src/distutils2/_backport/pkgutil.py
@@ -179,7 +179,7 @@
 iter_importer_modules = simplegeneric(iter_importer_modules)
 
 
-class ImpImporter:
+class ImpImporter(object):
     """:pep:`302` Importer that wraps Python's "classic" import algorithm
 
     ``ImpImporter(dirname)`` produces a :pep:`302` importer that searches that
@@ -242,7 +242,7 @@
                 yield prefix + modname, ispkg
 
 
-class ImpLoader:
+class ImpLoader(object):
     """:pep:`302` Loader that wraps Python's "classic" import algorithm """
 
     code = source = None
@@ -732,6 +732,9 @@
     def __eq__(self, other):
         return isinstance(other, Distribution) and self.path == other.path
 
+    # See http://docs.python.org/reference/datamodel#object.__hash__
+    __hash__ = object.__hash__
+
 
 class EggInfoDistribution(object):
     """Created with the *path* of the ``.egg-info`` directory or file provided
@@ -847,6 +850,9 @@
         return isinstance(other, EggInfoDistribution) and \
                self.path == other.path
 
+    # See http://docs.python.org/reference/datamodel#object.__hash__
+    __hash__ = object.__hash__
+
 
 def _normalize_dist_name(name):
     """Returns a normalized name from the given *name*.
diff --git a/src/distutils2/_backport/tarfile.py b/src/distutils2/_backport/tarfile.py
--- a/src/distutils2/_backport/tarfile.py
+++ b/src/distutils2/_backport/tarfile.py
@@ -370,7 +370,7 @@
 #---------------------------
 # internal stream interface
 #---------------------------
-class _LowLevelFile:
+class _LowLevelFile(object):
     """Low-level file object. Supports reading and writing.
        It is used instead of a regular file object for streaming
        access.
@@ -394,7 +394,7 @@
     def write(self, s):
         os.write(self.fd, s)
 
-class _Stream:
+class _Stream(object):
     """Class that serves as an adapter between TarFile and
        a stream-like object.  The stream-like object only
        needs to have a read() or write() method and is accessed
@@ -2423,7 +2423,7 @@
             print >> sys.stderr, msg
 # class TarFile
 
-class TarIter:
+class TarIter(object):
     """Iterator Class.
 
        for tarinfo in TarFile(...):
@@ -2460,7 +2460,7 @@
         return tarinfo
 
 # Helper classes for sparse file support
-class _section:
+class _section(object):
     """Base class for _data and _hole.
     """
     def __init__(self, offset, size):
@@ -2507,7 +2507,7 @@
 #---------------------------------------------
 TAR_PLAIN = 0           # zipfile.ZIP_STORED
 TAR_GZIPPED = 8         # zipfile.ZIP_DEFLATED
-class TarFileCompat:
+class TarFileCompat(object):
     """TarFile class compatible with standard module zipfile's
        ZipFile class.
     """
diff --git a/src/distutils2/command/cmd.py b/src/distutils2/command/cmd.py
--- a/src/distutils2/command/cmd.py
+++ b/src/distutils2/command/cmd.py
@@ -19,7 +19,7 @@
 except ImportError:
     from distutils2._backport.shutil import make_archive
 
-class Command:
+class Command(object):
     """Abstract base class for defining command classes, the "worker bees"
     of the Distutils.  A useful analogy for command classes is to think of
     them as subroutines with local variables called "options".  The options
diff --git a/src/distutils2/compiler/ccompiler.py b/src/distutils2/compiler/ccompiler.py
--- a/src/distutils2/compiler/ccompiler.py
+++ b/src/distutils2/compiler/ccompiler.py
@@ -76,7 +76,7 @@
 
         compiler.shared_lib_extension = so_ext
 
-class CCompiler:
+class CCompiler(object):
     """Abstract base class to define the interface that must be implemented
     by real compiler classes.  Also has some utility methods used by
     several compiler classes.
diff --git a/src/distutils2/compiler/msvc9compiler.py b/src/distutils2/compiler/msvc9compiler.py
--- a/src/distutils2/compiler/msvc9compiler.py
+++ b/src/distutils2/compiler/msvc9compiler.py
@@ -50,7 +50,7 @@
     'win-ia64' : 'ia64',
 }
 
-class Reg:
+class Reg(object):
     """Helper class to read values from the registry
     """
 
@@ -112,7 +112,7 @@
         return s
     convert_mbcs = staticmethod(convert_mbcs)
 
-class MacroExpander:
+class MacroExpander(object):
 
     def __init__(self, version):
         self.macros = {}
diff --git a/src/distutils2/compiler/msvccompiler.py b/src/distutils2/compiler/msvccompiler.py
--- a/src/distutils2/compiler/msvccompiler.py
+++ b/src/distutils2/compiler/msvccompiler.py
@@ -104,7 +104,7 @@
             pass
     return s
 
-class MacroExpander:
+class MacroExpander(object):
 
     def __init__(self, version):
         self.macros = {}
diff --git a/src/distutils2/extension.py b/src/distutils2/extension.py
--- a/src/distutils2/extension.py
+++ b/src/distutils2/extension.py
@@ -23,7 +23,7 @@
 # import that large-ish module (indirectly, through distutils.core) in
 # order to do anything.
 
-class Extension:
+class Extension(object):
     """Just a collection of attributes that describes an extension
     module and everything needed to build it (hopefully in a portable
     way, but there are hooks that let you be as unportable as you need).
diff --git a/src/distutils2/fancy_getopt.py b/src/distutils2/fancy_getopt.py
--- a/src/distutils2/fancy_getopt.py
+++ b/src/distutils2/fancy_getopt.py
@@ -30,7 +30,7 @@
 # (for use as attributes of some object).
 longopt_xlate = string.maketrans('-', '_')
 
-class FancyGetopt:
+class FancyGetopt(object):
     """Wrapper around the standard 'getopt()' module that provides some
     handy extra functionality:
       * short and long options are tied together
@@ -473,7 +473,7 @@
     return string.translate(opt, longopt_xlate)
 
 
-class OptionDummy:
+class OptionDummy(object):
     """Dummy class just used as a place to hold command-line option
     values as instance attributes."""
 
diff --git a/src/distutils2/log.py b/src/distutils2/log.py
--- a/src/distutils2/log.py
+++ b/src/distutils2/log.py
@@ -11,7 +11,7 @@
 
 import sys
 
-class Log:
+class Log(object):
 
     def __init__(self, threshold=WARN):
         self.threshold = threshold
diff --git a/src/distutils2/mkpkg.py b/src/distutils2/mkpkg.py
--- a/src/distutils2/mkpkg.py
+++ b/src/distutils2/mkpkg.py
@@ -675,7 +675,7 @@
 troveDict = buildTroveDict(troveList)
 
 
-class SetupClass:
+class SetupClass(object):
     def __init__(self):
         self.config = None
         self.classifierDict = {}
diff --git a/src/distutils2/tests/__init__.py b/src/distutils2/tests/__init__.py
--- a/src/distutils2/tests/__init__.py
+++ b/src/distutils2/tests/__init__.py
@@ -45,7 +45,7 @@
     """Test failed."""
 
 
-class BasicTestRunner:
+class BasicTestRunner(object):
     def run(self, test):
         result = unittest.TestResult()
         test(result)

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Tweak a docstring
Message-ID: <E1OV3Yg-0002Jt-F8@dinsdale.python.org>

tarek.ziade pushed 0f564dcc007a to distutils2:

http://hg.python.org/distutils2/rev/0f564dcc007a
changeset:   237:0f564dcc007a
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Jun 26 12:43:07 2010 +0200
summary:     Tweak a docstring
files:       src/distutils2/core.py

diff --git a/src/distutils2/core.py b/src/distutils2/core.py
--- a/src/distutils2/core.py
+++ b/src/distutils2/core.py
@@ -2,8 +2,9 @@
 
 The only module that needs to be imported to use the Distutils; provides
 the 'setup' function (which is to be called from the setup script).  Also
-indirectly provides the Distribution and Command classes, although they are
-really defined in distutils2.dist and distutils2.cmd.
+exports useful classes so that setup scripts can import them from here
+although they are really defined in other modules: Distribution, Command,
+PyPIRCommand, Extension.
 """
 
 __revision__ = "$Id: core.py 77704 2010-01-23 09:23:15Z tarek.ziade $"

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Fix some test classes
Message-ID: <E1OV3Yg-0002Ji-Cg@dinsdale.python.org>

tarek.ziade pushed 8c7fee19ab4d to distutils2:

http://hg.python.org/distutils2/rev/8c7fee19ab4d
changeset:   234:8c7fee19ab4d
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Jun 26 01:14:57 2010 +0200
summary:     Fix some test classes
files:       src/distutils2/_backport/tests/test_pkgutil.py, src/distutils2/tests/test_depgraph.py

diff --git a/src/distutils2/_backport/tests/test_pkgutil.py b/src/distutils2/_backport/tests/test_pkgutil.py
--- a/src/distutils2/_backport/tests/test_pkgutil.py
+++ b/src/distutils2/_backport/tests/test_pkgutil.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 """Tests for PEP 376 pkgutil functionality"""
-import unittest2
 import sys
 import os
 import csv
@@ -14,6 +13,7 @@
     from md5 import md5
 
 from test.test_support import run_unittest, TESTFN
+from distutils2.tests.support import unittest
 
 from distutils2._backport import pkgutil
 
@@ -23,13 +23,15 @@
 # TODO Add a test for absolute pathed RECORD items (e.g. /etc/myapp/config.ini)
 
 # Adapted from Python 2.7's trunk
-class TestPkgUtilData(unittest2.TestCase):
+class TestPkgUtilData(unittest.TestCase):
 
     def setUp(self):
+        super(TestPkgUtilData, self).setUp()
         self.dirname = tempfile.mkdtemp()
         sys.path.insert(0, self.dirname)
 
     def tearDown(self):
+        super(TestPkgUtilData, self).tearDown()
         del sys.path[0]
         shutil.rmtree(self.dirname)
 
@@ -91,7 +93,7 @@
         del sys.modules[pkg]
 
 # Adapted from Python 2.7's trunk
-class TestPkgUtilPEP302(unittest2.TestCase):
+class TestPkgUtilPEP302(unittest.TestCase):
 
     class MyTestLoader(object):
         def load_module(self, fullname):
@@ -113,9 +115,11 @@
             return TestPkgUtilPEP302.MyTestLoader()
 
     def setUp(self):
+        super(TestPkgUtilPEP302, self).setUp()
         sys.meta_path.insert(0, self.MyTestImporter())
 
     def tearDown(self):
+        super(TestPkgUtilPEP302, self).setUp()
         del sys.meta_path[0]
 
     def test_getdata_pep302(self):
@@ -134,10 +138,11 @@
         del sys.modules['foo']
 
 
-class TestPkgUtilDistribution(unittest2.TestCase):
+class TestPkgUtilDistribution(unittest.TestCase):
     """Tests the pkgutil.Distribution class"""
 
     def setUp(self):
+        super(TestPkgUtilDistribution, self).setUp()
         self.fake_dists_path = os.path.abspath(
             os.path.join(os.path.dirname(__file__), 'fake_dists'))
 
@@ -182,6 +187,7 @@
             self.records[distinfo_dir] = dict(record_data)
 
     def tearDown(self):
+        super(TestPkgUtilDistribution, self).setUp()
         self.records = None
         for distinfo_dir in self.distinfo_dirs:
             record_file = os.path.join(distinfo_dir, 'RECORD')
@@ -288,10 +294,11 @@
         self.assertEqual(sorted(found), sorted(distinfo_record_paths))
 
 
-class TestPkgUtilPEP376(unittest2.TestCase):
+class TestPkgUtilPEP376(unittest.TestCase):
     """Tests for the new functionality added in PEP 376."""
 
     def setUp(self):
+        super(TestPkgUtilPEP376, self).setUp()
         # Setup the path environment with our fake distributions
         current_path = os.path.abspath(os.path.dirname(__file__))
         self.sys_path = sys.path[:]
@@ -299,6 +306,7 @@
         sys.path[0:0] = [self.fake_dists_path]
 
     def tearDown(self):
+        super(TestPkgUtilPEP376, self).setUp()
         sys.path[:] = self.sys_path
 
     def test_distinfo_dirname(self):
@@ -527,8 +535,8 @@
 
 
 def test_suite():
-    suite = unittest2.TestSuite()
-    testcase_loader = unittest2.loader.defaultTestLoader.loadTestsFromTestCase
+    suite = unittest.TestSuite()
+    testcase_loader = unittest.loader.defaultTestLoader.loadTestsFromTestCase
     suite.addTest(testcase_loader(TestPkgUtilData))
     suite.addTest(testcase_loader(TestPkgUtilDistribution))
     suite.addTest(testcase_loader(TestPkgUtilPEP302))
diff --git a/src/distutils2/tests/test_depgraph.py b/src/distutils2/tests/test_depgraph.py
--- a/src/distutils2/tests/test_depgraph.py
+++ b/src/distutils2/tests/test_depgraph.py
@@ -27,7 +27,7 @@
         self.assertListEqual(sorted(l1), sorted(l2))
 
     def setUp(self):
-        super(unittest.TestCase, self).setUp()
+        super(DepGraphTestCase, self).setUp()
         path = os.path.join(os.path.dirname(__file__), '..', '_backport',
                             'tests', 'fake_dists')
         path = os.path.abspath(path)
@@ -177,7 +177,7 @@
         self.checkLists(matches, expected)
 
     def tearDown(self):
-        super(unittest.TestCase, self).tearDown()
+        super(DepGraphTestCase, self).tearDown()
         sys.path = self.sys_path
 
 def test_suite():

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Fix my hasty copy-paste
Message-ID: <E1OV3Yg-0002K2-G2@dinsdale.python.org>

tarek.ziade pushed e9f471d1a4f6 to distutils2:

http://hg.python.org/distutils2/rev/e9f471d1a4f6
changeset:   239:e9f471d1a4f6
user:        ?ric Araujo <merwok at netwok.org>
date:        Sun Jun 27 02:19:23 2010 +0200
summary:     Fix my hasty copy-paste
files:       src/distutils2/_backport/tests/test_pkgutil.py

diff --git a/src/distutils2/_backport/tests/test_pkgutil.py b/src/distutils2/_backport/tests/test_pkgutil.py
--- a/src/distutils2/_backport/tests/test_pkgutil.py
+++ b/src/distutils2/_backport/tests/test_pkgutil.py
@@ -119,8 +119,8 @@
         sys.meta_path.insert(0, self.MyTestImporter())
 
     def tearDown(self):
-        super(TestPkgUtilPEP302, self).setUp()
         del sys.meta_path[0]
+        super(TestPkgUtilPEP302, self).tearDown()
 
     def test_getdata_pep302(self):
         # Use a dummy importer/loader
@@ -187,11 +187,11 @@
             self.records[distinfo_dir] = dict(record_data)
 
     def tearDown(self):
-        super(TestPkgUtilDistribution, self).setUp()
         self.records = None
         for distinfo_dir in self.distinfo_dirs:
             record_file = os.path.join(distinfo_dir, 'RECORD')
             open(record_file, 'w').close()
+        super(TestPkgUtilDistribution, self).tearDown()
 
     def test_instantiation(self):
         """Test the Distribution class's instantiation provides us with usable
@@ -306,8 +306,8 @@
         sys.path[0:0] = [self.fake_dists_path]
 
     def tearDown(self):
-        super(TestPkgUtilPEP376, self).setUp()
         sys.path[:] = self.sys_path
+        super(TestPkgUtilPEP376, self).tearDown()
 
     def test_distinfo_dirname(self):
         """Given a name and a version, we expect the distinfo_dirname function

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Rename yet another ?distutils?
Message-ID: <E1OV3Yg-0002K9-Gq@dinsdale.python.org>

tarek.ziade pushed f2be51417dad to distutils2:

http://hg.python.org/distutils2/rev/f2be51417dad
changeset:   241:f2be51417dad
user:        ?ric Araujo <merwok at netwok.org>
date:        Sun Jun 27 02:22:14 2010 +0200
summary:     Rename yet another ?distutils?
files:       src/distutils2/util.py

diff --git a/src/distutils2/util.py b/src/distutils2/util.py
--- a/src/distutils2/util.py
+++ b/src/distutils2/util.py
@@ -363,7 +363,7 @@
                 script = open(script_name, "w")
 
             script.write("""\
-from distutils.util import byte_compile
+from distutils2.util import byte_compile
 files = [
 """)
 

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Remove costly shortcut in __init__
	and improve the	docstring
Message-ID: <E1OV3Yg-0002Jx-FW@dinsdale.python.org>

tarek.ziade pushed 80d665209636 to distutils2:

http://hg.python.org/distutils2/rev/80d665209636
changeset:   238:80d665209636
user:        ?ric Araujo <merwok at netwok.org>
date:        Sun Jun 27 02:15:52 2010 +0200
summary:     Remove costly shortcut in __init__ and improve the docstring
files:       src/distutils2/__init__.py

diff --git a/src/distutils2/__init__.py b/src/distutils2/__init__.py
--- a/src/distutils2/__init__.py
+++ b/src/distutils2/__init__.py
@@ -1,16 +1,20 @@
 """distutils
 
-The main package for the Python Module Distribution Utilities.  Normally
-used from a setup script as
+The main package for the Python Distribution Utilities 2.  Setup
+scripts should import the setup function from distutils2.core:
 
-   from distutils.core import setup
+    from distutils2.core import setup
 
-   setup (...)
+    setup(name=..., version=..., ...)
+
+Third-party tools can use parts of Distutils2 as building blocks
+without causing the other modules to be imported:
+
+    import distutils2.version
+    import distutils2.pypi.simple
+    import distutils2.tests.pypi_server
 """
-__all__ = ['__version__', 'setup']
+__all__ = ['__version__']
 
 __revision__ = "$Id: __init__.py 78020 2010-02-06 16:37:32Z benjamin.peterson $"
 __version__ = "1.0a2"
-
-from distutils2.core import setup
-

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Make unittest2 import error go to
	stderr again (2.4 to	3.x-compatible)
Message-ID: <E1OV3Yg-0002Kf-Le@dinsdale.python.org>

tarek.ziade pushed 216e2cb8d125 to distutils2:

http://hg.python.org/distutils2/rev/216e2cb8d125
changeset:   248:216e2cb8d125
user:        ?ric Araujo <merwok at netwok.org>
date:        Wed Jun 30 18:47:33 2010 +0200
summary:     Make unittest2 import error go to stderr again (2.4 to 3.x-compatible)
files:       src/runtests.py

diff --git a/src/runtests.py b/src/runtests.py
--- a/src/runtests.py
+++ b/src/runtests.py
@@ -28,7 +28,7 @@
     try:
         from distutils2.tests.support import unittest
     except ImportError:
-        print('Error: You have to install unittest2')
+        sys.stderr.write('Error: You have to install unittest2')
         sys.exit(1)
 
     sys.exit(test_main())

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Catch logging output in test_metadata
Message-ID: <E1OV3Yg-0002KY-Kk@dinsdale.python.org>

tarek.ziade pushed d0e993b9e892 to distutils2:

http://hg.python.org/distutils2/rev/d0e993b9e892
changeset:   246:d0e993b9e892
user:        ?ric Araujo <merwok at netwok.org>
date:        Wed Jun 30 18:14:57 2010 +0200
summary:     Catch logging output in test_metadata
files:       src/distutils2/tests/test_metadata.py

diff --git a/src/distutils2/tests/test_metadata.py b/src/distutils2/tests/test_metadata.py
--- a/src/distutils2/tests/test_metadata.py
+++ b/src/distutils2/tests/test_metadata.py
@@ -5,9 +5,9 @@
 
 from distutils2.metadata import (DistributionMetadata, _interpret,
                                  PKG_INFO_PREFERRED_VERSION)
-from distutils2.tests.support import unittest
+from distutils2.tests.support import unittest, LoggingSilencer
 
-class DistributionMetadataTestCase(unittest.TestCase):
+class DistributionMetadataTestCase(LoggingSilencer, unittest.TestCase):
 
 
     def test_interpret(self):

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: s/klass/cls/g for PEP 8 and PEP 20
	compliance
Message-ID: <E1OV3Yg-0002Jq-Ee@dinsdale.python.org>

tarek.ziade pushed b1766b6037b9 to distutils2:

http://hg.python.org/distutils2/rev/b1766b6037b9
changeset:   236:b1766b6037b9
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Jun 26 12:37:06 2010 +0200
summary:     s/klass/cls/g for PEP 8 and PEP 20 compliance
files:       src/distutils2/compiler/ccompiler.py, src/distutils2/core.py, src/distutils2/dist.py, src/distutils2/tests/test_dist.py

diff --git a/src/distutils2/compiler/ccompiler.py b/src/distutils2/compiler/ccompiler.py
--- a/src/distutils2/compiler/ccompiler.py
+++ b/src/distutils2/compiler/ccompiler.py
@@ -1048,7 +1048,7 @@
         module_name = "distutils2.compiler." + module_name
         __import__ (module_name)
         module = sys.modules[module_name]
-        klass = vars(module)[class_name]
+        cls = vars(module)[class_name]
     except ImportError:
         raise DistutilsModuleError, \
               "can't compile C/C++ code: unable to load module '%s'" % \
@@ -1061,7 +1061,7 @@
     # XXX The None is necessary to preserve backwards compatibility
     # with classes that expect verbose to be the first positional
     # argument.
-    return klass(None, dry_run, force)
+    return cls(None, dry_run, force)
 
 
 def gen_preprocess_options(macros, include_dirs):
diff --git a/src/distutils2/core.py b/src/distutils2/core.py
--- a/src/distutils2/core.py
+++ b/src/distutils2/core.py
@@ -94,11 +94,7 @@
 
     # Determine the distribution class -- either caller-supplied or
     # our Distribution (see below).
-    klass = attrs.get('distclass')
-    if klass:
-        del attrs['distclass']
-    else:
-        klass = Distribution
+    distclass = attrs.pop('distclass', Distribution)
 
     if 'script_name' not in attrs:
         attrs['script_name'] = os.path.basename(sys.argv[0])
@@ -108,7 +104,7 @@
     # Create the Distribution instance, using the remaining arguments
     # (ie. everything except distclass) to initialize it
     try:
-        _setup_distribution = dist = klass(attrs)
+        _setup_distribution = dist = distclass(attrs)
     except DistutilsSetupError, msg:
         if 'name' in attrs:
             raise SystemExit, "error in %s setup command: %s" % \
diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -627,16 +627,16 @@
 
         for command in self.commands:
             if isinstance(command, type) and issubclass(command, Command):
-                klass = command
+                cls = command
             else:
-                klass = self.get_command_class(command)
-            if (hasattr(klass, 'help_options') and
-                isinstance(klass.help_options, list)):
-                parser.set_option_table(klass.user_options +
-                                        fix_help_options(klass.help_options))
+                cls = self.get_command_class(command)
+            if (hasattr(cls, 'help_options') and
+                isinstance(cls.help_options, list)):
+                parser.set_option_table(cls.user_options +
+                                        fix_help_options(cls.help_options))
             else:
-                parser.set_option_table(klass.user_options)
-            parser.print_help("Options for '%s' command:" % klass.__name__)
+                parser.set_option_table(cls.user_options)
+            parser.print_help("Options for '%s' command:" % cls.__name__)
             print('')
 
         print(gen_usage(self.script_name))
@@ -688,11 +688,11 @@
         print(header + ":")
 
         for cmd in commands:
-            klass = self.cmdclass.get(cmd)
-            if not klass:
-                klass = self.get_command_class(cmd)
+            cls = self.cmdclass.get(cmd)
+            if not cls:
+                cls = self.get_command_class(cmd)
             try:
-                description = klass.description
+                description = cls.description
             except AttributeError:
                 description = "(no description available)"
 
@@ -754,11 +754,11 @@
 
         rv = []
         for cmd in (std_commands + extra_commands):
-            klass = self.cmdclass.get(cmd)
-            if not klass:
-                klass = self.get_command_class(cmd)
+            cls = self.cmdclass.get(cmd)
+            if not cls:
+                cls = self.get_command_class(cmd)
             try:
-                description = klass.description
+                description = cls.description
             except AttributeError:
                 description = "(no description available)"
             rv.append((cmd, description))
@@ -790,13 +790,13 @@
         Raises DistutilsModuleError if the expected module could not be
         found, or if that module does not define the expected class.
         """
-        klass = self.cmdclass.get(command)
-        if klass:
-            return klass
+        cls = self.cmdclass.get(command)
+        if cls:
+            return cls
 
         for pkgname in self.get_command_packages():
             module_name = "%s.%s" % (pkgname, command)
-            klass_name = command
+            class_name = command
 
             try:
                 __import__ (module_name)
@@ -805,14 +805,14 @@
                 continue
 
             try:
-                klass = getattr(module, klass_name)
+                cls = getattr(module, class_name)
             except AttributeError:
                 raise DistutilsModuleError, \
                       "invalid command '%s' (no class '%s' in module '%s')" \
-                      % (command, klass_name, module_name)
+                      % (command, class_name, module_name)
 
-            self.cmdclass[command] = klass
-            return klass
+            self.cmdclass[command] = cls
+            return cls
 
         raise DistutilsModuleError("invalid command '%s'" % command)
 
@@ -828,8 +828,8 @@
             log.debug("Distribution.get_command_obj(): " \
                       "creating '%s' command object" % command)
 
-            klass = self.get_command_class(command)
-            cmd_obj = self.command_obj[command] = klass(self)
+            cls = self.get_command_class(command)
+            cmd_obj = self.command_obj[command] = cls(self)
             self.have_run[command] = 0
 
             # Set any options that were supplied in config files
diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py
--- a/src/distutils2/tests/test_dist.py
+++ b/src/distutils2/tests/test_dist.py
@@ -129,13 +129,13 @@
         # Check DistributionMetadata handling of Unicode fields
         tmp_dir = self.mkdtemp()
         my_file = os.path.join(tmp_dir, 'f')
-        klass = Distribution
+        cls = Distribution
 
-        dist = klass(attrs={'author': u'Mister Caf??',
-                            'name': 'my.package',
-                            'maintainer': u'Caf?? Junior',
-                            'summary': u'Caf?? torr??fi??',
-                            'description': u'H??h??h??'})
+        dist = cls(attrs={'author': u'Mister Caf??',
+                          'name': 'my.package',
+                          'maintainer': u'Caf?? Junior',
+                          'summary': u'Caf?? torr??fi??',
+                          'description': u'H??h??h??'})
 
 
         # let's make sure the file can be written
@@ -144,11 +144,11 @@
         dist.metadata.write_file(open(my_file, 'w'))
 
         # regular ascii is of course always usable
-        dist = klass(attrs={'author': 'Mister Cafe',
-                            'name': 'my.package',
-                            'maintainer': 'Cafe Junior',
-                            'summary': 'Cafe torrefie',
-                            'description': 'Hehehe'})
+        dist = cls(attrs={'author': 'Mister Cafe',
+                          'name': 'my.package',
+                          'maintainer': 'Cafe Junior',
+                          'summary': 'Cafe torrefie',
+                          'description': 'Hehehe'})
 
         my_file2 = os.path.join(tmp_dir, 'f2')
         dist.metadata.write_file(open(my_file, 'w'))
@@ -156,7 +156,7 @@
     def test_empty_options(self):
         # an empty options dictionary should not stay in the
         # list of attributes
-        klass = Distribution
+        cls = Distribution
 
         # catching warnings
         warns = []
@@ -166,11 +166,11 @@
         old_warn = warnings.warn
         warnings.warn = _warn
         try:
-            dist = klass(attrs={'author': 'xxx',
-                                'name': 'xxx',
-                                'version': 'xxx',
-                                'url': 'xxxx',
-                                'options': {}})
+            dist = cls(attrs={'author': 'xxx',
+                              'name': 'xxx',
+                              'version': 'xxx',
+                              'url': 'xxxx',
+                              'options': {}})
         finally:
             warnings.warn = old_warn
 

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Remove some pre-2.4 compatibility code
Message-ID: <E1OV3Yg-0002KH-IF@dinsdale.python.org>

tarek.ziade pushed ca50d669c9f4 to distutils2:

http://hg.python.org/distutils2/rev/ca50d669c9f4
changeset:   243:ca50d669c9f4
user:        ?ric Araujo <merwok at netwok.org>
date:        Sun Jun 27 02:28:37 2010 +0200
summary:     Remove some pre-2.4 compatibility code
files:       src/distutils2/util.py

diff --git a/src/distutils2/util.py b/src/distutils2/util.py
--- a/src/distutils2/util.py
+++ b/src/distutils2/util.py
@@ -349,12 +349,8 @@
     # "Indirect" byte-compilation: write a temporary script and then
     # run it with the appropriate flags.
     if not direct:
-        try:
-            from tempfile import mkstemp
-            (script_fd, script_name) = mkstemp(".py")
-        except ImportError:
-            from tempfile import mktemp
-            (script_fd, script_name) = None, mktemp(".py")
+        from tempfile import mkstemp
+        script_fd, script_name = mkstemp(".py")
         log.info("writing byte-compilation script '%s'", script_name)
         if not dry_run:
             if script_fd is not None:

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Add shortcut to util.find_packages in
	core
Message-ID: <E1OV3Yg-0002K6-GQ@dinsdale.python.org>

tarek.ziade pushed d235a3dcb404 to distutils2:

http://hg.python.org/distutils2/rev/d235a3dcb404
changeset:   240:d235a3dcb404
user:        ?ric Araujo <merwok at netwok.org>
date:        Sun Jun 27 02:20:58 2010 +0200
summary:     Add shortcut to util.find_packages in core
files:       src/distutils2/core.py

diff --git a/src/distutils2/core.py b/src/distutils2/core.py
--- a/src/distutils2/core.py
+++ b/src/distutils2/core.py
@@ -4,7 +4,7 @@
 the 'setup' function (which is to be called from the setup script).  Also
 exports useful classes so that setup scripts can import them from here
 although they are really defined in other modules: Distribution, Command,
-PyPIRCommand, Extension.
+PyPIRCommand, Extension, find_packages.
 """
 
 __revision__ = "$Id: core.py 77704 2010-01-23 09:23:15Z tarek.ziade $"
@@ -21,6 +21,7 @@
 from distutils2.command.cmd import Command
 from distutils2.config import PyPIRCCommand
 from distutils2.extension import Extension
+from distutils2.util import find_packages
 
 # This is a barebones help message generated displayed when the user
 # runs the setup script with no arguments at all.  More useful help

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Fix one indented line and add a
	marker for later grepping
Message-ID: <E1OV3Yg-0002Kj-MC@dinsdale.python.org>

tarek.ziade pushed c64e0613ed52 to distutils2:

http://hg.python.org/distutils2/rev/c64e0613ed52
changeset:   249:c64e0613ed52
user:        ?ric Araujo <merwok at netwok.org>
date:        Wed Jun 30 18:50:53 2010 +0200
summary:     Fix one indented line and add a marker for later grepping
files:       src/runtests.py

diff --git a/src/runtests.py b/src/runtests.py
--- a/src/runtests.py
+++ b/src/runtests.py
@@ -8,8 +8,7 @@
     import distutils2.tests
     from distutils2.tests import run_unittest, reap_children, TestFailed
     from distutils2._backport.tests import test_suite as btest_suite
-    # just supporting -q right now
-    # to enable detailed/quiet output
+    # XXX just supporting -q right now to enable detailed/quiet output
     if len(sys.argv) > 1:
         verbose = sys.argv[-1] != '-q'
     else:
@@ -17,7 +16,7 @@
     try:
         try:
             run_unittest([distutils2.tests.test_suite(), btest_suite()],
-                    verbose_=verbose)
+                         verbose_=verbose)
             return 0
         except TestFailed:
             return 1

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Wrap I/O operations in try/except
	blocks to ensure	handles are closed
Message-ID: <E1OV3Yg-0002KO-Jf@dinsdale.python.org>

tarek.ziade pushed c61f4eff8a25 to distutils2:

http://hg.python.org/distutils2/rev/c61f4eff8a25
changeset:   244:c61f4eff8a25
user:        ?ric Araujo <merwok at netwok.org>
date:        Sun Jun 27 02:42:50 2010 +0200
summary:     Wrap I/O operations in try/except blocks to ensure handles are closed
files:       src/distutils2/_backport/sysconfig.py, src/distutils2/_backport/tarfile.py, src/distutils2/_backport/tests/test_pkgutil.py, src/distutils2/compiler/ccompiler.py, src/distutils2/compiler/emxccompiler.py, src/distutils2/mkpkg.py, src/distutils2/tests/test_build_py.py, src/distutils2/tests/test_build_scripts.py, src/distutils2/tests/test_dist.py, src/distutils2/tests/test_install_scripts.py, src/distutils2/tests/test_metadata.py, src/distutils2/tests/test_msvc9compiler.py, src/distutils2/util.py

diff --git a/src/distutils2/_backport/sysconfig.py b/src/distutils2/_backport/sysconfig.py
--- a/src/distutils2/_backport/sysconfig.py
+++ b/src/distutils2/_backport/sysconfig.py
@@ -580,10 +580,11 @@
                 # behaviour.
                 pass
             else:
-                m = re.search(
-                        r'<key>ProductUserVisibleVersion</key>\s*' +
-                        r'<string>(.*?)</string>', f.read())
-                f.close()
+                try:
+                    m = re.search(r'<key>ProductUserVisibleVersion</key>\s*'
+                                  r'<string>(.*?)</string>', f.read())
+                finally:
+                    f.close()
                 if m is not None:
                     macrelease = '.'.join(m.group(1).split('.')[:2])
                 # else: fall back to the default behaviour
diff --git a/src/distutils2/_backport/tarfile.py b/src/distutils2/_backport/tarfile.py
--- a/src/distutils2/_backport/tarfile.py
+++ b/src/distutils2/_backport/tarfile.py
@@ -2003,8 +2003,10 @@
         # Append the tar header and data to the archive.
         if tarinfo.isreg():
             f = bltn_open(name, "rb")
-            self.addfile(tarinfo, f)
-            f.close()
+            try:
+                self.addfile(tarinfo, f)
+            finally:
+                f.close()
 
         elif tarinfo.isdir():
             self.addfile(tarinfo)
@@ -2214,9 +2216,11 @@
         """
         source = self.extractfile(tarinfo)
         target = bltn_open(targetpath, "wb")
-        copyfileobj(source, target)
-        source.close()
-        target.close()
+        try:
+            copyfileobj(source, target)
+        finally:
+            source.close()
+            target.close()
 
     def makeunknown(self, tarinfo, targetpath):
         """Make a file from a TarInfo object with an unknown type
@@ -2564,8 +2568,10 @@
        are able to handle, else return False.
     """
     try:
-        t = open(name)
-        t.close()
+        try:
+            t = open(name)
+        finally:
+            t.close()
         return True
     except TarError:
         return False
diff --git a/src/distutils2/_backport/tests/test_pkgutil.py b/src/distutils2/_backport/tests/test_pkgutil.py
--- a/src/distutils2/_backport/tests/test_pkgutil.py
+++ b/src/distutils2/_backport/tests/test_pkgutil.py
@@ -46,15 +46,22 @@
         os.mkdir(package_dir)
         # Empty init.py
         f = open(os.path.join(package_dir, '__init__.py'), "wb")
-        f.close()
+        try:
+            pass
+        finally:
+            f.close()
         # Resource files, res.txt, sub/res.txt
         f = open(os.path.join(package_dir, 'res.txt'), "wb")
-        f.write(RESOURCE_DATA)
-        f.close()
+        try:
+            f.write(RESOURCE_DATA)
+        finally:
+            f.close()
         os.mkdir(os.path.join(package_dir, 'sub'))
         f = open(os.path.join(package_dir, 'sub', 'res.txt'), "wb")
-        f.write(RESOURCE_DATA)
-        f.close()
+        try:
+            f.write(RESOURCE_DATA)
+        finally:
+            f.close()
 
         # Check we can read the resources
         res1 = pkgutil.get_data(pkg, 'res.txt')
@@ -74,13 +81,14 @@
         # Make a package with some resources
         zip_file = os.path.join(self.dirname, zip)
         z = zipfile.ZipFile(zip_file, 'w')
-
-        # Empty init.py
-        z.writestr(pkg + '/__init__.py', "")
-        # Resource files, res.txt, sub/res.txt
-        z.writestr(pkg + '/res.txt', RESOURCE_DATA)
-        z.writestr(pkg + '/sub/res.txt', RESOURCE_DATA)
-        z.close()
+        try:
+            # Empty init.py
+            z.writestr(pkg + '/__init__.py', "")
+            # Resource files, res.txt, sub/res.txt
+            z.writestr(pkg + '/res.txt', RESOURCE_DATA)
+            z.writestr(pkg + '/sub/res.txt', RESOURCE_DATA)
+        finally:
+            z.close()
 
         # Check we can read the resources
         sys.path.insert(0, zip_file)
diff --git a/src/distutils2/compiler/ccompiler.py b/src/distutils2/compiler/ccompiler.py
--- a/src/distutils2/compiler/ccompiler.py
+++ b/src/distutils2/compiler/ccompiler.py
@@ -800,14 +800,16 @@
             library_dirs = []
         fd, fname = tempfile.mkstemp(".c", funcname, text=True)
         f = os.fdopen(fd, "w")
-        for incl in includes:
-            f.write("""#include "%s"\n""" % incl)
-        f.write("""\
+        try:
+            for incl in includes:
+                f.write("""#include "%s"\n""" % incl)
+            f.write("""\
 main (int argc, char **argv) {
     %s();
 }
 """ % funcname)
-        f.close()
+        finally:
+            f.close()
         try:
             objects = self.compile([fname], include_dirs=include_dirs)
         except CompileError:
diff --git a/src/distutils2/compiler/emxccompiler.py b/src/distutils2/compiler/emxccompiler.py
--- a/src/distutils2/compiler/emxccompiler.py
+++ b/src/distutils2/compiler/emxccompiler.py
@@ -272,8 +272,10 @@
         # It would probably better to read single lines to search.
         # But we do this only once, and it is fast enough
         f = open(fn)
-        s = f.read()
-        f.close()
+        try:
+            s = f.read()
+        finally:
+            f.close()
 
     except IOError, exc:
         # if we can't read this file, we cannot say it is wrong
diff --git a/src/distutils2/mkpkg.py b/src/distutils2/mkpkg.py
--- a/src/distutils2/mkpkg.py
+++ b/src/distutils2/mkpkg.py
@@ -717,14 +717,16 @@
 
     def inspectFile(self, path):
         fp = open(path, 'r')
-        for line in [ fp.readline() for x in range(10) ]:
-            m = re.match(r'^#!.*python((?P<major>\d)(\.\d+)?)?$', line)
-            if m:
-                if m.group('major') == '3':
-                    self.classifierDict['Programming Language :: Python :: 3'] = 1
-                else:
-                    self.classifierDict['Programming Language :: Python :: 2'] = 1
-        fp.close()
+        try:
+            for line in [ fp.readline() for x in range(10) ]:
+                m = re.match(r'^#!.*python((?P<major>\d)(\.\d+)?)?$', line)
+                if m:
+                    if m.group('major') == '3':
+                        self.classifierDict['Programming Language :: Python :: 3'] = 1
+                    else:
+                        self.classifierDict['Programming Language :: Python :: 2'] = 1
+        finally:
+            fp.close()
 
 
     def inspectDirectory(self):
@@ -885,38 +887,33 @@
         if os.path.exists('setup.py'): shutil.move('setup.py', 'setup.py.old')
 
         fp = open('setup.py', 'w')
-        fp.write('#!/usr/bin/env python\n\n')
-        fp.write('from distutils2.core import setup\n\n')
+        try:
+            fp.write('#!/usr/bin/env python\n\n')
+            fp.write('from distutils2.core import setup\n\n')
+            fp.write('setup(name=%s,\n' % repr(self.setupData['name']))
+            fp.write('      version=%s,\n' % repr(self.setupData['version']))
+            fp.write('      description=%s,\n'
+                    % repr(self.setupData['description']))
+            fp.write('      author=%s,\n' % repr(self.setupData['author']))
+            fp.write('      author_email=%s,\n'
+                    % repr(self.setupData['author_email']))
+            if self.setupData['url']:
+                fp.write('      url=%s,\n' % repr(self.setupData['url']))
+            if self.setupData['classifier']:
+                fp.write('      classifier=[\n')
+                for classifier in sorted(self.setupData['classifier'].keys()):
+                    fp.write('            %s,\n' % repr(classifier))
+                fp.write('         ],\n')
+            if self.setupData['packages']:
+                fp.write('      packages=%s,\n'
+                        % repr(self._dotted_packages(self.setupData['packages'])))
+                fp.write('      package_dir=%s,\n'
+                        % repr(self.setupData['packages']))
+            fp.write('      #scripts=[\'path/to/script\']\n')
 
-        fp.write('from sys import version\n')
-        fp.write('if version < \'2.2.3\':\n')
-        fp.write('    from distutils2.dist import DistributionMetadata\n')
-        fp.write('    DistributionMetadata.classifier = None\n')
-        fp.write('    DistributionMetadata.download_url = None\n')
-
-        fp.write('setup(name = %s,\n' % repr(self.setupData['name']))
-        fp.write('        version = %s,\n' % repr(self.setupData['version']))
-        fp.write('        description = %s,\n'
-                % repr(self.setupData['description']))
-        fp.write('        author = %s,\n' % repr(self.setupData['author']))
-        fp.write('        author_email = %s,\n'
-                % repr(self.setupData['author_email']))
-        if self.setupData['url']:
-            fp.write('        url = %s,\n' % repr(self.setupData['url']))
-        if self.setupData['classifier']:
-            fp.write('        classifier = [\n')
-            for classifier in sorted(self.setupData['classifier'].keys()):
-                fp.write('              %s,\n' % repr(classifier))
-            fp.write('           ],\n')
-        if self.setupData['packages']:
-            fp.write('        packages = %s,\n'
-                    % repr(self._dotted_packages(self.setupData['packages'])))
-            fp.write('        package_dir = %s,\n'
-                    % repr(self.setupData['packages']))
-        fp.write('        #scripts = [\'path/to/script\']\n')
-
-        fp.write('        )\n')
-        fp.close()
+            fp.write('      )\n')
+        finally:
+            fp.close()
         os.chmod('setup.py', 0755)
 
         print 'Wrote "setup.py".'
diff --git a/src/distutils2/tests/test_build_py.py b/src/distutils2/tests/test_build_py.py
--- a/src/distutils2/tests/test_build_py.py
+++ b/src/distutils2/tests/test_build_py.py
@@ -19,11 +19,15 @@
     def test_package_data(self):
         sources = self.mkdtemp()
         f = open(os.path.join(sources, "__init__.py"), "w")
-        f.write("# Pretend this is a package.")
-        f.close()
+        try:
+            f.write("# Pretend this is a package.")
+        finally:
+            f.close()
         f = open(os.path.join(sources, "README.txt"), "w")
-        f.write("Info about this package")
-        f.close()
+        try:
+            f.write("Info about this package")
+        finally:
+            f.close()
 
         destination = self.mkdtemp()
 
diff --git a/src/distutils2/tests/test_build_scripts.py b/src/distutils2/tests/test_build_scripts.py
--- a/src/distutils2/tests/test_build_scripts.py
+++ b/src/distutils2/tests/test_build_scripts.py
@@ -74,8 +74,10 @@
 
     def write_script(self, dir, name, text):
         f = open(os.path.join(dir, name), "w")
-        f.write(text)
-        f.close()
+        try:
+            f.write(text)
+        finally:
+            f.close()
 
     def test_version_int(self):
         source = self.mkdtemp()
diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py
--- a/src/distutils2/tests/test_dist.py
+++ b/src/distutils2/tests/test_dist.py
@@ -340,8 +340,10 @@
         temp_dir = self.mkdtemp()
         user_filename = os.path.join(temp_dir, user_filename)
         f = open(user_filename, 'w')
-        f.write('.')
-        f.close()
+        try:
+            f.write('.')
+        finally:
+            f.close()
 
         try:
             dist = Distribution()
diff --git a/src/distutils2/tests/test_install_scripts.py b/src/distutils2/tests/test_install_scripts.py
--- a/src/distutils2/tests/test_install_scripts.py
+++ b/src/distutils2/tests/test_install_scripts.py
@@ -42,8 +42,10 @@
         def write_script(name, text):
             expected.append(name)
             f = open(os.path.join(source, name), "w")
-            f.write(text)
-            f.close()
+            try:
+                f.write(text)
+            finally:
+                f.close()
 
         write_script("script1.py", ("#! /usr/bin/env python2.3\n"
                                     "# bogus script w/ Python sh-bang\n"
diff --git a/src/distutils2/tests/test_metadata.py b/src/distutils2/tests/test_metadata.py
--- a/src/distutils2/tests/test_metadata.py
+++ b/src/distutils2/tests/test_metadata.py
@@ -64,9 +64,12 @@
         res.seek(0)
         res = res.read()
         f = open(PKG_INFO)
-        wanted = f.read()
+        try:
+            # XXX this is not used
+            wanted = f.read()
+        finally:
+            f.close()
         self.assertTrue('Keywords: keyring,password,crypt' in res)
-        f.close()
 
     def test_metadata_markers(self):
         # see if we can be platform-aware
diff --git a/src/distutils2/tests/test_msvc9compiler.py b/src/distutils2/tests/test_msvc9compiler.py
--- a/src/distutils2/tests/test_msvc9compiler.py
+++ b/src/distutils2/tests/test_msvc9compiler.py
@@ -116,17 +116,21 @@
         tempdir = self.mkdtemp()
         manifest = os.path.join(tempdir, 'manifest')
         f = open(manifest, 'w')
-        f.write(_MANIFEST)
-        f.close()
+        try:
+            f.write(_MANIFEST)
+        finally:
+            f.close()
 
         compiler = MSVCCompiler()
         compiler._remove_visual_c_ref(manifest)
 
         # see what we got
         f = open(manifest)
-        # removing trailing spaces
-        content = '\n'.join([line.rstrip() for line in f.readlines()])
-        f.close()
+        try:
+            # removing trailing spaces
+            content = '\n'.join([line.rstrip() for line in f.readlines()])
+        finally:
+            f.close()
 
         # makes sure the manifest was properly cleaned
         self.assertEqual(content, _CLEANED_MANIFEST)
diff --git a/src/distutils2/util.py b/src/distutils2/util.py
--- a/src/distutils2/util.py
+++ b/src/distutils2/util.py
@@ -358,34 +358,36 @@
             else:
                 script = open(script_name, "w")
 
-            script.write("""\
+            try:
+                script.write("""\
 from distutils2.util import byte_compile
 files = [
 """)
 
-            # XXX would be nice to write absolute filenames, just for
-            # safety's sake (script should be more robust in the face of
-            # chdir'ing before running it).  But this requires abspath'ing
-            # 'prefix' as well, and that breaks the hack in build_lib's
-            # 'byte_compile()' method that carefully tacks on a trailing
-            # slash (os.sep really) to make sure the prefix here is "just
-            # right".  This whole prefix business is rather delicate -- the
-            # problem is that it's really a directory, but I'm treating it
-            # as a dumb string, so trailing slashes and so forth matter.
+                # XXX would be nice to write absolute filenames, just for
+                # safety's sake (script should be more robust in the face of
+                # chdir'ing before running it).  But this requires abspath'ing
+                # 'prefix' as well, and that breaks the hack in build_lib's
+                # 'byte_compile()' method that carefully tacks on a trailing
+                # slash (os.sep really) to make sure the prefix here is "just
+                # right".  This whole prefix business is rather delicate -- the
+                # problem is that it's really a directory, but I'm treating it
+                # as a dumb string, so trailing slashes and so forth matter.
 
-            #py_files = map(os.path.abspath, py_files)
-            #if prefix:
-            #    prefix = os.path.abspath(prefix)
+                #py_files = map(os.path.abspath, py_files)
+                #if prefix:
+                #    prefix = os.path.abspath(prefix)
 
-            script.write(",\n".join(map(repr, py_files)) + "]\n")
-            script.write("""
+                script.write(",\n".join(map(repr, py_files)) + "]\n")
+                script.write("""
 byte_compile(files, optimize=%r, force=%r,
              prefix=%r, base_dir=%r,
              verbose=%r, dry_run=0,
              direct=1)
 """ % (optimize, force, prefix, base_dir, verbose))
 
-            script.close()
+            finally:
+                script.close()
 
         cmd = [sys.executable, script_name]
         if optimize == 1:
@@ -534,10 +536,12 @@
     """Create a file with the specified name and write 'contents' (a
     sequence of strings without line terminators) to it.
     """
-    f = open(filename, "w")
-    for line in contents:
-        f.write(line + "\n")
-    f.close()
+    try:
+        f = open(filename, "w")
+        for line in contents:
+            f.write(line + "\n")
+    finally:
+        f.close()
 
 def _is_package(path):
     """Returns True if path is a package (a dir with an __init__ file."""

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Allow importing
	distutils2.test.support without loading a	ton of modules
Message-ID: <E1OV3Yg-0002Kb-LD@dinsdale.python.org>

tarek.ziade pushed 5886d4219749 to distutils2:

http://hg.python.org/distutils2/rev/5886d4219749
changeset:   247:5886d4219749
user:        ?ric Araujo <merwok at netwok.org>
date:        Wed Jun 30 18:28:17 2010 +0200
summary:     Allow importing distutils2.test.support without loading a ton of modules
files:       src/distutils2/tests/support.py

diff --git a/src/distutils2/tests/support.py b/src/distutils2/tests/support.py
--- a/src/distutils2/tests/support.py
+++ b/src/distutils2/tests/support.py
@@ -14,7 +14,6 @@
 
 from distutils2 import log
 from distutils2.log import DEBUG, INFO, WARN, ERROR, FATAL
-from distutils2.core import Distribution
 
 if sys.version_info >= (2, 7):
     # improved unittest package from 2.7's standard library
@@ -105,6 +104,7 @@
         It returns the package directory and the distribution
         instance.
         """
+        from distutils2.dist import Distribution
         tmp_dir = self.mkdtemp()
         pkg_dir = os.path.join(tmp_dir, pkg_name)
         os.mkdir(pkg_dir)

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Improve imports indentation
Message-ID: <E1OV3Yg-0002KE-Hm@dinsdale.python.org>

tarek.ziade pushed aae4336cb757 to distutils2:

http://hg.python.org/distutils2/rev/aae4336cb757
changeset:   242:aae4336cb757
user:        ?ric Araujo <merwok at netwok.org>
date:        Sun Jun 27 02:26:57 2010 +0200
summary:     Improve imports indentation
files:       src/distutils2/command/sdist.py, src/distutils2/compiler/bcppcompiler.py, src/distutils2/compiler/ccompiler.py, src/distutils2/compiler/emxccompiler.py, src/distutils2/compiler/msvc9compiler.py, src/distutils2/compiler/msvccompiler.py, src/distutils2/compiler/unixccompiler.py, src/distutils2/core.py, src/distutils2/dist.py

diff --git a/src/distutils2/command/sdist.py b/src/distutils2/command/sdist.py
--- a/src/distutils2/command/sdist.py
+++ b/src/distutils2/command/sdist.py
@@ -20,7 +20,7 @@
 from distutils2.core import Command
 from distutils2 import util
 from distutils2.errors import (DistutilsPlatformError, DistutilsOptionError,
-                              DistutilsTemplateError)
+                               DistutilsTemplateError)
 from distutils2.manifest import Manifest
 from distutils2 import log
 from distutils2.util import convert_path, newer
diff --git a/src/distutils2/compiler/bcppcompiler.py b/src/distutils2/compiler/bcppcompiler.py
--- a/src/distutils2/compiler/bcppcompiler.py
+++ b/src/distutils2/compiler/bcppcompiler.py
@@ -16,7 +16,7 @@
 import os
 
 from distutils2.errors import (DistutilsExecError, CompileError, LibError,
-                              LinkError, UnknownFileError)
+                               LinkError, UnknownFileError)
 from distutils2.compiler.ccompiler import CCompiler, gen_preprocess_options
 from distutils2.file_util import write_file
 from distutils2.dep_util import newer
diff --git a/src/distutils2/compiler/ccompiler.py b/src/distutils2/compiler/ccompiler.py
--- a/src/distutils2/compiler/ccompiler.py
+++ b/src/distutils2/compiler/ccompiler.py
@@ -10,7 +10,7 @@
 import re
 
 from distutils2.errors import (CompileError, LinkError, UnknownFileError,
-                              DistutilsPlatformError, DistutilsModuleError)
+                               DistutilsPlatformError, DistutilsModuleError)
 from distutils2.spawn import spawn
 from distutils2.util import split_quoted, execute, newer_group
 from distutils2 import log
diff --git a/src/distutils2/compiler/emxccompiler.py b/src/distutils2/compiler/emxccompiler.py
--- a/src/distutils2/compiler/emxccompiler.py
+++ b/src/distutils2/compiler/emxccompiler.py
@@ -25,9 +25,8 @@
 from warnings import warn
 
 from distutils2.compiler.unixccompiler import UnixCCompiler
-from distutils2.util import write_file
 from distutils2.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils2.util import get_compiler_versions
+from distutils2.util import get_compiler_versions, write_file
 
 class EMXCCompiler (UnixCCompiler):
 
diff --git a/src/distutils2/compiler/msvc9compiler.py b/src/distutils2/compiler/msvc9compiler.py
--- a/src/distutils2/compiler/msvc9compiler.py
+++ b/src/distutils2/compiler/msvc9compiler.py
@@ -20,7 +20,7 @@
 import re
 
 from distutils2.errors import (DistutilsExecError, DistutilsPlatformError,
-                              CompileError, LibError, LinkError)
+                               CompileError, LibError, LinkError)
 from distutils2.compiler.ccompiler import CCompiler, gen_lib_options
 from distutils2 import log
 from distutils2.util import get_platform
diff --git a/src/distutils2/compiler/msvccompiler.py b/src/distutils2/compiler/msvccompiler.py
--- a/src/distutils2/compiler/msvccompiler.py
+++ b/src/distutils2/compiler/msvccompiler.py
@@ -15,7 +15,7 @@
 import string
 
 from distutils2.errors import (DistutilsExecError, DistutilsPlatformError,
-                              CompileError, LibError, LinkError)
+                               CompileError, LibError, LinkError)
 from distutils2.compiler.ccompiler import CCompiler, gen_lib_options
 from distutils2 import log
 
diff --git a/src/distutils2/compiler/unixccompiler.py b/src/distutils2/compiler/unixccompiler.py
--- a/src/distutils2/compiler/unixccompiler.py
+++ b/src/distutils2/compiler/unixccompiler.py
@@ -19,10 +19,10 @@
 from types import StringType, NoneType
 
 from distutils2.util import newer
-from distutils2.compiler.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
-from distutils2.errors import \
-     DistutilsExecError, CompileError, LibError, LinkError
+from distutils2.compiler.ccompiler import (CCompiler, gen_preprocess_options,
+                                           gen_lib_options)
+from distutils2.errors import (DistutilsExecError, CompileError,
+                               LibError, LinkError)
 from distutils2 import log
 
 try:
diff --git a/src/distutils2/core.py b/src/distutils2/core.py
--- a/src/distutils2/core.py
+++ b/src/distutils2/core.py
@@ -13,7 +13,7 @@
 import os
 
 from distutils2.errors import (DistutilsSetupError, DistutilsArgError,
-                              DistutilsError, CCompilerError)
+                               DistutilsError, CCompilerError)
 from distutils2.util import grok_environment_error
 
 # Mainly import these so setup scripts can "from distutils2.core import" them.
diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -16,7 +16,7 @@
 from ConfigParser import RawConfigParser
 
 from distutils2.errors import (DistutilsOptionError, DistutilsArgError,
-                              DistutilsModuleError, DistutilsClassError)
+                               DistutilsModuleError, DistutilsClassError)
 from distutils2.fancy_getopt import FancyGetopt, translate_longopt
 from distutils2.util import check_environ, strtobool
 from distutils2 import log

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Remove redundant conversions
Message-ID: <E1OV3Yg-0002Kn-NK@dinsdale.python.org>

tarek.ziade pushed b2ec3efa9496 to distutils2:

http://hg.python.org/distutils2/rev/b2ec3efa9496
changeset:   250:b2ec3efa9496
user:        ?ric Araujo <merwok at netwok.org>
date:        Wed Jun 30 19:00:34 2010 +0200
summary:     Remove redundant conversions
files:       src/distutils2/dist.py, src/distutils2/log.py, src/distutils2/metadata.py, src/distutils2/tests/support.py

diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -250,7 +250,7 @@
                 elif hasattr(self, key):
                     setattr(self, key, val)
                 else:
-                    msg = "Unknown distribution option: %s" % repr(key)
+                    msg = "Unknown distribution option: %r" % key
                     if warnings is not None:
                         warnings.warn(msg)
                     else:
diff --git a/src/distutils2/log.py b/src/distutils2/log.py
--- a/src/distutils2/log.py
+++ b/src/distutils2/log.py
@@ -18,7 +18,7 @@
 
     def _log(self, level, msg, args):
         if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
-            raise ValueError('%s wrong log level' % str(level))
+            raise ValueError('%s wrong log level' % level)
 
         if level >= self.threshold:
             if args:
diff --git a/src/distutils2/metadata.py b/src/distutils2/metadata.py
--- a/src/distutils2/metadata.py
+++ b/src/distutils2/metadata.py
@@ -517,7 +517,7 @@
             raise NameError(value)
 
     def _nonsense_op(self):
-        msg = 'This operation is not supported : "%s"' % str(self)
+        msg = 'This operation is not supported : "%s"' % self
         raise SyntaxError(msg)
 
     def __call__(self):
diff --git a/src/distutils2/tests/support.py b/src/distutils2/tests/support.py
--- a/src/distutils2/tests/support.py
+++ b/src/distutils2/tests/support.py
@@ -41,7 +41,7 @@
 
     def _log(self, level, msg, args):
         if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
-            raise ValueError('%s wrong log level' % str(level))
+            raise ValueError('%s wrong log level' % level)
         self.logs.append((level, msg, args))
 
     def get_logs(self, *levels):

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:06 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:06 +0200
Subject: [Python-checkins] distutils2: Get more info from tests and also run
	with Python 2.7.
Message-ID: <E1OV3Yg-0002KT-KF@dinsdale.python.org>

tarek.ziade pushed 408a80b82cd0 to distutils2:

http://hg.python.org/distutils2/rev/408a80b82cd0
changeset:   245:408a80b82cd0
user:        ?ric Araujo <merwok at netwok.org>
date:        Wed Jun 30 18:10:13 2010 +0200
summary:     Get more info from tests and also run with Python 2.7.
files:       src/tests.sh

diff --git a/src/tests.sh b/src/tests.sh
--- a/src/tests.sh
+++ b/src/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo -n "Running tests for Python 2.4... "
-python2.4 runtests.py -q > /dev/null 2> /dev/null
+python2.4 -Wd runtests.py -q 2> /dev/null
 if [ $? -ne 0 ];then
     echo "Failed"
     exit 1
@@ -9,7 +9,7 @@
 fi
 
 echo -n "Running tests for Python 2.5... "
-python2.5 runtests.py -q > /dev/null 2> /dev/null
+python2.5 -Wd runtests.py -q 2> /dev/null
 if [ $? -ne 0 ];then
     echo "Failed"
     exit 1
@@ -18,7 +18,7 @@
 fi
 
 echo -n "Running tests for Python 2.6... "
-python2.6 runtests.py -q > /dev/null 2> /dev/null
+python2.6 -Wd -bb -3 runtests.py -q 2> /dev/null
 if [ $? -ne 0 ];then
     echo "Failed"
     exit 1
@@ -26,3 +26,11 @@
     echo "Success"
 fi
 
+echo -n "Running tests for Python 2.7... "
+python2.7 -Wd -bb -3 runtests.py -q 2> /dev/null
+if [ $? -ne 0 ];then
+    echo "Failed"
+    exit 1
+else
+    echo "Success"
+fi

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:19:08 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sat, 03 Jul 2010 16:19:08 +0200
Subject: [Python-checkins] distutils2: now spawn takes the environment when
	required (like byte	compilation here, was
Message-ID: <E1OV3Yi-0002LP-5V@dinsdale.python.org>

tarek.ziade pushed 32559ebbec5c to distutils2:

http://hg.python.org/distutils2/rev/32559ebbec5c
changeset:   251:32559ebbec5c
tag:         tip
user:        Tarek Ziade <tarek at ziade.org>
date:        Sat Jul 03 16:18:51 2010 +0200
summary:     now spawn takes the environment when required (like byte compilation here, was failing)
files:       src/distutils2/spawn.py, src/distutils2/util.py

diff --git a/src/distutils2/spawn.py b/src/distutils2/spawn.py
--- a/src/distutils2/spawn.py
+++ b/src/distutils2/spawn.py
@@ -14,7 +14,7 @@
 from distutils2.errors import DistutilsPlatformError, DistutilsExecError
 from distutils2 import log
 
-def spawn(cmd, search_path=1, verbose=0, dry_run=0):
+def spawn(cmd, search_path=1, verbose=0, dry_run=0, env=None):
     """Run another program, specified as a command list 'cmd', in a new process.
 
     'cmd' is just the argument list for the new process, ie.
@@ -27,15 +27,18 @@
     must be the exact path to the executable.  If 'dry_run' is true,
     the command will not actually be run.
 
+    If 'env' is given, it's a environment dictionary used for the execution
+    environment.
+
     Raise DistutilsExecError if running the program fails in any way; just
     return on success.
     """
     if os.name == 'posix':
-        _spawn_posix(cmd, search_path, dry_run=dry_run)
+        _spawn_posix(cmd, search_path, dry_run=dry_run, env=env)
     elif os.name == 'nt':
-        _spawn_nt(cmd, search_path, dry_run=dry_run)
+        _spawn_nt(cmd, search_path, dry_run=dry_run, env=env)
     elif os.name == 'os2':
-        _spawn_os2(cmd, search_path, dry_run=dry_run)
+        _spawn_os2(cmd, search_path, dry_run=dry_run, env=env)
     else:
         raise DistutilsPlatformError, \
               "don't know how to spawn programs on platform '%s'" % os.name
@@ -56,7 +59,7 @@
             args[i] = '"%s"' % arg
     return args
 
-def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
+def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0, env=None):
     executable = cmd[0]
     cmd = _nt_quote_args(cmd)
     if search_path:
@@ -66,7 +69,11 @@
     if not dry_run:
         # spawn for NT requires a full path to the .exe
         try:
-            rc = os.spawnv(os.P_WAIT, executable, cmd)
+            if env is None:
+                rc = os.spawnv(os.P_WAIT, executable, cmd)
+            else:
+                rc = os.spawnve(os.P_WAIT, executable, cmd, env)
+
         except OSError, exc:
             # this seems to happen when the command isn't found
             raise DistutilsExecError, \
@@ -76,7 +83,7 @@
             raise DistutilsExecError, \
                   "command '%s' failed with exit status %d" % (cmd[0], rc)
 
-def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
+def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0, env=None):
     executable = cmd[0]
     if search_path:
         # either we find one or it stays the same
@@ -85,7 +92,11 @@
     if not dry_run:
         # spawnv for OS/2 EMX requires a full path to the .exe
         try:
-            rc = os.spawnv(os.P_WAIT, executable, cmd)
+            if env is None:
+                rc = os.spawnv(os.P_WAIT, executable, cmd)
+            else:
+                rc = os.spawnve(os.P_WAIT, executable, cmd, env)
+
         except OSError, exc:
             # this seems to happen when the command isn't found
             raise DistutilsExecError, \
@@ -97,16 +108,24 @@
                   "command '%s' failed with exit status %d" % (cmd[0], rc)
 
 
-def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
+def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0, env=None):
     log.info(' '.join(cmd))
     if dry_run:
         return
-    exec_fn = search_path and os.execvp or os.execv
+
+    if env is None:
+        exec_fn = search_path and os.execvp or os.execv
+    else:
+        exec_fn = search_path and os.execvpe or os.execve
+
     pid = os.fork()
 
     if pid == 0:  # in the child
         try:
-            exec_fn(cmd[0], cmd)
+            if env is None:
+                exec_fn(cmd[0], cmd)
+            else:
+                exec_fn(cmd[0], cmd, env)
         except OSError, e:
             sys.stderr.write("unable to execute %s: %s\n" %
                              (cmd[0], e.strerror))
diff --git a/src/distutils2/util.py b/src/distutils2/util.py
--- a/src/distutils2/util.py
+++ b/src/distutils2/util.py
@@ -6,6 +6,7 @@
 __revision__ = "$Id: util.py 77761 2010-01-26 22:46:15Z tarek.ziade $"
 
 import sys, os, string, re
+from copy import copy
 from fnmatch import fnmatchcase
 
 from distutils2.errors import (DistutilsPlatformError, DistutilsFileError,
@@ -394,9 +395,14 @@
             cmd.insert(1, "-O")
         elif optimize == 2:
             cmd.insert(1, "-OO")
-        spawn(cmd, dry_run=dry_run)
-        execute(os.remove, (script_name,), "removing %s" % script_name,
-                dry_run=dry_run)
+
+        env = copy(os.environ)
+        env['PYTHONPATH'] = ':'.join(sys.path)
+        try:
+            spawn(cmd, dry_run=dry_run, env=env)
+        finally:
+            execute(os.remove, (script_name,), "removing %s" % script_name,
+                    dry_run=dry_run)
 
     # "Direct" byte-compilation: use the py_compile module to compile
     # right here, right now.  Note that the script generated in indirect

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sat Jul  3 16:46:24 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 16:46:24 +0200 (CEST)
Subject: [Python-checkins] r82505 - sandbox/trunk/release/release.py
Message-ID: <20100703144624.2ABD7EE9D0@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 16:46:24 2010
New Revision: 82505

Log:
warn if dist already exists

Modified:
   sandbox/trunk/release/release.py

Modified: sandbox/trunk/release/release.py
==============================================================================
--- sandbox/trunk/release/release.py	(original)
+++ sandbox/trunk/release/release.py	Sat Jul  3 16:46:24 2010
@@ -206,7 +206,9 @@
     try:
         os.mkdir('dist')
     except OSError:
-        if not os.path.isdir('dist'):
+        if os.path.isdir('dist'):
+            print('WARNING: dist already exists', file=sys.stderr)
+        else:
             error('dist/ is not a directory')
     else:
         print('created dist directory')

From python-checkins at python.org  Sat Jul  3 16:51:25 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 16:51:25 +0200 (CEST)
Subject: [Python-checkins] r82506 - in python/branches/release27-maint:
	Include/patchlevel.h Lib/distutils/__init__.py
	Lib/idlelib/idlever.py Misc/NEWS Misc/RPM/python-2.7.spec README
Message-ID: <20100703145125.A8DB8EE9B3@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 16:51:25 2010
New Revision: 82506

Log:
prepare for 2.7.1

Modified:
   python/branches/release27-maint/Include/patchlevel.h
   python/branches/release27-maint/Lib/distutils/__init__.py
   python/branches/release27-maint/Lib/idlelib/idlever.py
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Misc/RPM/python-2.7.spec
   python/branches/release27-maint/README

Modified: python/branches/release27-maint/Include/patchlevel.h
==============================================================================
--- python/branches/release27-maint/Include/patchlevel.h	(original)
+++ python/branches/release27-maint/Include/patchlevel.h	Sat Jul  3 16:51:25 2010
@@ -22,12 +22,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION	2
 #define PY_MINOR_VERSION	7
-#define PY_MICRO_VERSION	0
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_MICRO_VERSION	1
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_ALPHA
 #define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"2.7"
+#define PY_VERSION      	"2.7.1a0"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository) */

Modified: python/branches/release27-maint/Lib/distutils/__init__.py
==============================================================================
--- python/branches/release27-maint/Lib/distutils/__init__.py	(original)
+++ python/branches/release27-maint/Lib/distutils/__init__.py	Sat Jul  3 16:51:25 2010
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7"
+__version__ = "2.7.1a0"
 #--end constants--

Modified: python/branches/release27-maint/Lib/idlelib/idlever.py
==============================================================================
--- python/branches/release27-maint/Lib/idlelib/idlever.py	(original)
+++ python/branches/release27-maint/Lib/idlelib/idlever.py	Sat Jul  3 16:51:25 2010
@@ -1 +1 @@
-IDLE_VERSION = "2.7"
+IDLE_VERSION = "2.7.1a0"

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sat Jul  3 16:51:25 2010
@@ -4,6 +4,23 @@
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
 
+What's New in Python 2.7.1?
+===========================
+
+*Release date: XXXX-XX-XX*
+
+Core and Builtins
+-----------------
+
+
+Library
+-------
+
+
+Extension Modules
+-----------------
+
+
 What's New in Python 2.7?
 =========================
 

Modified: python/branches/release27-maint/Misc/RPM/python-2.7.spec
==============================================================================
--- python/branches/release27-maint/Misc/RPM/python-2.7.spec	(original)
+++ python/branches/release27-maint/Misc/RPM/python-2.7.spec	Sat Jul  3 16:51:25 2010
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 2.7
+%define version 2.7.1a0
 %define libver 2.7
 #--end constants--
 %define release 1pydotorg

Modified: python/branches/release27-maint/README
==============================================================================
--- python/branches/release27-maint/README	(original)
+++ python/branches/release27-maint/README	Sat Jul  3 16:51:25 2010
@@ -1,5 +1,5 @@
-This is Python version 2.7
-===========================
+This is Python version 2.7.1 release candidate 1
+================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 Python Software Foundation.

From python-checkins at python.org  Sat Jul  3 17:09:20 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 17:09:20 +0200 (CEST)
Subject: [Python-checkins] r82507 - python/branches/py3k
Message-ID: <20100703150920.95347EE98F@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 17:09:20 2010
New Revision: 82507

Log:
Removed merge tracking for "svnmerge" for 
svn+ssh://pythondev at svn.python.org/python/branches/py3k/python/trunk


Modified:
   python/branches/py3k/   (props changed)

From python-checkins at python.org  Sat Jul  3 17:38:12 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 17:38:12 +0200 (CEST)
Subject: [Python-checkins] r82508 - python/branches/release27-maint
Message-ID: <20100703153812.990F3EE986@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 17:38:12 2010
New Revision: 82508

Log:
Initialized merge tracking via "svnmerge" with revisions "0-82507" from 
svn+ssh://pythondev at svn.python.org/python/branches/py3k


Modified:
   python/branches/release27-maint/   (props changed)

From python-checkins at python.org  Sat Jul  3 19:45:27 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Sat,  3 Jul 2010 19:45:27 +0200 (CEST)
Subject: [Python-checkins] r82509 -
	sandbox/branches/py3k-datetime/datetime.py
Message-ID: <20100703174527.213EEEE983@mail.python.org>

Author: alexander.belopolsky
Date: Sat Jul  3 19:45:26 2010
New Revision: 82509

Log:
Use single underscore prefix for private attributes and methods.
Note that tests will fail if __setstate is renamed to _setstate.


Modified:
   sandbox/branches/py3k-datetime/datetime.py

Modified: sandbox/branches/py3k-datetime/datetime.py
==============================================================================
--- sandbox/branches/py3k-datetime/datetime.py	(original)
+++ sandbox/branches/py3k-datetime/datetime.py	Sat Jul  3 19:45:26 2010
@@ -316,7 +316,7 @@
     Representation: (days, seconds, microseconds).  Why?  Because I
     felt like it.
     """
-    __slots__ = '__days', '__seconds', '__microseconds'
+    __slots__ = '_days', '_seconds', '_microseconds'
 
     def __new__(cls, days=0, seconds=0, microseconds=0,
                 milliseconds=0, minutes=0, hours=0, weeks=0):
@@ -423,36 +423,36 @@
 
         self = object.__new__(cls)
 
-        self.__days = d
-        self.__seconds = s
-        self.__microseconds = us
+        self._days = d
+        self._seconds = s
+        self._microseconds = us
         if abs(d) > 999999999:
             raise OverflowError("timedelta # of days is too large: %d" % d)
 
         return self
 
     def __repr__(self):
-        if self.__microseconds:
+        if self._microseconds:
             return "%s(%d, %d, %d)" % ('datetime.' + self.__class__.__name__,
-                                       self.__days,
-                                       self.__seconds,
-                                       self.__microseconds)
-        if self.__seconds:
+                                       self._days,
+                                       self._seconds,
+                                       self._microseconds)
+        if self._seconds:
             return "%s(%d, %d)" % ('datetime.' + self.__class__.__name__,
-                                   self.__days,
-                                   self.__seconds)
-        return "%s(%d)" % ('datetime.' + self.__class__.__name__, self.__days)
+                                   self._days,
+                                   self._seconds)
+        return "%s(%d)" % ('datetime.' + self.__class__.__name__, self._days)
 
     def __str__(self):
-        mm, ss = divmod(self.__seconds, 60)
+        mm, ss = divmod(self._seconds, 60)
         hh, mm = divmod(mm, 60)
         s = "%d:%02d:%02d" % (hh, mm, ss)
-        if self.__days:
+        if self._days:
             def plural(n):
                 return n, abs(n) != 1 and "s" or ""
-            s = ("%d day%s, " % plural(self.__days)) + s
-        if self.__microseconds:
-            s = s + ".%06d" % self.__microseconds
+            s = ("%d day%s, " % plural(self._days)) + s
+        if self._microseconds:
+            s = s + ".%06d" % self._microseconds
         return s
 
     def total_seconds(self):
@@ -464,25 +464,25 @@
     @property
     def days(self):
         """days"""
-        return self.__days
+        return self._days
 
     @property
     def seconds(self):
         """seconds"""
-        return self.__seconds
+        return self._seconds
 
     @property
     def microseconds(self):
         """microseconds"""
-        return self.__microseconds
+        return self._microseconds
 
     def __add__(self, other):
         if isinstance(other, timedelta):
             # for CPython compatibility, we cannot use
             # our __class__ here, but need a real timedelta
-            return timedelta(self.__days + other.__days,
-                             self.__seconds + other.__seconds,
-                             self.__microseconds + other.__microseconds)
+            return timedelta(self._days + other._days,
+                             self._seconds + other._seconds,
+                             self._microseconds + other._microseconds)
         return NotImplemented
 
     __radd__ = __add__
@@ -500,15 +500,15 @@
     def __neg__(self):
             # for CPython compatibility, we cannot use
             # our __class__ here, but need a real timedelta
-            return timedelta(-self.__days,
-                             -self.__seconds,
-                             -self.__microseconds)
+            return timedelta(-self._days,
+                             -self._seconds,
+                             -self._microseconds)
 
     def __pos__(self):
         return self
 
     def __abs__(self):
-        if self.__days < 0:
+        if self._days < 0:
             return -self
         else:
             return self
@@ -517,9 +517,9 @@
         if isinstance(other, int):
             # for CPython compatibility, we cannot use
             # our __class__ here, but need a real timedelta
-            return timedelta(self.__days * other,
-                             self.__seconds * other,
-                             self.__microseconds * other)
+            return timedelta(self._days * other,
+                             self._seconds * other,
+                             self._microseconds * other)
         if isinstance(other, float):
             a, b = other.as_integer_ratio()
             return self * a / b
@@ -528,8 +528,8 @@
     __rmul__ = __mul__
 
     def _to_microseconds(self):
-        return ((self.__days * (24*3600) + self.__seconds) * 1000000 +
-                self.__microseconds)
+        return ((self._days * (24*3600) + self._seconds) * 1000000 +
+                self._microseconds)
 
     def __floordiv__(self, other):
         if not isinstance(other, (int, timedelta)):
@@ -569,59 +569,59 @@
 
     def __eq__(self, other):
         if isinstance(other, timedelta):
-            return self.__cmp(other) == 0
+            return self._cmp(other) == 0
         else:
             return False
 
     def __ne__(self, other):
         if isinstance(other, timedelta):
-            return self.__cmp(other) != 0
+            return self._cmp(other) != 0
         else:
             return True
 
     def __le__(self, other):
         if isinstance(other, timedelta):
-            return self.__cmp(other) <= 0
+            return self._cmp(other) <= 0
         else:
             _cmperror(self, other)
 
     def __lt__(self, other):
         if isinstance(other, timedelta):
-            return self.__cmp(other) < 0
+            return self._cmp(other) < 0
         else:
             _cmperror(self, other)
 
     def __ge__(self, other):
         if isinstance(other, timedelta):
-            return self.__cmp(other) >= 0
+            return self._cmp(other) >= 0
         else:
             _cmperror(self, other)
 
     def __gt__(self, other):
         if isinstance(other, timedelta):
-            return self.__cmp(other) > 0
+            return self._cmp(other) > 0
         else:
             _cmperror(self, other)
 
-    def __cmp(self, other):
+    def _cmp(self, other):
         assert isinstance(other, timedelta)
-        return _cmp(self.__getstate(), other.__getstate())
+        return _cmp(self._getstate(), other._getstate())
 
     def __hash__(self):
-        return hash(self.__getstate())
+        return hash(self._getstate())
 
     def __bool__(self):
-        return (self.__days != 0 or
-                self.__seconds != 0 or
-                self.__microseconds != 0)
+        return (self._days != 0 or
+                self._seconds != 0 or
+                self._microseconds != 0)
 
     # Pickle support.
 
-    def __getstate(self):
-        return (self.__days, self.__seconds, self.__microseconds)
+    def _getstate(self):
+        return (self._days, self._seconds, self._microseconds)
 
     def __reduce__(self):
-        return (self.__class__, self.__getstate())
+        return (self.__class__, self._getstate())
 
 timedelta.min = timedelta(-999999999)
 timedelta.max = timedelta(days=999999999, hours=23, minutes=59, seconds=59,
@@ -656,7 +656,7 @@
     Properties (readonly):
     year, month, day
     """
-    __slots__ = '__year', '__month', '__day'
+    __slots__ = '_year', '_month', '_day'
 
     def __new__(cls, year, month=None, day=None):
         """Constructor.
@@ -672,9 +672,9 @@
             return self
         _check_date_fields(year, month, day)
         self = object.__new__(cls)
-        self.__year = year
-        self.__month = month
-        self.__day = day
+        self._year = year
+        self._month = month
+        self._day = day
         return self
 
     # Additional constructors
@@ -706,9 +706,9 @@
     def __repr__(self):
         "Convert to formal string, for repr()."
         return "%s(%d, %d, %d)" % ('datetime.' + self.__class__.__name__,
-                                   self.__year,
-                                   self.__month,
-                                   self.__day)
+                                   self._year,
+                                   self._month,
+                                   self._day)
     # XXX These shouldn't depend on time.localtime(), because that
     # clips the usable dates to [1970 .. 2038).  At least ctime() is
     # easily done without using strftime() -- that's better too because
@@ -720,8 +720,8 @@
         weekday = self.toordinal() % 7 or 7
         return "%s %s %2d 00:00:00 %04d" % (
             _DAYNAMES[weekday],
-            _MONTHNAMES[self.__month],
-            self.__day, self.__year)
+            _MONTHNAMES[self._month],
+            self._day, self._year)
 
     def strftime(self, fmt):
         "Format using strftime()."
@@ -741,7 +741,7 @@
         - http://www.w3.org/TR/NOTE-datetime
         - http://www.cl.cam.ac.uk/~mgk25/iso-time.html
         """
-        return "%04d-%02d-%02d" % (self.__year, self.__month, self.__day)
+        return "%04d-%02d-%02d" % (self._year, self._month, self._day)
 
     __str__ = isoformat
 
@@ -749,23 +749,23 @@
     @property
     def year(self):
         """year (1-9999)"""
-        return self.__year
+        return self._year
 
     @property
     def month(self):
         """month (1-12)"""
-        return self.__month
+        return self._month
 
     @property
     def day(self):
         """day (1-31)"""
-        return self.__day
+        return self._day
 
     # Standard conversions, __cmp__, __hash__ (and helpers)
 
     def timetuple(self):
         "Return local time tuple compatible with time.localtime()."
-        return _build_struct_time(self.__year, self.__month, self.__day,
+        return _build_struct_time(self._year, self._month, self._day,
                                   0, 0, 0, -1)
 
     def toordinal(self):
@@ -774,16 +774,16 @@
         January 1 of year 1 is day 1.  Only the year, month and day values
         contribute to the result.
         """
-        return _ymd2ord(self.__year, self.__month, self.__day)
+        return _ymd2ord(self._year, self._month, self._day)
 
     def replace(self, year=None, month=None, day=None):
         """Return a new date with new values for the specified fields."""
         if year is None:
-            year = self.__year
+            year = self._year
         if month is None:
-            month = self.__month
+            month = self._month
         if day is None:
-            day = self.__day
+            day = self._day
         _check_date_fields(year, month, day)
         return date(year, month, day)
 
@@ -791,43 +791,43 @@
 
     def __eq__(self, other):
         if isinstance(other, date):
-            return self.__cmp(other) == 0
+            return self._cmp(other) == 0
         return NotImplemented
 
     def __ne__(self, other):
         if isinstance(other, date):
-            return self.__cmp(other) != 0
+            return self._cmp(other) != 0
         return NotImplemented
 
     def __le__(self, other):
         if isinstance(other, date):
-            return self.__cmp(other) <= 0
+            return self._cmp(other) <= 0
         return NotImplemented
 
     def __lt__(self, other):
         if isinstance(other, date):
-            return self.__cmp(other) < 0
+            return self._cmp(other) < 0
         return NotImplemented
 
     def __ge__(self, other):
         if isinstance(other, date):
-            return self.__cmp(other) >= 0
+            return self._cmp(other) >= 0
         return NotImplemented
 
     def __gt__(self, other):
         if isinstance(other, date):
-            return self.__cmp(other) > 0
+            return self._cmp(other) > 0
         return NotImplemented
 
-    def __cmp(self, other):
+    def _cmp(self, other):
         assert isinstance(other, date)
-        y, m, d = self.__year, self.__month, self.__day
-        y2, m2, d2 = other.__year, other.__month, other.__day
+        y, m, d = self._year, self._month, self._day
+        y2, m2, d2 = other._year, other._month, other._day
         return _cmp((y, m, d), (y2, m2, d2))
 
     def __hash__(self):
         "Hash."
-        return hash(self.__getstate())
+        return hash(self._getstate())
 
     # Computations
 
@@ -875,9 +875,9 @@
         ISO calendar algorithm taken from
         http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm
         """
-        year = self.__year
+        year = self._year
         week1monday = _isoweek1monday(year)
-        today = _ymd2ord(self.__year, self.__month, self.__day)
+        today = _ymd2ord(self._year, self._month, self._day)
         # Internally, week and day have origin 0
         week, day = divmod(today - week1monday, 7)
         if week < 0:
@@ -892,18 +892,18 @@
 
     # Pickle support.
 
-    def __getstate(self):
-        yhi, ylo = divmod(self.__year, 256)
-        return bytes([yhi, ylo, self.__month, self.__day]),
+    def _getstate(self):
+        yhi, ylo = divmod(self._year, 256)
+        return bytes([yhi, ylo, self._month, self._day]),
 
     def __setstate(self, string):
         if len(string) != 4 or not (1 <= string[2] <= 12):
             raise TypeError("not enough arguments")
-        yhi, ylo, self.__month, self.__day = string
-        self.__year = yhi * 256 + ylo
+        yhi, ylo, self._month, self._day = string
+        self._year = yhi * 256 + ylo
 
     def __reduce__(self):
-        return (self.__class__, self.__getstate())
+        return (self.__class__, self._getstate())
 
 _date_class = date  # so functions w/ args named "date" can get at the class
 
@@ -1018,10 +1018,10 @@
             return self
         _check_tzinfo_arg(tzinfo)
         _check_time_fields(hour, minute, second, microsecond)
-        self.__hour = hour
-        self.__minute = minute
-        self.__second = second
-        self.__microsecond = microsecond
+        self._hour = hour
+        self._minute = minute
+        self._second = second
+        self._microsecond = microsecond
         self._tzinfo = tzinfo
         return self
 
@@ -1029,22 +1029,22 @@
     @property
     def hour(self):
         """hour (0-23)"""
-        return self.__hour
+        return self._hour
 
     @property
     def minute(self): 
         """minute (0-59)"""
-        return self.__minute
+        return self._minute
 
     @property
     def second(self):
         """second (0-59)"""
-        return self.__second
+        return self._second
     
     @property
     def microsecond(self):
         """microsecond (0-999999)"""
-        return self.__microsecond
+        return self._microsecond
 
     @property
     def tzinfo(self):
@@ -1057,41 +1057,41 @@
 
     def __eq__(self, other):
         if isinstance(other, time):
-            return self.__cmp(other) == 0
+            return self._cmp(other) == 0
         else:
             return False
 
     def __ne__(self, other):
         if isinstance(other, time):
-            return self.__cmp(other) != 0
+            return self._cmp(other) != 0
         else:
             return True
 
     def __le__(self, other):
         if isinstance(other, time):
-            return self.__cmp(other) <= 0
+            return self._cmp(other) <= 0
         else:
             _cmperror(self, other)
 
     def __lt__(self, other):
         if isinstance(other, time):
-            return self.__cmp(other) < 0
+            return self._cmp(other) < 0
         else:
             _cmperror(self, other)
 
     def __ge__(self, other):
         if isinstance(other, time):
-            return self.__cmp(other) >= 0
+            return self._cmp(other) >= 0
         else:
             _cmperror(self, other)
 
     def __gt__(self, other):
         if isinstance(other, time):
-            return self.__cmp(other) > 0
+            return self._cmp(other) > 0
         else:
             _cmperror(self, other)
 
-    def __cmp(self, other):
+    def _cmp(self, other):
         assert isinstance(other, time)
         mytz = self._tzinfo
         ottz = other._tzinfo
@@ -1105,22 +1105,22 @@
             base_compare = myoff == otoff
 
         if base_compare:
-            return _cmp((self.__hour, self.__minute, self.__second,
-                         self.__microsecond),
-                       (other.__hour, other.__minute, other.__second,
-                        other.__microsecond))
+            return _cmp((self._hour, self._minute, self._second,
+                         self._microsecond),
+                       (other._hour, other._minute, other._second,
+                        other._microsecond))
         if myoff is None or otoff is None:
             raise TypeError("cannot compare naive and aware times")
-        myhhmm = self.__hour * 60 + self.__minute - myoff
-        othhmm = other.__hour * 60 + other.__minute - otoff
-        return _cmp((myhhmm, self.__second, self.__microsecond),
-                    (othhmm, other.__second, other.__microsecond))
+        myhhmm = self._hour * 60 + self._minute - myoff
+        othhmm = other._hour * 60 + other._minute - otoff
+        return _cmp((myhhmm, self._second, self._microsecond),
+                    (othhmm, other._second, other._microsecond))
 
     def __hash__(self):
         """Hash."""
         tzoff = self._utcoffset()
         if not tzoff: # zero or None
-            return hash(self.__getstate()[0])
+            return hash(self._getstate()[0])
         h, m = divmod(self.hour * 60 + self.minute - tzoff, 60)
         if 0 <= h < 24:
             return hash(time(h, m, self.second, self.microsecond))
@@ -1144,14 +1144,14 @@
 
     def __repr__(self):
         """Convert to formal string, for repr()."""
-        if self.__microsecond != 0:
-            s = ", %d, %d" % (self.__second, self.__microsecond)
-        elif self.__second != 0:
-            s = ", %d" % self.__second
+        if self._microsecond != 0:
+            s = ", %d, %d" % (self._second, self._microsecond)
+        elif self._second != 0:
+            s = ", %d" % self._second
         else:
             s = ""
         s= "%s(%d, %d%s)" % ('datetime.' + self.__class__.__name__,
-                             self.__hour, self.__minute, s)
+                             self._hour, self._minute, s)
         if self._tzinfo is not None:
             assert s[-1:] == ")"
             s = s[:-1] + ", tzinfo=%r" % self._tzinfo + ")"
@@ -1163,8 +1163,8 @@
         This is 'HH:MM:SS.mmmmmm+zz:zz', or 'HH:MM:SS+zz:zz' if
         self.microsecond == 0.
         """
-        s = _format_time(self.__hour, self.__minute, self.__second,
-                         self.__microsecond)
+        s = _format_time(self._hour, self._minute, self._second,
+                         self._microsecond)
         tz = self._tzstr()
         if tz:
             s += tz
@@ -1179,7 +1179,7 @@
         # The year must be >= 1900 else Python's strftime implementation
         # can raise a bogus exception.
         timetuple = (1900, 1, 1,
-                     self.__hour, self.__minute, self.__second,
+                     self._hour, self._minute, self._second,
                      0, 1, -1)
         return _wrap_strftime(self, fmt, timetuple)
 
@@ -1256,10 +1256,10 @@
 
     # Pickle support.
 
-    def __getstate(self):
-        us2, us3 = divmod(self.__microsecond, 256)
+    def _getstate(self):
+        us2, us3 = divmod(self._microsecond, 256)
         us1, us2 = divmod(us2, 256)
-        basestate = bytes([self.__hour, self.__minute, self.__second,
+        basestate = bytes([self._hour, self._minute, self._second,
                            us1, us2, us3])
         if self._tzinfo is None:
             return (basestate,)
@@ -1269,13 +1269,13 @@
     def __setstate(self, string, tzinfo):
         if len(string) != 6 or string[0] >= 24:
             raise TypeError("an integer is required")
-        (self.__hour, self.__minute, self.__second,
+        (self._hour, self._minute, self._second,
          us1, us2, us3) = string
-        self.__microsecond = (((us1 << 8) | us2) << 8) | us3
+        self._microsecond = (((us1 << 8) | us2) << 8) | us3
         self._tzinfo = tzinfo
 
     def __reduce__(self):
-        return (time, self.__getstate())
+        return (time, self._getstate())
 
 _time_class = time  # so functions w/ args named "time" can get at the class
 
@@ -1291,8 +1291,8 @@
     """
 
     __slots__ = date.__slots__ + (
-        '__hour', '__minute', '__second',
-        '__microsecond', '_tzinfo')
+        '_hour', '_minute', '_second',
+        '_microsecond', '_tzinfo')
     def __new__(cls, year, month=None, day=None, hour=0, minute=0, second=0,
                 microsecond=0, tzinfo=None):
         if isinstance(year, bytes) and len(year) == 10:
@@ -1303,14 +1303,10 @@
         _check_tzinfo_arg(tzinfo)
         _check_time_fields(hour, minute, second, microsecond)
         self = date.__new__(cls, year, month, day)
-        # XXX This duplicates __year, __month, __day for convenience :-(
-        self.__year = year
-        self.__month = month
-        self.__day = day
-        self.__hour = hour
-        self.__minute = minute
-        self.__second = second
-        self.__microsecond = microsecond
+        self._hour = hour
+        self._minute = minute
+        self._second = second
+        self._microsecond = microsecond
         self._tzinfo = tzinfo
         return self
 
@@ -1318,22 +1314,22 @@
     @property
     def hour(self):
         """hour (0-23)"""
-        return self.__hour
+        return self._hour
 
     @property
     def minute(self): 
         """minute (0-59)"""
-        return self.__minute
+        return self._minute
 
     @property
     def second(self):
         """second (0-59)"""
-        return self.__second
+        return self._second
     
     @property
     def microsecond(self):
         """microsecond (0-999999)"""
-        return self.__microsecond
+        return self._microsecond
 
     @property
     def tzinfo(self):
@@ -1426,7 +1422,7 @@
 
     def date(self):
         "Return the date part."
-        return date(self.__year, self.__month, self.__day)
+        return date(self._year, self._month, self._day)
 
     def time(self):
         "Return the time part, with tzinfo None."
@@ -1489,10 +1485,10 @@
         weekday = self.toordinal() % 7 or 7
         return "%s %s %2d %02d:%02d:%02d %04d" % (
             _DAYNAMES[weekday],
-            _MONTHNAMES[self.__month],
-            self.__day,
-            self.__hour, self.__minute, self.__second,
-            self.__year)
+            _MONTHNAMES[self._month],
+            self._day,
+            self._hour, self._minute, self._second,
+            self._year)
 
     def isoformat(self, sep='T'):
         """Return the time formatted according to ISO.
@@ -1506,10 +1502,10 @@
         Optional argument sep specifies the separator between date and
         time, default 'T'.
         """
-        s = ("%04d-%02d-%02d%c" % (self.__year, self.__month, self.__day,
+        s = ("%04d-%02d-%02d%c" % (self._year, self._month, self._day,
                                   sep) +
-                _format_time(self.__hour, self.__minute, self.__second,
-                             self.__microsecond))
+                _format_time(self._hour, self._minute, self._second,
+                             self._microsecond))
         off = self._utcoffset()
         if off is not None:
             if off < 0:
@@ -1523,8 +1519,8 @@
 
     def __repr__(self):
         "Convert to formal string, for repr()."
-        L = [self.__year, self.__month, self.__day, # These are never zero
-             self.__hour, self.__minute, self.__second, self.__microsecond]
+        L = [self._year, self._month, self._day, # These are never zero
+             self._hour, self._minute, self._second, self._microsecond]
         if L[-1] == 0:
             del L[-1]
         if L[-1] == 0:
@@ -1597,7 +1593,7 @@
 
     def __eq__(self, other):
         if isinstance(other, datetime):
-            return self.__cmp(other) == 0
+            return self._cmp(other) == 0
         elif not isinstance(other, date):
             return NotImplemented
         else:
@@ -1605,7 +1601,7 @@
 
     def __ne__(self, other):
         if isinstance(other, datetime):
-            return self.__cmp(other) != 0
+            return self._cmp(other) != 0
         elif not isinstance(other, date):
             return NotImplemented
         else:
@@ -1613,7 +1609,7 @@
 
     def __le__(self, other):
         if isinstance(other, datetime):
-            return self.__cmp(other) <= 0
+            return self._cmp(other) <= 0
         elif not isinstance(other, date):
             return NotImplemented
         else:
@@ -1621,7 +1617,7 @@
 
     def __lt__(self, other):
         if isinstance(other, datetime):
-            return self.__cmp(other) < 0
+            return self._cmp(other) < 0
         elif not isinstance(other, date):
             return NotImplemented
         else:
@@ -1629,7 +1625,7 @@
 
     def __ge__(self, other):
         if isinstance(other, datetime):
-            return self.__cmp(other) >= 0
+            return self._cmp(other) >= 0
         elif not isinstance(other, date):
             return NotImplemented
         else:
@@ -1637,13 +1633,13 @@
 
     def __gt__(self, other):
         if isinstance(other, datetime):
-            return self.__cmp(other) > 0
+            return self._cmp(other) > 0
         elif not isinstance(other, date):
             return NotImplemented
         else:
             _cmperror(self, other)
 
-    def __cmp(self, other):
+    def _cmp(self, other):
         assert isinstance(other, datetime)
         mytz = self._tzinfo
         ottz = other._tzinfo
@@ -1659,12 +1655,12 @@
             base_compare = myoff == otoff
 
         if base_compare:
-            return _cmp((self.__year, self.__month, self.__day,
-                         self.__hour, self.__minute, self.__second,
-                         self.__microsecond),
-                       (other.__year, other.__month, other.__day,
-                        other.__hour, other.__minute, other.__second,
-                        other.__microsecond))
+            return _cmp((self._year, self._month, self._day,
+                         self._hour, self._minute, self._second,
+                         self._microsecond),
+                       (other._year, other._month, other._day,
+                        other._hour, other._minute, other._second,
+                        other._microsecond))
         if myoff is None or otoff is None:
             raise TypeError("cannot compare naive and aware datetimes")
         # XXX What follows could be done more efficiently...
@@ -1678,10 +1674,10 @@
         if not isinstance(other, timedelta):
             return NotImplemented
         delta = timedelta(self.toordinal(),
-                          hours=self.__hour,
-                          minutes=self.__minute,
-                          seconds=self.__second,
-                          microseconds=self.__microsecond)
+                          hours=self._hour,
+                          minutes=self._minute,
+                          seconds=self._second,
+                          microseconds=self._microsecond)
         delta += other
         hour, rem = divmod(delta.seconds, 3600)
         minute, second = divmod(rem, 60)
@@ -1703,11 +1699,11 @@
 
         days1 = self.toordinal()
         days2 = other.toordinal()
-        secs1 = self.__second + self.__minute * 60 + self.__hour * 3600
-        secs2 = other.__second + other.__minute * 60 + other.__hour * 3600
+        secs1 = self._second + self._minute * 60 + self._hour * 3600
+        secs2 = other._second + other._minute * 60 + other._hour * 3600
         base = timedelta(days1 - days2,
                          secs1 - secs2,
-                         self.__microsecond - other.__microsecond)
+                         self._microsecond - other._microsecond)
         if self._tzinfo is other._tzinfo:
             return base
         myoff = self._utcoffset()
@@ -1721,19 +1717,19 @@
     def __hash__(self):
         tzoff = self._utcoffset()
         if tzoff is None:
-            return hash(self.__getstate()[0])
+            return hash(self._getstate()[0])
         days = _ymd2ord(self.year, self.month, self.day)
         seconds = self.hour * 3600 + (self.minute - tzoff) * 60 + self.second
         return hash(timedelta(days, seconds, self.microsecond))
 
     # Pickle support.
 
-    def __getstate(self):
-        yhi, ylo = divmod(self.__year, 256)
-        us2, us3 = divmod(self.__microsecond, 256)
+    def _getstate(self):
+        yhi, ylo = divmod(self._year, 256)
+        us2, us3 = divmod(self._microsecond, 256)
         us1, us2 = divmod(us2, 256)
-        basestate = bytes([yhi, ylo, self.__month, self.__day,
-                           self.__hour, self.__minute, self.__second,
+        basestate = bytes([yhi, ylo, self._month, self._day,
+                           self._hour, self._minute, self._second,
                            us1, us2, us3])
         if self._tzinfo is None:
             return (basestate,)
@@ -1741,14 +1737,14 @@
             return (basestate, self._tzinfo)
 
     def __setstate(self, string, tzinfo):
-        (yhi, ylo, self.__month, self.__day, self.__hour,
-         self.__minute, self.__second, us1, us2, us3) = string
-        self.__year = yhi * 256 + ylo
-        self.__microsecond = (((us1 << 8) | us2) << 8) | us3
+        (yhi, ylo, self._month, self._day, self._hour,
+         self._minute, self._second, us1, us2, us3) = string
+        self._year = yhi * 256 + ylo
+        self._microsecond = (((us1 << 8) | us2) << 8) | us3
         self._tzinfo = tzinfo
 
     def __reduce__(self):
-        return (self.__class__, self.__getstate())
+        return (self.__class__, self._getstate())
 
 
 datetime.min = datetime(1, 1, 1)
@@ -1768,7 +1764,7 @@
     return week1monday
 
 class timezone(tzinfo):
-    __slots__ = '__offset', '__name'
+    __slots__ = '_offset', '_name'
 
     def __init__(self, offset, *args):
         # Reproduce C behavior
@@ -1788,40 +1784,40 @@
                     offset.seconds % 60 != 0):
                     raise ValueError("offset must be whole"
                                     " number of minutes")
-                self.__offset = offset
+                self._offset = offset
             else:
                 raise ValueError("offset out of range")
         else:
             raise TypeError("offset must be timedelta")
 
-        self.__name = name
+        self._name = name
 
     def __getinitargs__(self):
         """pickle support"""
-        if self.__name is None:
-            return (self.__offset,)
-        return (self.__offset, self.__name)
+        if self._name is None:
+            return (self._offset,)
+        return (self._offset, self._name)
 
     def __eq__(self, other):
-        return self.__offset == other.__offset
+        return self._offset == other._offset
     
     def __hash__(self):
-        return hash(self.__offset)
+        return hash(self._offset)
     
     def __str__(self):
         return self.tzname(None)
 
     def utcoffset(self, dt):
         if isinstance(dt, datetime) or dt is None:
-            return self.__offset
+            return self._offset
         raise TypeError("utcoffset() argument must be a datetime instance"
                         " or None")
 
     def tzname(self, dt):
         if isinstance(dt, datetime) or dt is None:
-            if self.__name is None:
-                return self._name_from_offset(self.__offset)
-            return self.__name
+            if self._name is None:
+                return self._name_from_offset(self._offset)
+            return self._name
         raise TypeError("tzname() argument must be a datetime instance"
                         " or None")
 
@@ -1836,7 +1832,7 @@
             if dt.tzinfo is not self:
                 raise ValueError("fromutc: dt.tzinfo "
                                  "is not self")
-            return dt + self.__offset
+            return dt + self._offset
         raise TypeError("fromutc() argument must be a datetime instance"
                         " or None")
 

From python-checkins at python.org  Sat Jul  3 19:48:22 2010
From: python-checkins at python.org (senthil.kumaran)
Date: Sat,  3 Jul 2010 19:48:22 +0200 (CEST)
Subject: [Python-checkins] r82510 - in python/branches/py3k:
	Doc/library/urllib.parse.rst Lib/test/test_urllib.py
	Lib/urllib/parse.py Misc/NEWS
Message-ID: <20100703174822.C912BCA5E@mail.python.org>

Author: senthil.kumaran
Date: Sat Jul  3 19:48:22 2010
New Revision: 82510

Log:
Fix Issue5468 - urlencode to handle bytes and other alternate encodings.
(Extensive tests provided). Patch by Dan Mahn.



Modified:
   python/branches/py3k/Doc/library/urllib.parse.rst
   python/branches/py3k/Lib/test/test_urllib.py
   python/branches/py3k/Lib/urllib/parse.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/library/urllib.parse.rst
==============================================================================
--- python/branches/py3k/Doc/library/urllib.parse.rst	(original)
+++ python/branches/py3k/Doc/library/urllib.parse.rst	Sat Jul  3 19:48:22 2010
@@ -310,23 +310,29 @@
    ``b'a&\xef'``.
 
 
-.. function:: urlencode(query, doseq=False)
+.. function:: urlencode(query, doseq=False, safe='', encoding=None, errors=None)
 
-   Convert a mapping object or a sequence of two-element tuples to a
-   "url-encoded" string, suitable to pass to :func:`urlopen` above as the
-   optional *data* argument.  This is useful to pass a dictionary of form
-   fields to a ``POST`` request.  The resulting string is a series of
-   ``key=value`` pairs separated by ``'&'`` characters, where both *key* and
-   *value* are quoted using :func:`quote_plus` above. When a sequence of
-   two-element tuples is used as the *query* argument, the first element of
-   each tuple is a key and the second is a value. The value element in itself
-   can be a sequence and in that case, if the optional parameter *doseq* is
-   evaluates to *True*, individual ``key=value`` pairs separated by ``'&'`` are
-   generated for each element of the value sequence for the key.  The order of
-   parameters in the encoded string will match the order of parameter tuples in
-   the sequence. This module provides the functions :func:`parse_qs` and
-   :func:`parse_qsl` which are used to parse query strings into Python data
-   structures.
+   Convert a mapping object or a sequence of two-element tuples, which may
+   either be a :class:`str` or a :class:`bytes`,  to a "url-encoded" string,
+   suitable to pass to :func:`urlopen` above as the optional *data* argument.
+   This is useful to pass a dictionary of form fields to a ``POST`` request.
+   The resulting string is a series of ``key=value`` pairs separated by ``'&'``
+   characters, where both *key* and *value* are quoted using :func:`quote_plus`
+   above. When a sequence of two-element tuples is used as the *query*
+   argument, the first element of each tuple is a key and the second is a
+   value. The value element in itself can be a sequence and in that case, if
+   the optional parameter *doseq* is evaluates to *True*, individual
+   ``key=value`` pairs separated by ``'&'`` are generated for each element of
+   the value sequence for the key.  The order of parameters in the encoded
+   string will match the order of parameter tuples in the sequence. This module
+   provides the functions :func:`parse_qs` and :func:`parse_qsl` which are used
+   to parse query strings into Python data structures.
+
+   When *query* parameter is a :class:`str`, the *safe*, *encoding* and *error*
+   parameters are sent the :func:`quote_plus` for encoding.
+
+   .. versionchanged:: 3.2
+      query paramater supports bytes and string.
 
 
 .. seealso::

Modified: python/branches/py3k/Lib/test/test_urllib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib.py	(original)
+++ python/branches/py3k/Lib/test/test_urllib.py	Sat Jul  3 19:48:22 2010
@@ -795,6 +795,116 @@
         self.assertEqual("a=a&a=b",
                          urllib.parse.urlencode({"a": {"a": 1, "b": 1}}, True))
 
+    def test_urlencode_encoding(self):
+        # ASCII encoding. Expect %3F with errors="replace'
+        given = (('\u00a0', '\u00c1'),)
+        expect = '%3F=%3F'
+        result = urllib.parse.urlencode(given, encoding="ASCII", errors="replace")
+        self.assertEqual(expect, result)
+
+        # Default is UTF-8 encoding.
+        given = (('\u00a0', '\u00c1'),)
+        expect = '%C2%A0=%C3%81'
+        result = urllib.parse.urlencode(given)
+        self.assertEqual(expect, result)
+
+        # Latin-1 encoding.
+        given = (('\u00a0', '\u00c1'),)
+        expect = '%A0=%C1'
+        result = urllib.parse.urlencode(given, encoding="latin-1")
+        self.assertEqual(expect, result)
+
+    def test_urlencode_encoding_doseq(self):
+        # ASCII Encoding. Expect %3F with errors="replace'
+        given = (('\u00a0', '\u00c1'),)
+        expect = '%3F=%3F'
+        result = urllib.parse.urlencode(given, doseq=True,
+                                        encoding="ASCII", errors="replace")
+        self.assertEqual(expect, result)
+
+        # ASCII Encoding. On a sequence of values.
+        given = (("\u00a0", (1, "\u00c1")),)
+        expect = '%3F=1&%3F=%3F'
+        result = urllib.parse.urlencode(given, True,
+                                        encoding="ASCII", errors="replace")
+        self.assertEqual(expect, result)
+
+        # Utf-8
+        given = (("\u00a0", "\u00c1"),)
+        expect = '%C2%A0=%C3%81'
+        result = urllib.parse.urlencode(given, True)
+        self.assertEqual(expect, result)
+
+        given = (("\u00a0", (42, "\u00c1")),)
+        expect = '%C2%A0=42&%C2%A0=%C3%81'
+        result = urllib.parse.urlencode(given, True)
+        self.assertEqual(expect, result)
+
+        # latin-1
+        given = (("\u00a0", "\u00c1"),)
+        expect = '%A0=%C1'
+        result = urllib.parse.urlencode(given, True, encoding="latin-1")
+        self.assertEqual(expect, result)
+
+        given = (("\u00a0", (42, "\u00c1")),)
+        expect = '%A0=42&%A0=%C1'
+        result = urllib.parse.urlencode(given, True, encoding="latin-1")
+        self.assertEqual(expect, result)
+
+    def test_urlencode_bytes(self):
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        expect = '%A0%24=%C1%24'
+        result = urllib.parse.urlencode(given)
+        self.assertEqual(expect, result)
+        result = urllib.parse.urlencode(given, True)
+        self.assertEqual(expect, result)
+
+        # Sequence of values
+        given = ((b'\xa0\x24', (42, b'\xc1\x24')),)
+        expect = '%A0%24=42&%A0%24=%C1%24'
+        result = urllib.parse.urlencode(given, True)
+        self.assertEqual(expect, result)
+
+    def test_urlencode_encoding_safe_parameter(self):
+
+        # Send '$' (\x24) as safe character
+        # Default utf-8 encoding
+
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        result = urllib.parse.urlencode(given, safe=":$")
+        expect = '%A0$=%C1$'
+        self.assertEqual(expect, result)
+
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        result = urllib.parse.urlencode(given, doseq=True, safe=":$")
+        expect = '%A0$=%C1$'
+        self.assertEqual(expect, result)
+
+        # Safe parameter in sequence
+        given = ((b'\xa0\x24', (b'\xc1\x24', 0xd, 42)),)
+        expect = '%A0$=%C1$&%A0$=13&%A0$=42'
+        result = urllib.parse.urlencode(given, True, safe=":$")
+        self.assertEqual(expect, result)
+
+        # Test all above in latin-1 encoding
+
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        result = urllib.parse.urlencode(given, safe=":$",
+                                        encoding="latin-1")
+        expect = '%A0$=%C1$'
+        self.assertEqual(expect, result)
+
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        expect = '%A0$=%C1$'
+        result = urllib.parse.urlencode(given, doseq=True, safe=":$",
+                                        encoding="latin-1")
+
+        given = ((b'\xa0\x24', (b'\xc1\x24', 0xd, 42)),)
+        expect = '%A0$=%C1$&%A0$=13&%A0$=42'
+        result = urllib.parse.urlencode(given, True, safe=":$",
+                                        encoding="latin-1")
+        self.assertEqual(expect, result)
+
 class Pathname_Tests(unittest.TestCase):
     """Test pathname2url() and url2pathname()"""
 

Modified: python/branches/py3k/Lib/urllib/parse.py
==============================================================================
--- python/branches/py3k/Lib/urllib/parse.py	(original)
+++ python/branches/py3k/Lib/urllib/parse.py	Sat Jul  3 19:48:22 2010
@@ -559,7 +559,7 @@
         _safe_quoters[safe] = quoter = Quoter(safe).__getitem__
     return ''.join([quoter(char) for char in bs])
 
-def urlencode(query, doseq=False):
+def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
     """Encode a sequence of two-element tuples or dictionary into a URL query string.
 
     If any values in the query arg are sequences and doseq is true, each
@@ -568,6 +568,10 @@
     If the query arg is a sequence of two-element tuples, the order of the
     parameters in the output will match the order of parameters in the
     input.
+
+    The query arg may be either a string or a bytes type. When query arg is a
+    string, the safe, encoding and error parameters are sent the quote_plus for
+    encoding.
     """
 
     if hasattr(query, "items"):
@@ -592,14 +596,28 @@
     l = []
     if not doseq:
         for k, v in query:
-            k = quote_plus(str(k))
-            v = quote_plus(str(v))
+            if isinstance(k, bytes):
+                k = quote_plus(k, safe)
+            else:
+                k = quote_plus(str(k), safe, encoding, errors)
+
+            if isinstance(v, bytes):
+                v = quote_plus(v, safe)
+            else:
+                v = quote_plus(str(v), safe, encoding, errors)
             l.append(k + '=' + v)
     else:
         for k, v in query:
-            k = quote_plus(str(k))
-            if isinstance(v, str):
-                v = quote_plus(v)
+            if isinstance(k, bytes):
+                k = quote_plus(k, safe)
+            else:
+                k = quote_plus(str(k), safe, encoding, errors)
+
+            if isinstance(v, bytes):
+                v = quote_plus(v, safe)
+                l.append(k + '=' + v)
+            elif isinstance(v, str):
+                v = quote_plus(v, safe, encoding, errors)
                 l.append(k + '=' + v)
             else:
                 try:
@@ -607,12 +625,16 @@
                     x = len(v)
                 except TypeError:
                     # not a sequence
-                    v = quote_plus(str(v))
+                    v = quote_plus(str(v), safe, encoding, errors)
                     l.append(k + '=' + v)
                 else:
                     # loop over the sequence
                     for elt in v:
-                        l.append(k + '=' + quote_plus(str(elt)))
+                        if isinstance(elt, bytes):
+                            elt = quote_plus(elt, safe)
+                        else:
+                            elt = quote_plus(str(elt), safe, encoding, errors)
+                        l.append(k + '=' + elt)
     return '&'.join(l)
 
 # Utilities to parse URLs (most of these return None for missing parts):

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Jul  3 19:48:22 2010
@@ -468,6 +468,9 @@
 Library
 -------
 
+- Issue #5468: urlencode to handle bytes type and other encodings in its query
+  parameter. Patch by Dan Mahn.
+
 - Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
   module, ensure that the input string length is a multiple of the frame size
 

From python-checkins at python.org  Sat Jul  3 19:55:41 2010
From: python-checkins at python.org (senthil.kumaran)
Date: Sat,  3 Jul 2010 19:55:41 +0200 (CEST)
Subject: [Python-checkins] r82511 - in python/branches/release31-maint:
	Doc/library/urllib.parse.rst Lib/test/test_urllib.py
	Lib/urllib/parse.py Misc/NEWS
Message-ID: <20100703175541.A9F43ED67@mail.python.org>

Author: senthil.kumaran
Date: Sat Jul  3 19:55:41 2010
New Revision: 82511

Log:
Merged revisions 82510 via svnmerge from 
svn+ssh://pythondev at svn.python.org/python/branches/py3k

........
  r82510 | senthil.kumaran | 2010-07-03 23:18:22 +0530 (Sat, 03 Jul 2010) | 4 lines
  
  Fix Issue5468 - urlencode to handle bytes and other alternate encodings.
  (Extensive tests provided). Patch by Dan Mahn.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/urllib.parse.rst
   python/branches/release31-maint/Lib/test/test_urllib.py
   python/branches/release31-maint/Lib/urllib/parse.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Doc/library/urllib.parse.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/urllib.parse.rst	(original)
+++ python/branches/release31-maint/Doc/library/urllib.parse.rst	Sat Jul  3 19:55:41 2010
@@ -307,23 +307,29 @@
    ``b'a&\xef'``.
 
 
-.. function:: urlencode(query, doseq=False)
+.. function:: urlencode(query, doseq=False, safe='', encoding=None, errors=None)
 
-   Convert a mapping object or a sequence of two-element tuples  to a
-   "url-encoded" string, suitable to pass to :func:`urlopen` above as the
-   optional *data* argument.  This is useful to pass a dictionary of form
-   fields to a ``POST`` request.  The resulting string is a series of
-   ``key=value`` pairs separated by ``'&'`` characters, where both *key* and
-   *value* are quoted using :func:`quote_plus` above. When a sequence of
-   two-element tuples is used as the *query* argument, the first element of
-   each tuple is a key and the second is a value. The value element in itself
-   can be a sequence and in that case, if the optional parameter *doseq* is
-   evaluates to *True*, individual ``key=value`` pairs separated by ``'&'``are
-   generated for each element of the value sequence for the key.  The order of
-   parameters in the encoded string will match the order of parameter tuples in
-   the sequence. This module provides the functions :func:`parse_qs` and
-   :func:`parse_qsl` which are used to parse query strings into Python data
-   structures.
+   Convert a mapping object or a sequence of two-element, which may either be a
+   :class:`str` or a :class:`bytes` tuples,  to a "url-encoded" string,
+   suitable to pass to :func:`urlopen` above as the optional *data* argument.
+   This is useful to pass a dictionary of form fields to a ``POST`` request.
+   The resulting string is a series of ``key=value`` pairs separated by ``'&'``
+   characters, where both *key* and *value* are quoted using :func:`quote_plus`
+   above. When a sequence of two-element tuples is used as the *query*
+   argument, the first element of each tuple is a key and the second is a
+   value. The value element in itself can be a sequence and in that case, if
+   the optional parameter *doseq* is evaluates to *True*, individual
+   ``key=value`` pairs separated by ``'&'`` are generated for each element of
+   the value sequence for the key.  The order of parameters in the encoded
+   string will match the order of parameter tuples in the sequence. This module
+   provides the functions :func:`parse_qs` and :func:`parse_qsl` which are used
+   to parse query strings into Python data structures.
+
+   When *query* parameter is a :class:`str`, the *safe*, *encoding* and *error*
+   parameters are sent the :func:`quote_plus` for encoding.
+
+   .. versionchanged:: 3.2
+      query paramater supports bytes and string.
 
 
 .. seealso::

Modified: python/branches/release31-maint/Lib/test/test_urllib.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_urllib.py	(original)
+++ python/branches/release31-maint/Lib/test/test_urllib.py	Sat Jul  3 19:55:41 2010
@@ -797,6 +797,116 @@
         self.assertEqual("a=a&a=b",
                          urllib.parse.urlencode({"a": {"a": 1, "b": 1}}, True))
 
+    def test_urlencode_encoding(self):
+        # ASCII encoding. Expect %3F with errors="replace'
+        given = (('\u00a0', '\u00c1'),)
+        expect = '%3F=%3F'
+        result = urllib.parse.urlencode(given, encoding="ASCII", errors="replace")
+        self.assertEqual(expect, result)
+
+        # Default is UTF-8 encoding.
+        given = (('\u00a0', '\u00c1'),)
+        expect = '%C2%A0=%C3%81'
+        result = urllib.parse.urlencode(given)
+        self.assertEqual(expect, result)
+
+        # Latin-1 encoding.
+        given = (('\u00a0', '\u00c1'),)
+        expect = '%A0=%C1'
+        result = urllib.parse.urlencode(given, encoding="latin-1")
+        self.assertEqual(expect, result)
+
+    def test_urlencode_encoding_doseq(self):
+        # ASCII Encoding. Expect %3F with errors="replace'
+        given = (('\u00a0', '\u00c1'),)
+        expect = '%3F=%3F'
+        result = urllib.parse.urlencode(given, doseq=True,
+                                        encoding="ASCII", errors="replace")
+        self.assertEqual(expect, result)
+
+        # ASCII Encoding. On a sequence of values.
+        given = (("\u00a0", (1, "\u00c1")),)
+        expect = '%3F=1&%3F=%3F'
+        result = urllib.parse.urlencode(given, True,
+                                        encoding="ASCII", errors="replace")
+        self.assertEqual(expect, result)
+
+        # Utf-8
+        given = (("\u00a0", "\u00c1"),)
+        expect = '%C2%A0=%C3%81'
+        result = urllib.parse.urlencode(given, True)
+        self.assertEqual(expect, result)
+
+        given = (("\u00a0", (42, "\u00c1")),)
+        expect = '%C2%A0=42&%C2%A0=%C3%81'
+        result = urllib.parse.urlencode(given, True)
+        self.assertEqual(expect, result)
+
+        # latin-1
+        given = (("\u00a0", "\u00c1"),)
+        expect = '%A0=%C1'
+        result = urllib.parse.urlencode(given, True, encoding="latin-1")
+        self.assertEqual(expect, result)
+
+        given = (("\u00a0", (42, "\u00c1")),)
+        expect = '%A0=42&%A0=%C1'
+        result = urllib.parse.urlencode(given, True, encoding="latin-1")
+        self.assertEqual(expect, result)
+
+    def test_urlencode_bytes(self):
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        expect = '%A0%24=%C1%24'
+        result = urllib.parse.urlencode(given)
+        self.assertEqual(expect, result)
+        result = urllib.parse.urlencode(given, True)
+        self.assertEqual(expect, result)
+
+        # Sequence of values
+        given = ((b'\xa0\x24', (42, b'\xc1\x24')),)
+        expect = '%A0%24=42&%A0%24=%C1%24'
+        result = urllib.parse.urlencode(given, True)
+        self.assertEqual(expect, result)
+
+    def test_urlencode_encoding_safe_parameter(self):
+
+        # Send '$' (\x24) as safe character
+        # Default utf-8 encoding
+
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        result = urllib.parse.urlencode(given, safe=":$")
+        expect = '%A0$=%C1$'
+        self.assertEqual(expect, result)
+
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        result = urllib.parse.urlencode(given, doseq=True, safe=":$")
+        expect = '%A0$=%C1$'
+        self.assertEqual(expect, result)
+
+        # Safe parameter in sequence
+        given = ((b'\xa0\x24', (b'\xc1\x24', 0xd, 42)),)
+        expect = '%A0$=%C1$&%A0$=13&%A0$=42'
+        result = urllib.parse.urlencode(given, True, safe=":$")
+        self.assertEqual(expect, result)
+
+        # Test all above in latin-1 encoding
+
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        result = urllib.parse.urlencode(given, safe=":$",
+                                        encoding="latin-1")
+        expect = '%A0$=%C1$'
+        self.assertEqual(expect, result)
+
+        given = ((b'\xa0\x24', b'\xc1\x24'),)
+        expect = '%A0$=%C1$'
+        result = urllib.parse.urlencode(given, doseq=True, safe=":$",
+                                        encoding="latin-1")
+
+        given = ((b'\xa0\x24', (b'\xc1\x24', 0xd, 42)),)
+        expect = '%A0$=%C1$&%A0$=13&%A0$=42'
+        result = urllib.parse.urlencode(given, True, safe=":$",
+                                        encoding="latin-1")
+        self.assertEqual(expect, result)
+
 class Pathname_Tests(unittest.TestCase):
     """Test pathname2url() and url2pathname()"""
 

Modified: python/branches/release31-maint/Lib/urllib/parse.py
==============================================================================
--- python/branches/release31-maint/Lib/urllib/parse.py	(original)
+++ python/branches/release31-maint/Lib/urllib/parse.py	Sat Jul  3 19:55:41 2010
@@ -533,7 +533,7 @@
         _safe_quoters[cachekey] = quoter
     return ''.join([quoter[char] for char in bs])
 
-def urlencode(query, doseq=False):
+def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
     """Encode a sequence of two-element tuples or dictionary into a URL query string.
 
     If any values in the query arg are sequences and doseq is true, each
@@ -542,6 +542,10 @@
     If the query arg is a sequence of two-element tuples, the order of the
     parameters in the output will match the order of parameters in the
     input.
+
+    The query arg may be either a string or a bytes type. When query arg is a
+    string, the safe, encoding and error parameters are sent the quote_plus for
+    encoding.
     """
 
     if hasattr(query, "items"):
@@ -566,14 +570,28 @@
     l = []
     if not doseq:
         for k, v in query:
-            k = quote_plus(str(k))
-            v = quote_plus(str(v))
+            if isinstance(k, bytes):
+                k = quote_plus(k, safe)
+            else:
+                k = quote_plus(str(k), safe, encoding, errors)
+
+            if isinstance(v, bytes):
+                v = quote_plus(v, safe)
+            else:
+                v = quote_plus(str(v), safe, encoding, errors)
             l.append(k + '=' + v)
     else:
         for k, v in query:
-            k = quote_plus(str(k))
-            if isinstance(v, str):
-                v = quote_plus(v)
+            if isinstance(k, bytes):
+                k = quote_plus(k, safe)
+            else:
+                k = quote_plus(str(k), safe, encoding, errors)
+
+            if isinstance(v, bytes):
+                v = quote_plus(v, safe)
+                l.append(k + '=' + v)
+            elif isinstance(v, str):
+                v = quote_plus(v, safe, encoding, errors)
                 l.append(k + '=' + v)
             else:
                 try:
@@ -581,12 +599,16 @@
                     x = len(v)
                 except TypeError:
                     # not a sequence
-                    v = quote_plus(str(v))
+                    v = quote_plus(str(v), safe, encoding, errors)
                     l.append(k + '=' + v)
                 else:
                     # loop over the sequence
                     for elt in v:
-                        l.append(k + '=' + quote_plus(str(elt)))
+                        if isinstance(elt, bytes):
+                            elt = quote_plus(elt, safe)
+                        else:
+                            elt = quote_plus(str(elt), safe, encoding, errors)
+                        l.append(k + '=' + elt)
     return '&'.join(l)
 
 # Utilities to parse URLs (most of these return None for missing parts):

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sat Jul  3 19:55:41 2010
@@ -75,6 +75,9 @@
 Library
 -------
 
+- Issue #5468: urlencode to handle bytes type and other encodings in its query
+  parameter. Patch by Dan Mahn.
+
 - Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
   module, ensure that the input string length is a multiple of the frame size
 

From python-checkins at python.org  Sat Jul  3 20:04:31 2010
From: python-checkins at python.org (senthil.kumaran)
Date: Sat,  3 Jul 2010 20:04:31 +0200 (CEST)
Subject: [Python-checkins] r82512 -
	python/branches/release31-maint/Doc/library/urllib.parse.rst
Message-ID: <20100703180431.9B106EE99D@mail.python.org>

Author: senthil.kumaran
Date: Sat Jul  3 20:04:31 2010
New Revision: 82512

Log:
Minor change in the wording.



Modified:
   python/branches/release31-maint/Doc/library/urllib.parse.rst

Modified: python/branches/release31-maint/Doc/library/urllib.parse.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/urllib.parse.rst	(original)
+++ python/branches/release31-maint/Doc/library/urllib.parse.rst	Sat Jul  3 20:04:31 2010
@@ -309,8 +309,8 @@
 
 .. function:: urlencode(query, doseq=False, safe='', encoding=None, errors=None)
 
-   Convert a mapping object or a sequence of two-element, which may either be a
-   :class:`str` or a :class:`bytes` tuples,  to a "url-encoded" string,
+   Convert a mapping object or a sequence of two-element tuples, which may
+   either be a :class:`str` or a :class:`bytes`,  to a "url-encoded" string,
    suitable to pass to :func:`urlopen` above as the optional *data* argument.
    This is useful to pass a dictionary of form fields to a ``POST`` request.
    The resulting string is a series of ``key=value`` pairs separated by ``'&'``

From python-checkins at python.org  Sat Jul  3 20:24:52 2010
From: python-checkins at python.org (benjamin.peterson)
Date: Sat,  3 Jul 2010 20:24:52 +0200 (CEST)
Subject: [Python-checkins] r82513 -
	python/branches/release27-maint/Doc/whatsnew/2.7.rst
Message-ID: <20100703182452.C96F9EE99E@mail.python.org>

Author: benjamin.peterson
Date: Sat Jul  3 20:24:52 2010
New Revision: 82513

Log:
fix date

Modified:
   python/branches/release27-maint/Doc/whatsnew/2.7.rst

Modified: python/branches/release27-maint/Doc/whatsnew/2.7.rst
==============================================================================
--- python/branches/release27-maint/Doc/whatsnew/2.7.rst	(original)
+++ python/branches/release27-maint/Doc/whatsnew/2.7.rst	Sat Jul  3 20:24:52 2010
@@ -52,7 +52,7 @@
    when researching a change.
 
 This article explains the new features in Python 2.7.  Python 2.7 was released
-on July 7, 2010.
+on July 3, 2010.
 
 Numeric handling has been improved in many ways, for both
 floating-point numbers and for the :class:`~decimal.Decimal` class.

From python-checkins at python.org  Sat Jul  3 22:35:53 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Sat,  3 Jul 2010 22:35:53 +0200 (CEST)
Subject: [Python-checkins] r82514 - in python/branches/py3k:
	Lib/pickletools.py Misc/NEWS
Message-ID: <20100703203553.2FB99EE982@mail.python.org>

Author: alexander.belopolsky
Date: Sat Jul  3 22:35:53 2010
New Revision: 82514

Log:
Issue #9094: Make python -m pickletools disassemble pickles given in
the command line.


Modified:
   python/branches/py3k/Lib/pickletools.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/pickletools.py
==============================================================================
--- python/branches/py3k/Lib/pickletools.py	(original)
+++ python/branches/py3k/Lib/pickletools.py	Sat Jul  3 22:35:53 2010
@@ -2330,4 +2330,43 @@
     return doctest.testmod()
 
 if __name__ == "__main__":
-    _test()
+    import sys, argparse
+    parser = argparse.ArgumentParser(
+        description='disassemble one or more pickle files')
+    parser.add_argument(
+        'pickle_file', type=argparse.FileType('br'),
+        nargs='*', help='the pickle file')
+    parser.add_argument(
+        '-o', '--output', default=sys.stdout, type=argparse.FileType('w'),
+        help='the file where the output should be written')
+    parser.add_argument(
+        '-m', '--memo', action='store_true',
+        help='preserve memo between disassemblies')
+    parser.add_argument(
+        '-l', '--indentlevel', default=4, type=int,
+        help='the number of blanks by which to indent a new MARK level')
+    parser.add_argument(
+        '-p', '--preamble', default="==> {name} <==",
+        help='if more than one pickle file is specified, print this before'
+        ' each disassembly')
+    parser.add_argument(
+        '-t', '--test', action='store_true',
+        help='run self-test suite')
+    parser.add_argument(
+        '-v', action='store_true',
+        help='run verbosely; only affects self-test run')
+    args = parser.parse_args()
+    if args.test:
+        _test()
+    else:
+        if not args.pickle_file:
+            parser.print_help()
+        elif len(args.pickle_file) == 1:
+            dis(args.pickle_file[0], args.output,
+                indentlevel=args.indentlevel)
+        else:
+            memo = {} if args.memo else None
+            for f in args.pickle_file:
+                preamble = args.preamble.format(name=f.name)
+                args.output.write(preamble + '\n')
+                dis(f, args.output, memo, args.indentlevel)

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Jul  3 22:35:53 2010
@@ -468,6 +468,10 @@
 Library
 -------
 
+- Issue #9094: python -m pickletools will now disassemble pickle files
+  listed in the command line arguments.  See output of python -m
+  pickletools -h for more details.
+
 - Issue #5468: urlencode to handle bytes type and other encodings in its query
   parameter. Patch by Dan Mahn.
 

From python-checkins at python.org  Sat Jul  3 23:00:51 2010
From: python-checkins at python.org (mark.dickinson)
Date: Sat,  3 Jul 2010 23:00:51 +0200 (CEST)
Subject: [Python-checkins] r82515 - python/branches/py3k/Tools/README
Message-ID: <20100703210051.ADAD3EE989@mail.python.org>

Author: mark.dickinson
Date: Sat Jul  3 23:00:51 2010
New Revision: 82515

Log:
Remove nonexistent tools from Tools README.

Modified:
   python/branches/py3k/Tools/README

Modified: python/branches/py3k/Tools/README
==============================================================================
--- python/branches/py3k/Tools/README	(original)
+++ python/branches/py3k/Tools/README	Sat Jul  3 23:00:51 2010
@@ -1,15 +1,6 @@
 This directory contains a number of Python programs that are useful
 while building or extending Python.
 
-audiopy		Audiopy is a program to control the Solaris audio
-		device, allowing you to choose both the input and
-		output devices, and to set the output volume, that can
-		be run either as a command-line script, or as a
-		Tkinter application.
-
-compiler	Tools used to maintain the compiler package in the
-		standard library.
-
 faqwiz		FAQ Wizard.
 		See http://www.python.org/cgi-bin/faqw.py
 		for a live example.
@@ -36,8 +27,6 @@
 versioncheck	A tool to automate checking whether you have the latest
 		version of a package (by Jack Jansen).
 
-webchecker	A link checker for web sites.
-
 world		Script to take a list of Internet addresses and print
 		out where in the world those addresses originate from,
 		based on the top-level domain country code found in

From python-checkins at python.org  Sat Jul  3 23:37:28 2010
From: python-checkins at python.org (brett.cannon)
Date: Sat,  3 Jul 2010 23:37:28 +0200 (CEST)
Subject: [Python-checkins] r82516 - python/branches/py3k/Tools/scripts
Message-ID: <20100703213728.40331EE982@mail.python.org>

Author: brett.cannon
Date: Sat Jul  3 23:37:28 2010
New Revision: 82516

Log:
Ignore __pycache__.


Modified:
   python/branches/py3k/Tools/scripts/   (props changed)

From python-checkins at python.org  Sat Jul  3 23:42:47 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Sat,  3 Jul 2010 23:42:47 +0200 (CEST)
Subject: [Python-checkins] r82517 -
	python/branches/py3k/Demo/classes/Dates.py
Message-ID: <20100703214247.8E726EE982@mail.python.org>

Author: alexander.belopolsky
Date: Sat Jul  3 23:42:47 2010
New Revision: 82517

Log:
Issue #9151: Demo/classes/Dates.py does not work in 3.x
Made minimal changes to make included test pass.


Modified:
   python/branches/py3k/Demo/classes/Dates.py

Modified: python/branches/py3k/Demo/classes/Dates.py
==============================================================================
--- python/branches/py3k/Demo/classes/Dates.py	(original)
+++ python/branches/py3k/Demo/classes/Dates.py	Sat Jul  3 23:42:47 2010
@@ -39,7 +39,7 @@
 # Note that as of Python 2.3, a datetime module is included in the stardard
 # library.
 
-# vi:set tabsize=8:
+import functools
 
 _MONTH_NAMES = [ 'January', 'February', 'March', 'April', 'May',
                  'June', 'July', 'August', 'September', 'October',
@@ -57,8 +57,6 @@
     dbm = dbm + dim
 del dbm, dim
 
-_INT_TYPES = type(1), type(1)
-
 def _is_leap(year):           # 1 if leap year, else 0
     if year % 4 != 0: return 0
     if year % 400 == 0: return 1
@@ -85,7 +83,7 @@
 _DI400Y = _days_before_year(400)      # number of days in 400 years
 
 def _num2date(n):             # return date with ordinal n
-    if type(n) not in _INT_TYPES:
+    if not isinstance(n, int):
         raise TypeError('argument must be integer: %r' % type(n))
 
     ans = Date(1,1,1)   # arguments irrelevant; just getting a Date obj
@@ -116,7 +114,7 @@
 def _num2day(n):      # return weekday name of day with ordinal n
     return _DAY_NAMES[ int(n % 7) ]
 
-
+ at functools.total_ordering
 class Date:
     def __init__(self, month, day, year):
         if not 1 <= month <= 12:
@@ -133,8 +131,11 @@
             raise AttributeError('read-only attribute ' + name)
         self.__dict__[name] = value
 
-    def __cmp__(self, other):
-        return cmp(self.ord, other.ord)
+    def __eq__(self, other):
+        return self.ord == other.ord
+
+    def __lt__(self, other):
+        return self.ord < other.ord
 
     # define a hash function so dates can be used as dictionary keys
     def __hash__(self):
@@ -150,14 +151,14 @@
 
     # Python 1.1 coerces neither int+date nor date+int
     def __add__(self, n):
-        if type(n) not in _INT_TYPES:
+        if not isinstance(n, int):
             raise TypeError('can\'t add %r to date' % type(n))
         return _num2date(self.ord + n)
     __radd__ = __add__ # handle int+date
 
     # Python 1.1 coerces neither date-int nor date-date
     def __sub__(self, other):
-        if type(other) in _INT_TYPES:           # date-int
+        if isinstance(other, int):           # date-int
             return _num2date(self.ord - other)
         else:
             return self.ord - other.ord         # date-date

From python-checkins at python.org  Sat Jul  3 23:48:26 2010
From: python-checkins at python.org (brett.cannon)
Date: Sat,  3 Jul 2010 23:48:26 +0200 (CEST)
Subject: [Python-checkins] r82518 - in python/branches/py3k:
	Doc/library/importlib.rst Lib/importlib/__init__.py
	Lib/importlib/_bootstrap.py Lib/importlib/abc.py
	Lib/importlib/test/extension/test_case_sensitivity.py
	Lib/importlib/test/extension/test_finder.py
	Lib/importlib/test/extension/test_loader.py
	Lib/importlib/test/extension/test_path_hook.py
	Lib/importlib/test/import_/test_path.py
	Lib/importlib/test/regrtest.py
	Lib/importlib/test/source/test_abc_loader.py
	Lib/importlib/test/source/test_case_sensitivity.py
	Lib/importlib/test/source/test_file_loader.py
	Lib/importlib/test/source/test_finder.py
	Lib/importlib/test/source/test_path_hook.py
	Lib/importlib/test/source/test_source_encoding.py
	Lib/test/test_runpy.py
Message-ID: <20100703214826.3EAF9EA60@mail.python.org>

Author: brett.cannon
Date: Sat Jul  3 23:48:25 2010
New Revision: 82518

Log:
Make importlib.abc.SourceLoader the primary mechanism for importlib.

This required moving the class from importlib/abc.py into
importlib/_bootstrap.py and jiggering some code to work better with the class.
This included changing how the file finder worked to better meet import
semantics. This also led to fixing importlib to handle the empty string from
sys.path as import currently does (and making me wish we didn't support that
instead just required people to insert '.' instead to represent cwd).

It also required making the new set_data abstractmethod create
any needed subdirectories implicitly thanks to __pycache__ (it was either this
or grow the SourceLoader ABC to gain an 'exists' method and either a mkdir
method or have set_data with no data arg mean to create a directory).

Lastly, as an optimization the file loaders cache the file path where the
finder found something to use for loading (this is thanks to having a
sourceless loader separate from the source loader to simplify the code and
cut out stat calls).
Unfortunately test_runpy assumed a loader would always work for a module, even
if you changed from underneath it what it was expected to work with. By simply
dropping the previous loader in test_runpy so the proper loader can be returned
by the finder fixed the failure.

At this point importlib deviates from import on two points:

1. The exception raised when trying to import a file is different (import does
an explicit file check to print a special message, importlib just says the path
cannot be imported as if it was just some module name).

2. the co_filename on a code object is not being set to where bytecode was
actually loaded from instead of where the marshalled code object originally
came from (a solution for this has already been agreed upon on python-dev but has
not been implemented yet; issue8611).


Modified:
   python/branches/py3k/Doc/library/importlib.rst
   python/branches/py3k/Lib/importlib/__init__.py
   python/branches/py3k/Lib/importlib/_bootstrap.py
   python/branches/py3k/Lib/importlib/abc.py
   python/branches/py3k/Lib/importlib/test/extension/test_case_sensitivity.py
   python/branches/py3k/Lib/importlib/test/extension/test_finder.py
   python/branches/py3k/Lib/importlib/test/extension/test_loader.py
   python/branches/py3k/Lib/importlib/test/extension/test_path_hook.py
   python/branches/py3k/Lib/importlib/test/import_/test_path.py
   python/branches/py3k/Lib/importlib/test/regrtest.py
   python/branches/py3k/Lib/importlib/test/source/test_abc_loader.py
   python/branches/py3k/Lib/importlib/test/source/test_case_sensitivity.py
   python/branches/py3k/Lib/importlib/test/source/test_file_loader.py
   python/branches/py3k/Lib/importlib/test/source/test_finder.py
   python/branches/py3k/Lib/importlib/test/source/test_path_hook.py
   python/branches/py3k/Lib/importlib/test/source/test_source_encoding.py
   python/branches/py3k/Lib/test/test_runpy.py

Modified: python/branches/py3k/Doc/library/importlib.rst
==============================================================================
--- python/branches/py3k/Doc/library/importlib.rst	(original)
+++ python/branches/py3k/Doc/library/importlib.rst	Sat Jul  3 23:48:25 2010
@@ -247,8 +247,11 @@
     .. method:: set_data(self, path, data)
 
         Optional abstract method which writes the specified bytes to a file
-        path. When writing to the path fails because the path is read-only, do
-        not propagate the exception.
+        path. Any intermediate directories which do not exist are to be created
+        automatically.
+
+        When writing to the path fails because the path is read-only
+        (:attr:`errno.EACCES`), do not propagate the exception.
 
     .. method:: get_code(self, fullname)
 

Modified: python/branches/py3k/Lib/importlib/__init__.py
==============================================================================
--- python/branches/py3k/Lib/importlib/__init__.py	(original)
+++ python/branches/py3k/Lib/importlib/__init__.py	Sat Jul  3 23:48:25 2010
@@ -36,7 +36,7 @@
     """
     if 'PYTHONCASEOK' in os.environ:
         return True
-    elif check in os.listdir(directory):
+    elif check in os.listdir(directory if directory else os.getcwd()):
         return True
     return False
 

Modified: python/branches/py3k/Lib/importlib/_bootstrap.py
==============================================================================
--- python/branches/py3k/Lib/importlib/_bootstrap.py	(original)
+++ python/branches/py3k/Lib/importlib/_bootstrap.py	Sat Jul  3 23:48:25 2010
@@ -22,7 +22,7 @@
 def _path_join(*args):
     """Replacement for os.path.join."""
     return path_sep.join(x[:-len(path_sep)] if x.endswith(path_sep) else x
-                            for x in args)
+                            for x in args if x)
 
 
 def _path_exists(path):
@@ -53,6 +53,8 @@
 # XXX Could also expose Modules/getpath.c:isdir()
 def _path_isdir(path):
     """Replacement for os.path.isdir."""
+    if not path:
+        path = _os.getcwd()
     return _path_is_mode_type(path, 0o040000)
 
 
@@ -99,6 +101,8 @@
     new.__dict__.update(old.__dict__)
 
 
+code_type = type(_wrap.__code__)
+
 # Finder/loader utility code ##################################################
 
 def set_package(fxn):
@@ -138,7 +142,7 @@
     the second argument.
 
     """
-    def decorated(self, fullname):
+    def decorated(self, fullname, *args, **kwargs):
         module = sys.modules.get(fullname)
         is_reload = bool(module)
         if not is_reload:
@@ -148,7 +152,7 @@
             module = imp.new_module(fullname)
             sys.modules[fullname] = module
         try:
-            return fxn(self, module)
+            return fxn(self, module, *args, **kwargs)
         except:
             if not is_reload:
                 del sys.modules[fullname]
@@ -301,7 +305,59 @@
         return imp.is_frozen_package(fullname)
 
 
-class SourceLoader:
+class _LoaderBasics:
+
+    """Base class of common code needed by both SourceLoader and
+    _SourcelessFileLoader."""
+
+    def is_package(self, fullname):
+        """Concrete implementation of InspectLoader.is_package by checking if
+        the path returned by get_filename has a filename of '__init__.py'."""
+        filename = self.get_filename(fullname).rpartition(path_sep)[2]
+        return filename.rsplit('.', 1)[0] == '__init__'
+
+    def _bytes_from_bytecode(self, fullname, data, source_mtime):
+        """Return the marshalled bytes from bytecode, verifying the magic
+        number and timestamp alon the way.
+
+        If source_mtime is None then skip the timestamp check.
+
+        """
+        magic = data[:4]
+        raw_timestamp = data[4:8]
+        if len(magic) != 4 or magic != imp.get_magic():
+            raise ImportError("bad magic number in {}".format(fullname))
+        elif len(raw_timestamp) != 4:
+            raise EOFError("bad timestamp in {}".format(fullname))
+        elif source_mtime is not None:
+            if marshal._r_long(raw_timestamp) != source_mtime:
+                raise ImportError("bytecode is stale for {}".format(fullname))
+        # Can't return the code object as errors from marshal loading need to
+        # propagate even when source is available.
+        return data[8:]
+
+    @module_for_loader
+    def _load_module(self, module, *, sourceless=False):
+        """Helper for load_module able to handle either source or sourceless
+        loading."""
+        name = module.__name__
+        code_object = self.get_code(name)
+        module.__file__ = self.get_filename(name)
+        if not sourceless:
+            module.__cached__ = imp.cache_from_source(module.__file__)
+        else:
+            module.__cached__ = module.__file__
+        module.__package__ = name
+        if self.is_package(name):
+            module.__path__ = [module.__file__.rsplit(path_sep, 1)[0]]
+        else:
+            module.__package__ = module.__package__.rpartition('.')[0]
+        module.__loader__ = self
+        exec(code_object, module.__dict__)
+        return module
+
+
+class SourceLoader(_LoaderBasics):
 
     def path_mtime(self, path:str) -> int:
         """Optional method that returns the modification time for the specified
@@ -320,11 +376,6 @@
         """
         raise NotImplementedError
 
-    def is_package(self, fullname):
-        """Concrete implementation of InspectLoader.is_package by checking if
-        the path returned by get_filename has a filename of '__init__.py'."""
-        filename = self.get_filename(fullname).rsplit(path_sep, 1)[1]
-        return filename.rsplit('.', 1)[0] == '__init__'
 
     def get_source(self, fullname):
         """Concrete implementation of InspectLoader.get_source."""
@@ -359,12 +410,18 @@
                 except IOError:
                     pass
                 else:
-                    magic = data[:4]
-                    raw_timestamp = data[4:8]
-                    if (len(magic) == 4 and len(raw_timestamp) == 4 and
-                            magic == imp.get_magic() and
-                            marshal._r_long(raw_timestamp) == source_mtime):
-                        return marshal.loads(data[8:])
+                    try:
+                        bytes_data = self._bytes_from_bytecode(fullname, data,
+                                                               source_mtime)
+                    except (ImportError, EOFError):
+                        pass
+                    else:
+                        found = marshal.loads(bytes_data)
+                        if isinstance(found, code_type):
+                            return found
+                        else:
+                            msg = "Non-code object in {}"
+                            raise ImportError(msg.format(bytecode_path))
         source_bytes = self.get_data(source_path)
         code_object = compile(source_bytes, source_path, 'exec',
                                 dont_inherit=True)
@@ -382,8 +439,7 @@
                 pass
         return code_object
 
-    @module_for_loader
-    def load_module(self, module):
+    def load_module(self, fullname):
         """Concrete implementation of Loader.load_module.
 
         Requires ExecutionLoader.get_filename and ResourceLoader.get_data to be
@@ -391,31 +447,17 @@
         get_code uses/writes bytecode.
 
         """
-        name = module.__name__
-        code_object = self.get_code(name)
-        module.__file__ = self.get_filename(name)
-        module.__cached__ = imp.cache_from_source(module.__file__)
-        module.__package__ = name
-        is_package = self.is_package(name)
-        if is_package:
-            module.__path__ = [module.__file__.rsplit(path_sep, 1)[0]]
-        else:
-            module.__package__ = module.__package__.rpartition('.')[0]
-        module.__loader__ = self
-        exec(code_object, module.__dict__)
-        return module
-
+        return self._load_module(fullname)
 
-class _SourceFileLoader(SourceLoader):
 
-    """Concrete implementation of SourceLoader.
+class _FileLoader:
 
-    NOT A PUBLIC CLASS! Do not expect any API stability from this class, so DO
-    NOT SUBCLASS IN YOUR OWN CODE!
-
-    """
+    """Base file loader class which implements the loader protocol methods that
+    require file system usage."""
 
     def __init__(self, fullname, path):
+        """Cache the module name and the path to the file found by the
+        finder."""
         self._name = fullname
         self._path = path
 
@@ -424,272 +466,66 @@
         """Return the path to the source file as found by the finder."""
         return self._path
 
+    def get_data(self, path):
+        """Return the data from path as raw bytes."""
+        with _closing(_io.FileIO(path, 'r')) as file:
+            return file.read()
+
+
+class _SourceFileLoader(_FileLoader, SourceLoader):
+
+    """Concrete implementation of SourceLoader using the file system."""
+
     def path_mtime(self, path):
         """Return the modification time for the path."""
         return int(_os.stat(path).st_mtime)
 
-    def set_data(self, data, path):
+    def set_data(self, path, data):
         """Write bytes data to a file."""
         try:
-            with _closing(_io.FileIO(bytecode_path, 'w')) as file:
+            with _closing(_io.FileIO(path, 'wb')) as file:
                 file.write(data)
         except IOError as exc:
-            if exc.errno != errno.EACCES:
+            if exc.errno == errno.ENOENT:
+                directory, _, filename = path.rpartition(path_sep)
+                sub_directories = []
+                while not _path_isdir(directory):
+                    directory, _, sub_dir = directory.rpartition(path_sep)
+                    sub_directories.append(sub_dir)
+                    for part in reversed(sub_directories):
+                        directory = _path_join(directory, part)
+                        try:
+                            _os.mkdir(directory)
+                        except IOError as exc:
+                            if exc.errno != errno.EACCES:
+                                raise
+                            else:
+                                return
+                return self.set_data(path, data)
+            elif exc.errno != errno.EACCES:
                 raise
 
 
-class PyLoader:
-
-    """Loader base class for Python source code.
-
-    Subclasses need to implement the methods:
-
-    - source_path
-    - get_data
-    - is_package
-
-    """
-
-    @module_for_loader
-    def load_module(self, module):
-        """Initialize the module."""
-        name = module.__name__
-        code_object = self.get_code(module.__name__)
-        module.__file__ = self.get_filename(name)
-        if self.is_package(name):
-            module.__path__  = [module.__file__.rsplit(path_sep, 1)[0]]
-        module.__package__ = module.__name__
-        if not hasattr(module, '__path__'):
-            module.__package__ = module.__package__.rpartition('.')[0]
-        module.__loader__ = self
-        exec(code_object, module.__dict__)
-        return module
-
-    def get_filename(self, fullname):
-        """Return the path to the source file, else raise ImportError."""
-        path = self.source_path(fullname)
-        if path is not None:
-            return path
-        else:
-            raise ImportError("no source path available for "
-                                "{0!r}".format(fullname))
-
-    def get_code(self, fullname):
-        """Get a code object from source."""
-        source_path = self.source_path(fullname)
-        if source_path is None:
-            message = "a source path must exist to load {0}".format(fullname)
-            raise ImportError(message)
-        source = self.get_data(source_path)
-        return compile(source, source_path, 'exec', dont_inherit=True)
-
-    # Never use in implementing import! Imports code within the method.
-    def get_source(self, fullname):
-        """Return the source code for a module.
-
-        self.source_path() and self.get_data() are used to implement this
-        method.
-
-        """
-        path = self.source_path(fullname)
-        if path is None:
-            return None
-        try:
-            source_bytes = self.get_data(path)
-        except IOError:
-            return ImportError("source not available through get_data()")
-        import io
-        import tokenize
-        encoding = tokenize.detect_encoding(io.BytesIO(source_bytes).readline)
-        return source_bytes.decode(encoding[0])
-
-
-class PyPycLoader(PyLoader):
-
-    """Loader base class for Python source and bytecode.
+class _SourcelessFileLoader(_FileLoader, _LoaderBasics):
 
-    Requires implementing the methods needed for PyLoader as well as
-    source_mtime, bytecode_path, and write_bytecode.
+    """Loader which handles sourceless file imports."""
 
-    """
-
-    def get_filename(self, fullname):
-        """Return the source or bytecode file path."""
-        path = self.source_path(fullname)
-        if path is not None:
-            return path
-        path = self.bytecode_path(fullname)
-        if path is not None:
-            return path
-        raise ImportError("no source or bytecode path available for "
-                            "{0!r}".format(fullname))
+    def load_module(self, fullname):
+        return self._load_module(fullname, sourceless=True)
 
     def get_code(self, fullname):
-        """Get a code object from source or bytecode."""
-        # XXX Care enough to make sure this call does not happen if the magic
-        #     number is bad?
-        source_timestamp = self.source_mtime(fullname)
-        # Try to use bytecode if it is available.
-        bytecode_path = self.bytecode_path(fullname)
-        if bytecode_path:
-            data = self.get_data(bytecode_path)
-            try:
-                magic = data[:4]
-                if len(magic) < 4:
-                    raise ImportError("bad magic number in {}".format(fullname))
-                raw_timestamp = data[4:8]
-                if len(raw_timestamp) < 4:
-                    raise EOFError("bad timestamp in {}".format(fullname))
-                pyc_timestamp = marshal._r_long(raw_timestamp)
-                bytecode = data[8:]
-                # Verify that the magic number is valid.
-                if imp.get_magic() != magic:
-                    raise ImportError("bad magic number in {}".format(fullname))
-                # Verify that the bytecode is not stale (only matters when
-                # there is source to fall back on.
-                if source_timestamp:
-                    if pyc_timestamp < source_timestamp:
-                        raise ImportError("bytecode is stale")
-            except (ImportError, EOFError):
-                # If source is available give it a shot.
-                if source_timestamp is not None:
-                    pass
-                else:
-                    raise
-            else:
-                # Bytecode seems fine, so try to use it.
-                # XXX If the bytecode is ill-formed, would it be beneficial to
-                #     try for using source if available and issue a warning?
-                return marshal.loads(bytecode)
-        elif source_timestamp is None:
-            raise ImportError("no source or bytecode available to create code "
-                                "object for {0!r}".format(fullname))
-        # Use the source.
-        code_object = super().get_code(fullname)
-        # Generate bytecode and write it out.
-        if not sys.dont_write_bytecode:
-            data = bytearray(imp.get_magic())
-            data.extend(marshal._w_long(source_timestamp))
-            data.extend(marshal.dumps(code_object))
-            self.write_bytecode(fullname, data)
-        return code_object
-
-
-class _PyFileLoader(PyLoader):
-
-    """Load a Python source file."""
-
-    def __init__(self, name, path, is_pkg):
-        self._name = name
-        self._is_pkg = is_pkg
-        # Figure out the base path based on whether it was source or bytecode
-        # that was found.
-        try:
-            self._base_path = _path_without_ext(path, imp.PY_SOURCE)
-        except ValueError:
-            self._base_path = _path_without_ext(path, imp.PY_COMPILED)
-
-    def _find_path(self, ext_type):
-        """Find a path from the base path and the specified extension type that
-        exists, returning None if one is not found."""
-        for suffix in _suffix_list(ext_type):
-            path = self._base_path + suffix
-            if _path_exists(path):
-                return path
+        path = self.get_filename(fullname)
+        data = self.get_data(path)
+        bytes_data = self._bytes_from_bytecode(fullname, data, None)
+        found = marshal.loads(bytes_data)
+        if isinstance(found, code_type):
+            return found
         else:
-            return None
-
-    @_check_name
-    def source_path(self, fullname):
-        """Return the path to an existing source file for the module, or None
-        if one cannot be found."""
-        # Not a property so that it is easy to override.
-        return self._find_path(imp.PY_SOURCE)
-
-    def get_data(self, path):
-        """Return the data from path as raw bytes."""
-        return _io.FileIO(path, 'r').read()  # Assuming bytes.
-
-    @_check_name
-    def is_package(self, fullname):
-        """Return a boolean based on whether the module is a package.
-
-        Raises ImportError (like get_source) if the loader cannot handle the
-        package.
-
-        """
-        return self._is_pkg
-
-
-class _PyPycFileLoader(PyPycLoader, _PyFileLoader):
-
-    """Load a module from a source or bytecode file."""
-
-    def _find_path(self, ext_type):
-        """Return PEP 3147 path if ext_type is PY_COMPILED, otherwise
-        super()._find_path() is called."""
-        if ext_type == imp.PY_COMPILED:
-            # We don't really care what the extension on self._base_path is,
-            # as long as it has exactly one dot.
-            source_path = self._base_path + '.py'
-            pycache_path = imp.cache_from_source(source_path)
-            legacy_path = self._base_path + '.pyc'
-            # The rule is: if the source file exists, then Python always uses
-            # the __pycache__/foo.<tag>.pyc file.  If the source file does not
-            # exist, then Python uses the legacy path.
-            pyc_path = (pycache_path
-                        if _path_exists(source_path)
-                        else legacy_path)
-            return (pyc_path if _path_exists(pyc_path) else None)
-        return super()._find_path(ext_type)
-
-    @_check_name
-    def source_mtime(self, name):
-        """Return the modification time of the source for the specified
-        module."""
-        source_path = self.source_path(name)
-        if not source_path:
-            return None
-        return int(_os.stat(source_path).st_mtime)
-
-    @_check_name
-    def bytecode_path(self, fullname):
-        """Return the path to a bytecode file, or None if one does not
-        exist."""
-        # Not a property for easy overriding.
-        return self._find_path(imp.PY_COMPILED)
+            raise ImportError("Non-code object in {}".format(path))
 
-    @_check_name
-    def write_bytecode(self, name, data):
-        """Write out 'data' for the specified module, returning a boolean
-        signifying if the write-out actually occurred.
-
-        Raises ImportError (just like get_source) if the specified module
-        cannot be handled by the loader.
-
-        """
-        bytecode_path = self.bytecode_path(name)
-        if not bytecode_path:
-            source_path = self.source_path(name)
-            bytecode_path = imp.cache_from_source(source_path)
-            # Ensure that the __pycache__ directory exists.  We can't use
-            # os.path.dirname() here.
-            dirname, sep, basename = bytecode_path.rpartition(path_sep)
-            try:
-                _os.mkdir(dirname)
-            except OSError as error:
-                if error.errno != errno.EEXIST:
-                    raise
-        try:
-            # Assuming bytes.
-            with _closing(_io.FileIO(bytecode_path, 'w')) as bytecode_file:
-                bytecode_file.write(data)
-                return True
-        except IOError as exc:
-            if exc.errno == errno.EACCES:
-                return False
-            else:
-                raise
+    def get_source(self, fullname):
+        """Return None as there is no source code."""
+        return None
 
 
 class _ExtensionFileLoader:
@@ -700,7 +536,7 @@
 
     """
 
-    def __init__(self, name, path, is_pkg):
+    def __init__(self, name, path):
         """Initialize the loader.
 
         If is_pkg is True then an exception is raised as extension modules
@@ -709,8 +545,6 @@
         """
         self._name = name
         self._path = path
-        if is_pkg:
-            raise ValueError("extension modules cannot be packages")
 
     @_check_name
     @set_package
@@ -808,147 +642,88 @@
             return None
 
 
-class _ChainedFinder:
-
-    """Finder that sequentially calls other finders."""
-
-    def __init__(self, *finders):
-        self._finders = finders
-
-    def find_module(self, fullname, path=None):
-        for finder in self._finders:
-            result = finder.find_module(fullname, path)
-            if result:
-                return result
-        else:
-            return None
-
-
 class _FileFinder:
 
-    """Base class for file finders.
-
-    Subclasses are expected to define the following attributes:
-
-        * _suffixes
-            Sequence of file suffixes whose order will be followed.
-
-        * _possible_package
-            True if importer should check for packages.
+    """File-based finder.
 
-        * _loader
-            A callable that takes the module name, a file path, and whether
-            the path points to a package and returns a loader for the module
-            found at that path.
+    Constructor takes a list of objects detailing what file extensions their
+    loader supports along with whether it can be used for a package.
 
     """
 
-    def __init__(self, path_entry):
-        """Initialize an importer for the passed-in sys.path entry (which is
-        assumed to have already been verified as an existing directory).
+    def __init__(self, path, *details):
+        """Initialize with finder details."""
+        packages = []
+        modules = []
+        for detail in details:
+            modules.extend((suffix, detail.loader) for suffix in detail.suffixes)
+            if detail.supports_packages:
+                packages.extend((suffix, detail.loader)
+                                for suffix in detail.suffixes)
+        self.packages = packages
+        self.modules = modules
+        self.path = path
 
-        Can be used as an entry on sys.path_hook.
-
-        """
-        absolute_path = _path_absolute(path_entry)
-        if not _path_isdir(absolute_path):
-            raise ImportError("only directories are supported")
-        self._path_entry = absolute_path
-
-    def find_module(self, fullname, path=None):
+    def find_module(self, fullname):
+        """Try to find a loader for the specified module."""
         tail_module = fullname.rpartition('.')[2]
-        package_directory = None
-        if self._possible_package:
-            for ext in self._suffixes:
-                package_directory = _path_join(self._path_entry, tail_module)
-                init_filename = '__init__' + ext
-                package_init = _path_join(package_directory, init_filename)
-                if (_path_isfile(package_init) and
-                        _case_ok(self._path_entry, tail_module) and
-                        _case_ok(package_directory, init_filename)):
-                    return self._loader(fullname, package_init, True)
-        for ext in self._suffixes:
-            file_name = tail_module + ext
-            file_path = _path_join(self._path_entry, file_name)
-            if (_path_isfile(file_path) and
-                    _case_ok(self._path_entry, file_name)):
-                return self._loader(fullname, file_path, False)
-        else:
-            # Raise a warning if it matches a directory w/o an __init__ file.
-            if (package_directory is not None and
-                    _path_isdir(package_directory) and
-                    _case_ok(self._path_entry, tail_module)):
-                _warnings.warn("Not importing directory %s: missing __init__"
-                                % package_directory, ImportWarning)
-            return None
-
-
-class _PyFileFinder(_FileFinder):
-
-    """Importer for source/bytecode files."""
-
-    _possible_package = True
-    _loader = _PyFileLoader
-
-    def __init__(self, path_entry):
-        # Lack of imp during class creation means _suffixes is set here.
-        # Make sure that Python source files are listed first!  Needed for an
-        # optimization by the loader.
-        self._suffixes = _suffix_list(imp.PY_SOURCE)
-        super().__init__(path_entry)
-
-
-class _PyPycFileFinder(_PyFileFinder):
+        base_path = _path_join(self.path, tail_module)
+        if _path_isdir(base_path) and _case_ok(self.path, tail_module):
+            for suffix, loader in self.packages:
+                init_filename = '__init__' + suffix
+                full_path = _path_join(base_path, init_filename)
+                if (_path_isfile(full_path) and
+                        _case_ok(base_path, init_filename)):
+                    return loader(fullname, full_path)
+            else:
+                msg = "Not importing directory {}: missing __init__"
+                _warnings.warn(msg.format(base_path), ImportWarning)
+        for suffix, loader in self.modules:
+            mod_filename = tail_module + suffix
+            full_path = _path_join(self.path, mod_filename)
+            if _path_isfile(full_path) and _case_ok(self.path, mod_filename):
+                return loader(fullname, full_path)
+        return None
 
-    """Finder for source and bytecode files."""
+class _SourceFinderDetails:
 
-    _loader = _PyPycFileLoader
+    loader = _SourceFileLoader
+    supports_packages = True
 
-    def __init__(self, path_entry):
-        super().__init__(path_entry)
-        self._suffixes += _suffix_list(imp.PY_COMPILED)
+    def __init__(self):
+        self.suffixes = _suffix_list(imp.PY_SOURCE)
 
+class _SourcelessFinderDetails:
 
+    loader = _SourcelessFileLoader
+    supports_packages = True
 
+    def __init__(self):
+        self.suffixes = _suffix_list(imp.PY_COMPILED)
 
-class _ExtensionFileFinder(_FileFinder):
 
-    """Importer for extension files."""
+class _ExtensionFinderDetails:
 
-    _possible_package = False
-    _loader = _ExtensionFileLoader
+    loader = _ExtensionFileLoader
+    supports_packages = False
 
-    def __init__(self, path_entry):
-        # Assigning to _suffixes here instead of at the class level because
-        # imp is not imported at the time of class creation.
-        self._suffixes = _suffix_list(imp.C_EXTENSION)
-        super().__init__(path_entry)
+    def __init__(self):
+        self.suffixes = _suffix_list(imp.C_EXTENSION)
 
 
 # Import itself ###############################################################
 
-def _chained_path_hook(*path_hooks):
-    """Create a closure which sequentially checks path hooks to see which ones
-    (if any) can work with a path."""
-    def path_hook(entry):
-        """Check to see if 'entry' matches any of the enclosed path hooks."""
-        finders = []
-        for hook in path_hooks:
-            try:
-                finder = hook(entry)
-            except ImportError:
-                continue
-            else:
-                finders.append(finder)
-        if not finders:
-            raise ImportError("no finder found")
-        else:
-            return _ChainedFinder(*finders)
-
-    return path_hook
+def _file_path_hook(path):
+    """If the path is a directory, return a file-based finder."""
+    if _path_isdir(path):
+        return _FileFinder(path, _ExtensionFinderDetails(),
+                           _SourceFinderDetails(),
+                           _SourcelessFinderDetails())
+    else:
+        raise ImportError("only directories are supported")
 
 
-_DEFAULT_PATH_HOOK = _chained_path_hook(_ExtensionFileFinder, _PyPycFileFinder)
+_DEFAULT_PATH_HOOK = _file_path_hook
 
 class _DefaultPathFinder(PathFinder):
 

Modified: python/branches/py3k/Lib/importlib/abc.py
==============================================================================
--- python/branches/py3k/Lib/importlib/abc.py	(original)
+++ python/branches/py3k/Lib/importlib/abc.py	Sat Jul  3 23:48:25 2010
@@ -182,8 +182,6 @@
         else:
             return path
 
-PyLoader.register(_bootstrap.PyLoader)
-
 
 class PyPycLoader(PyLoader):
 
@@ -266,7 +264,6 @@
             self.write_bytecode(fullname, data)
         return code_object
 
-
     @abc.abstractmethod
     def source_mtime(self, fullname:str) -> int:
         """Abstract method which when implemented should return the
@@ -285,5 +282,3 @@
         bytecode for the module, returning a boolean representing whether the
         bytecode was written or not."""
         raise NotImplementedError
-
-PyPycLoader.register(_bootstrap.PyPycLoader)

Modified: python/branches/py3k/Lib/importlib/test/extension/test_case_sensitivity.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/extension/test_case_sensitivity.py	(original)
+++ python/branches/py3k/Lib/importlib/test/extension/test_case_sensitivity.py	Sat Jul  3 23:48:25 2010
@@ -13,7 +13,8 @@
         good_name = ext_util.NAME
         bad_name = good_name.upper()
         assert good_name != bad_name
-        finder = _bootstrap._ExtensionFileFinder(ext_util.PATH)
+        finder = _bootstrap._FileFinder(ext_util.PATH,
+                                        _bootstrap._ExtensionFinderDetails())
         return finder.find_module(bad_name)
 
     def test_case_sensitive(self):

Modified: python/branches/py3k/Lib/importlib/test/extension/test_finder.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/extension/test_finder.py	(original)
+++ python/branches/py3k/Lib/importlib/test/extension/test_finder.py	Sat Jul  3 23:48:25 2010
@@ -9,7 +9,8 @@
     """Test the finder for extension modules."""
 
     def find_module(self, fullname):
-        importer = _bootstrap._ExtensionFileFinder(util.PATH)
+        importer = _bootstrap._FileFinder(util.PATH,
+                                          _bootstrap._ExtensionFinderDetails())
         return importer.find_module(fullname)
 
     def test_module(self):

Modified: python/branches/py3k/Lib/importlib/test/extension/test_loader.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/extension/test_loader.py	(original)
+++ python/branches/py3k/Lib/importlib/test/extension/test_loader.py	Sat Jul  3 23:48:25 2010
@@ -13,7 +13,7 @@
 
     def load_module(self, fullname):
         loader = _bootstrap._ExtensionFileLoader(ext_util.NAME,
-                                                ext_util.FILEPATH, False)
+                                                ext_util.FILEPATH)
         return loader.load_module(fullname)
 
     def test_module(self):

Modified: python/branches/py3k/Lib/importlib/test/extension/test_path_hook.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/extension/test_path_hook.py	(original)
+++ python/branches/py3k/Lib/importlib/test/extension/test_path_hook.py	Sat Jul  3 23:48:25 2010
@@ -14,7 +14,7 @@
     # XXX Should it only work for directories containing an extension module?
 
     def hook(self, entry):
-        return _bootstrap._ExtensionFileFinder(entry)
+        return _bootstrap._file_path_hook(entry)
 
     def test_success(self):
         # Path hook should handle a directory where a known extension module

Modified: python/branches/py3k/Lib/importlib/test/import_/test_path.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/import_/test_path.py	(original)
+++ python/branches/py3k/Lib/importlib/test/import_/test_path.py	Sat Jul  3 23:48:25 2010
@@ -5,6 +5,7 @@
 import imp
 import os
 import sys
+import tempfile
 from test import support
 from types import MethodType
 import unittest
@@ -80,23 +81,28 @@
 
     def test_implicit_hooks(self):
         # Test that the implicit path hooks are used.
-        existing_path = os.path.dirname(support.TESTFN)
         bad_path = '<path>'
         module = '<module>'
         assert not os.path.exists(bad_path)
-        with util.import_state():
-            nothing = _bootstrap._DefaultPathFinder.find_module(module,
-                                                           path=[existing_path])
-            self.assertTrue(nothing is None)
-            self.assertTrue(existing_path in sys.path_importer_cache)
-            self.assertTrue(not isinstance(sys.path_importer_cache[existing_path],
-                                        imp.NullImporter))
-            nothing = _bootstrap._DefaultPathFinder.find_module(module,
-                                                                path=[bad_path])
-            self.assertTrue(nothing is None)
-            self.assertTrue(bad_path in sys.path_importer_cache)
-            self.assertTrue(isinstance(sys.path_importer_cache[bad_path],
-                                    imp.NullImporter))
+        existing_path = tempfile.mkdtemp()
+        try:
+            with util.import_state():
+                nothing = _bootstrap._DefaultPathFinder.find_module(module,
+                                                        path=[existing_path])
+                self.assertTrue(nothing is None)
+                self.assertTrue(existing_path in sys.path_importer_cache)
+                result = isinstance(sys.path_importer_cache[existing_path],
+                                    imp.NullImporter)
+                self.assertFalse(result)
+                nothing = _bootstrap._DefaultPathFinder.find_module(module,
+                                                            path=[bad_path])
+                self.assertTrue(nothing is None)
+                self.assertTrue(bad_path in sys.path_importer_cache)
+                self.assertTrue(isinstance(sys.path_importer_cache[bad_path],
+                                           imp.NullImporter))
+        finally:
+            os.rmdir(existing_path)
+
 
     def test_path_importer_cache_has_None(self):
         # Test that the default hook is used when sys.path_importer_cache

Modified: python/branches/py3k/Lib/importlib/test/regrtest.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/regrtest.py	(original)
+++ python/branches/py3k/Lib/importlib/test/regrtest.py	Sat Jul  3 23:48:25 2010
@@ -6,9 +6,11 @@
 this script.
 
 XXX FAILING
-    test_import
-        execution bit
+  * test_import
+    - test_incorrect_code_name
         file name differing between __file__ and co_filename (r68360 on trunk)
+    - test_import_by_filename
+        exception for trying to import by file name does not match
 
 """
 import importlib

Modified: python/branches/py3k/Lib/importlib/test/source/test_abc_loader.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_abc_loader.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_abc_loader.py	Sat Jul  3 23:48:25 2010
@@ -815,6 +815,7 @@
     def test_Loader(self):
         self.raises_NotImplementedError(self.Loader(), 'load_module')
 
+    # XXX misplaced; should be somewhere else
     def test_Finder(self):
         self.raises_NotImplementedError(self.Finder(), 'find_module')
 

Modified: python/branches/py3k/Lib/importlib/test/source/test_case_sensitivity.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_case_sensitivity.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_case_sensitivity.py	Sat Jul  3 23:48:25 2010
@@ -19,7 +19,9 @@
     assert name != name.lower()
 
     def find(self, path):
-        finder = _bootstrap._PyPycFileFinder(path)
+        finder = _bootstrap._FileFinder(path,
+                                        _bootstrap._SourceFinderDetails(),
+                                        _bootstrap._SourcelessFinderDetails())
         return finder.find_module(self.name)
 
     def sensitivity_test(self):
@@ -27,7 +29,7 @@
         sensitive_pkg = 'sensitive.{0}'.format(self.name)
         insensitive_pkg = 'insensitive.{0}'.format(self.name.lower())
         context = source_util.create_modules(insensitive_pkg, sensitive_pkg)
-        with  context as mapping:
+        with context as mapping:
             sensitive_path = os.path.join(mapping['.root'], 'sensitive')
             insensitive_path = os.path.join(mapping['.root'], 'insensitive')
             return self.find(sensitive_path), self.find(insensitive_path)
@@ -37,7 +39,7 @@
             env.unset('PYTHONCASEOK')
             sensitive, insensitive = self.sensitivity_test()
             self.assertTrue(hasattr(sensitive, 'load_module'))
-            self.assertIn(self.name, sensitive._base_path)
+            self.assertIn(self.name, sensitive.get_filename(self.name))
             self.assertIsNone(insensitive)
 
     def test_insensitive(self):
@@ -45,9 +47,9 @@
             env.set('PYTHONCASEOK', '1')
             sensitive, insensitive = self.sensitivity_test()
             self.assertTrue(hasattr(sensitive, 'load_module'))
-            self.assertIn(self.name, sensitive._base_path)
+            self.assertIn(self.name, sensitive.get_filename(self.name))
             self.assertTrue(hasattr(insensitive, 'load_module'))
-            self.assertIn(self.name, insensitive._base_path)
+            self.assertIn(self.name, insensitive.get_filename(self.name))
 
 
 def test_main():

Modified: python/branches/py3k/Lib/importlib/test/source/test_file_loader.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_file_loader.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_file_loader.py	Sat Jul  3 23:48:25 2010
@@ -4,6 +4,7 @@
 from . import util as source_util
 
 import imp
+import marshal
 import os
 import py_compile
 import stat
@@ -23,8 +24,7 @@
     # [basic]
     def test_module(self):
         with source_util.create_modules('_temp') as mapping:
-            loader = _bootstrap._PyPycFileLoader('_temp', mapping['_temp'],
-                                                    False)
+            loader = _bootstrap._SourceFileLoader('_temp', mapping['_temp'])
             module = loader.load_module('_temp')
             self.assertTrue('_temp' in sys.modules)
             check = {'__name__': '_temp', '__file__': mapping['_temp'],
@@ -34,9 +34,8 @@
 
     def test_package(self):
         with source_util.create_modules('_pkg.__init__') as mapping:
-            loader = _bootstrap._PyPycFileLoader('_pkg',
-                                                 mapping['_pkg.__init__'],
-                                                 True)
+            loader = _bootstrap._SourceFileLoader('_pkg',
+                                                 mapping['_pkg.__init__'])
             module = loader.load_module('_pkg')
             self.assertTrue('_pkg' in sys.modules)
             check = {'__name__': '_pkg', '__file__': mapping['_pkg.__init__'],
@@ -48,8 +47,8 @@
 
     def test_lacking_parent(self):
         with source_util.create_modules('_pkg.__init__', '_pkg.mod')as mapping:
-            loader = _bootstrap._PyPycFileLoader('_pkg.mod',
-                                                    mapping['_pkg.mod'], False)
+            loader = _bootstrap._SourceFileLoader('_pkg.mod',
+                                                    mapping['_pkg.mod'])
             module = loader.load_module('_pkg.mod')
             self.assertTrue('_pkg.mod' in sys.modules)
             check = {'__name__': '_pkg.mod', '__file__': mapping['_pkg.mod'],
@@ -63,8 +62,7 @@
 
     def test_module_reuse(self):
         with source_util.create_modules('_temp') as mapping:
-            loader = _bootstrap._PyPycFileLoader('_temp', mapping['_temp'],
-                                                    False)
+            loader = _bootstrap._SourceFileLoader('_temp', mapping['_temp'])
             module = loader.load_module('_temp')
             module_id = id(module)
             module_dict_id = id(module.__dict__)
@@ -74,7 +72,7 @@
             # everything that has happened above can be too fast;
             # force an mtime on the source that is guaranteed to be different
             # than the original mtime.
-            loader.source_mtime = self.fake_mtime(loader.source_mtime)
+            loader.path_mtime = self.fake_mtime(loader.path_mtime)
             module = loader.load_module('_temp')
             self.assertTrue('testing_var' in module.__dict__,
                          "'testing_var' not in "
@@ -94,8 +92,7 @@
                 setattr(orig_module, attr, value)
             with open(mapping[name], 'w') as file:
                 file.write('+++ bad syntax +++')
-            loader = _bootstrap._PyPycFileLoader('_temp', mapping['_temp'],
-                                                    False)
+            loader = _bootstrap._SourceFileLoader('_temp', mapping['_temp'])
             with self.assertRaises(SyntaxError):
                 loader.load_module(name)
             for attr in attributes:
@@ -106,8 +103,7 @@
         with source_util.create_modules('_temp') as mapping:
             with open(mapping['_temp'], 'w') as file:
                 file.write('=')
-            loader = _bootstrap._PyPycFileLoader('_temp', mapping['_temp'],
-                                                    False)
+            loader = _bootstrap._SourceFileLoader('_temp', mapping['_temp'])
             with self.assertRaises(SyntaxError):
                 loader.load_module('_temp')
             self.assertTrue('_temp' not in sys.modules)
@@ -116,7 +112,7 @@
 class BadBytecodeTest(unittest.TestCase):
 
     def import_(self, file, module_name):
-        loader = _bootstrap._PyPycFileLoader(module_name, file, False)
+        loader = self.loader(module_name, file)
         module = loader.load_module(module_name)
         self.assertTrue(module_name in sys.modules)
 
@@ -129,101 +125,156 @@
         except KeyError:
             pass
         py_compile.compile(mapping[name])
-        bytecode_path = imp.cache_from_source(mapping[name])
-        with open(bytecode_path, 'rb') as file:
-            bc = file.read()
-        new_bc = manipulator(bc)
-        with open(bytecode_path, 'wb') as file:
-            if new_bc:
-                file.write(new_bc)
-        if del_source:
+        if not del_source:
+            bytecode_path = imp.cache_from_source(mapping[name])
+        else:
             os.unlink(mapping[name])
-            make_legacy_pyc(mapping[name])
+            bytecode_path = make_legacy_pyc(mapping[name])
+        if manipulator:
+            with open(bytecode_path, 'rb') as file:
+                bc = file.read()
+                new_bc = manipulator(bc)
+            with open(bytecode_path, 'wb') as file:
+                if new_bc is not None:
+                    file.write(new_bc)
         return bytecode_path
 
-    @source_util.writes_bytecode_files
-    def test_empty_file(self):
-        # When a .pyc is empty, regenerate it if possible, else raise
-        # ImportError.
+    def _test_empty_file(self, test, *, del_source=False):
         with source_util.create_modules('_temp') as mapping:
             bc_path = self.manipulate_bytecode('_temp', mapping,
-                                                lambda bc: None)
-            self.import_(mapping['_temp'], '_temp')
-            with open(bc_path, 'rb') as file:
-                self.assertGreater(len(file.read()), 8)
-            self.manipulate_bytecode('_temp', mapping, lambda bc: None,
-                                        del_source=True)
-            with self.assertRaises(ImportError):
-                self.import_(mapping['_temp'], '_temp')
+                                                lambda bc: b'',
+                                                del_source=del_source)
+            test('_temp', mapping, bc_path)
 
     @source_util.writes_bytecode_files
-    def test_partial_magic(self):
+    def _test_partial_magic(self, test, *, del_source=False):
         # When their are less than 4 bytes to a .pyc, regenerate it if
         # possible, else raise ImportError.
         with source_util.create_modules('_temp') as mapping:
             bc_path = self.manipulate_bytecode('_temp', mapping,
-                                                lambda bc: bc[:3])
-            self.import_(mapping['_temp'], '_temp')
-            with open(bc_path, 'rb') as file:
-                self.assertGreater(len(file.read()), 8)
-            self.manipulate_bytecode('_temp', mapping, lambda bc: bc[:3],
-                                        del_source=True)
+                                                lambda bc: bc[:3],
+                                                del_source=del_source)
+            test('_temp', mapping, bc_path)
+
+    def _test_magic_only(self, test, *, del_source=False):
+        with source_util.create_modules('_temp') as mapping:
+            bc_path = self.manipulate_bytecode('_temp', mapping,
+                                                lambda bc: bc[:4],
+                                                del_source=del_source)
+            test('_temp', mapping, bc_path)
+
+    def _test_partial_timestamp(self, test, *, del_source=False):
+        with source_util.create_modules('_temp') as mapping:
+            bc_path = self.manipulate_bytecode('_temp', mapping,
+                                                lambda bc: bc[:7],
+                                                del_source=del_source)
+            test('_temp', mapping, bc_path)
+
+    def _test_no_marshal(self, *, del_source=False):
+        with source_util.create_modules('_temp') as mapping:
+            bc_path = self.manipulate_bytecode('_temp', mapping,
+                                                lambda bc: bc[:8],
+                                                del_source=del_source)
+            file_path = mapping['_temp'] if not del_source else bc_path
+            with self.assertRaises(EOFError):
+                self.import_(file_path, '_temp')
+
+    def _test_non_code_marshal(self, *, del_source=False):
+        with source_util.create_modules('_temp') as mapping:
+            bytecode_path = self.manipulate_bytecode('_temp', mapping,
+                                    lambda bc: bc[:8] + marshal.dumps(b'abcd'),
+                                    del_source=del_source)
+            file_path = mapping['_temp'] if not del_source else bytecode_path
             with self.assertRaises(ImportError):
-                self.import_(mapping['_temp'], '_temp')
+                self.import_(file_path, '_temp')
+
+    def _test_bad_marshal(self, *, del_source=False):
+        with source_util.create_modules('_temp') as mapping:
+            bytecode_path = self.manipulate_bytecode('_temp', mapping,
+                                                lambda bc: bc[:8] + b'<test>',
+                                                del_source=del_source)
+            file_path = mapping['_temp'] if not del_source else bytecode_path
+            with self.assertRaises(ValueError):
+                self.import_(file_path, '_temp')
+
+    def _test_bad_magic(self, test, *, del_source=False):
+        with source_util.create_modules('_temp') as mapping:
+            bc_path = self.manipulate_bytecode('_temp', mapping,
+                                    lambda bc: b'\x00\x00\x00\x00' + bc[4:])
+            test('_temp', mapping, bc_path)
+
+
+class SourceLoaderBadBytecodeTest(BadBytecodeTest):
+
+    loader = _bootstrap._SourceFileLoader
+
+    @source_util.writes_bytecode_files
+    def test_empty_file(self):
+        # When a .pyc is empty, regenerate it if possible, else raise
+        # ImportError.
+        def test(name, mapping, bytecode_path):
+            self.import_(mapping[name], name)
+            with open(bytecode_path, 'rb') as file:
+                self.assertGreater(len(file.read()), 8)
+
+        self._test_empty_file(test)
+
+    def test_partial_magic(self):
+        def test(name, mapping, bytecode_path):
+            self.import_(mapping[name], name)
+            with open(bytecode_path, 'rb') as file:
+                self.assertGreater(len(file.read()), 8)
+
+        self._test_partial_magic(test)
 
     @source_util.writes_bytecode_files
     def test_magic_only(self):
         # When there is only the magic number, regenerate the .pyc if possible,
         # else raise EOFError.
-        with source_util.create_modules('_temp') as mapping:
-            bc_path = self.manipulate_bytecode('_temp', mapping,
-                                                lambda bc: bc[:4])
-            self.import_(mapping['_temp'], '_temp')
-            with open(bc_path, 'rb') as file:
+        def test(name, mapping, bytecode_path):
+            self.import_(mapping[name], name)
+            with open(bytecode_path, 'rb') as file:
                 self.assertGreater(len(file.read()), 8)
-            self.manipulate_bytecode('_temp', mapping, lambda bc: bc[:4],
-                                        del_source=True)
-            with self.assertRaises(EOFError):
-                self.import_(mapping['_temp'], '_temp')
+
+    @source_util.writes_bytecode_files
+    def test_bad_magic(self):
+        # When the magic number is different, the bytecode should be
+        # regenerated.
+        def test(name, mapping, bytecode_path):
+            self.import_(mapping[name], name)
+            with open(bytecode_path, 'rb') as bytecode_file:
+                self.assertEqual(bytecode_file.read(4), imp.get_magic())
+
+        self._test_bad_magic(test)
 
     @source_util.writes_bytecode_files
     def test_partial_timestamp(self):
         # When the timestamp is partial, regenerate the .pyc, else
         # raise EOFError.
-        with source_util.create_modules('_temp') as mapping:
-            bc_path = self.manipulate_bytecode('_temp', mapping,
-                                                lambda bc: bc[:7])
-            self.import_(mapping['_temp'], '_temp')
+        def test(name, mapping, bc_path):
+            self.import_(mapping[name], name)
             with open(bc_path, 'rb') as file:
                 self.assertGreater(len(file.read()), 8)
-            self.manipulate_bytecode('_temp', mapping, lambda bc: bc[:7],
-                                        del_source=True)
-            with self.assertRaises(EOFError):
-                self.import_(mapping['_temp'], '_temp')
 
     @source_util.writes_bytecode_files
     def test_no_marshal(self):
         # When there is only the magic number and timestamp, raise EOFError.
-        with source_util.create_modules('_temp') as mapping:
-            bc_path = self.manipulate_bytecode('_temp', mapping,
-                                                lambda bc: bc[:8])
-            with self.assertRaises(EOFError):
-                self.import_(mapping['_temp'], '_temp')
+        self._test_no_marshal()
 
     @source_util.writes_bytecode_files
-    def test_bad_magic(self):
-        # When the magic number is different, the bytecode should be
-        # regenerated.
-        with source_util.create_modules('_temp') as mapping:
-            bc_path = self.manipulate_bytecode('_temp', mapping,
-                                    lambda bc: b'\x00\x00\x00\x00' + bc[4:])
-            self.import_(mapping['_temp'], '_temp')
-            with open(bc_path, 'rb') as bytecode_file:
-                self.assertEqual(bytecode_file.read(4), imp.get_magic())
+    def test_non_code_marshal(self):
+        self._test_non_code_marshal()
+        # XXX ImportError when sourceless
+
+    # [bad marshal]
+    @source_util.writes_bytecode_files
+    def test_bad_marshal(self):
+        # Bad marshal data should raise a ValueError.
+        self._test_bad_marshal()
 
     # [bad timestamp]
     @source_util.writes_bytecode_files
-    def test_bad_bytecode(self):
+    def test_old_timestamp(self):
         # When the timestamp is older than the source, bytecode should be
         # regenerated.
         zeros = b'\x00\x00\x00\x00'
@@ -240,23 +291,6 @@
                 bytecode_file.seek(4)
                 self.assertEqual(bytecode_file.read(4), source_timestamp)
 
-    # [bad marshal]
-    @source_util.writes_bytecode_files
-    def test_bad_marshal(self):
-        # Bad marshal data should raise a ValueError.
-        with source_util.create_modules('_temp') as mapping:
-            bytecode_path = imp.cache_from_source(mapping['_temp'])
-            source_mtime = os.path.getmtime(mapping['_temp'])
-            source_timestamp = importlib._w_long(source_mtime)
-            source_util.ensure_bytecode_path(bytecode_path)
-            with open(bytecode_path, 'wb') as bytecode_file:
-                bytecode_file.write(imp.get_magic())
-                bytecode_file.write(source_timestamp)
-                bytecode_file.write(b'AAAA')
-            with self.assertRaises(ValueError):
-                self.import_(mapping['_temp'], '_temp')
-            self.assertTrue('_temp' not in sys.modules)
-
     # [bytecode read-only]
     @source_util.writes_bytecode_files
     def test_read_only_bytecode(self):
@@ -279,9 +313,57 @@
                 os.chmod(bytecode_path, stat.S_IWUSR)
 
 
+class SourcelessLoaderBadBytecodeTest(BadBytecodeTest):
+
+    loader = _bootstrap._SourcelessFileLoader
+
+    def test_empty_file(self):
+        def test(name, mapping, bytecode_path):
+            with self.assertRaises(ImportError):
+                self.import_(bytecode_path, name)
+
+        self._test_empty_file(test, del_source=True)
+
+    def test_partial_magic(self):
+        def test(name, mapping, bytecode_path):
+            with self.assertRaises(ImportError):
+                self.import_(bytecode_path, name)
+        self._test_partial_magic(test, del_source=True)
+
+    def test_magic_only(self):
+        def test(name, mapping, bytecode_path):
+            with self.assertRaises(EOFError):
+                self.import_(bytecode_path, name)
+
+        self._test_magic_only(test, del_source=True)
+
+    def test_bad_magic(self):
+        def test(name, mapping, bytecode_path):
+            with self.assertRaises(ImportError):
+                self.import_(bytecode_path, name)
+
+        self._test_bad_magic(test, del_source=True)
+
+    def test_partial_timestamp(self):
+        def test(name, mapping, bytecode_path):
+            with self.assertRaises(EOFError):
+                self.import_(bytecode_path, name)
+
+        self._test_partial_timestamp(test, del_source=True)
+
+    def test_no_marshal(self):
+        self._test_no_marshal(del_source=True)
+
+    def test_non_code_marshal(self):
+        self._test_non_code_marshal(del_source=True)
+
+
 def test_main():
     from test.support import run_unittest
-    run_unittest(SimpleTest, BadBytecodeTest)
+    run_unittest(SimpleTest,
+                 SourceLoaderBadBytecodeTest,
+                 SourcelessLoaderBadBytecodeTest
+                 )
 
 
 if __name__ == '__main__':

Modified: python/branches/py3k/Lib/importlib/test/source/test_finder.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_finder.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_finder.py	Sat Jul  3 23:48:25 2010
@@ -34,7 +34,9 @@
     """
 
     def import_(self, root, module):
-        finder = _bootstrap._PyPycFileFinder(root)
+        finder = _bootstrap._FileFinder(root,
+                                        _bootstrap._SourceFinderDetails(),
+                                        _bootstrap._SourcelessFinderDetails())
         return finder.find_module(module)
 
     def run_test(self, test, create=None, *, compile_=None, unlink=None):
@@ -116,7 +118,7 @@
         # XXX This is not a blackbox test!
         name = '_temp'
         loader = self.run_test(name, {'{0}.__init__'.format(name), name})
-        self.assertTrue('__init__' in loader._base_path)
+        self.assertTrue('__init__' in loader.get_filename(name))
 
 
     def test_failure(self):

Modified: python/branches/py3k/Lib/importlib/test/source/test_path_hook.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_path_hook.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_path_hook.py	Sat Jul  3 23:48:25 2010
@@ -8,9 +8,8 @@
     """Test the path hook for source."""
 
     def test_success(self):
-        # XXX Only work on existing directories?
         with source_util.create_modules('dummy') as mapping:
-            self.assertTrue(hasattr(_bootstrap._FileFinder(mapping['.root']),
+            self.assertTrue(hasattr(_bootstrap._file_path_hook(mapping['.root']),
                                  'find_module'))
 
 

Modified: python/branches/py3k/Lib/importlib/test/source/test_source_encoding.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_source_encoding.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_source_encoding.py	Sat Jul  3 23:48:25 2010
@@ -35,8 +35,8 @@
         with source_util.create_modules(self.module_name) as mapping:
             with open(mapping[self.module_name], 'wb') as file:
                 file.write(source)
-            loader = _bootstrap._PyPycFileLoader(self.module_name,
-                                       mapping[self.module_name], False)
+            loader = _bootstrap._SourceFileLoader(self.module_name,
+                                       mapping[self.module_name])
             return loader.load_module(self.module_name)
 
     def create_source(self, encoding):
@@ -97,8 +97,8 @@
         with source_util.create_modules(module_name) as mapping:
             with open(mapping[module_name], 'wb') as file:
                 file.write(source)
-            loader = _bootstrap._PyPycFileLoader(module_name,
-                                                 mapping[module_name], False)
+            loader = _bootstrap._SourceFileLoader(module_name,
+                                                 mapping[module_name])
             return loader.load_module(module_name)
 
     # [cr]

Modified: python/branches/py3k/Lib/test/test_runpy.py
==============================================================================
--- python/branches/py3k/Lib/test/test_runpy.py	(original)
+++ python/branches/py3k/Lib/test/test_runpy.py	Sat Jul  3 23:48:25 2010
@@ -6,7 +6,7 @@
 import re
 import tempfile
 import py_compile
-from test.support import forget, make_legacy_pyc, run_unittest, verbose
+from test.support import forget, make_legacy_pyc, run_unittest, unload, verbose
 from test.script_helper import (
     make_pkg, make_script, make_zip_pkg, make_zip_script, temp_dir)
 
@@ -174,6 +174,7 @@
             __import__(mod_name)
             os.remove(mod_fname)
             make_legacy_pyc(mod_fname)
+            unload(mod_name)  # In case loader caches paths
             if verbose: print("Running from compiled:", mod_name)
             d2 = run_module(mod_name) # Read from bytecode
             self.assertIn("x", d2)
@@ -197,6 +198,7 @@
             __import__(mod_name)
             os.remove(mod_fname)
             make_legacy_pyc(mod_fname)
+            unload(mod_name)  # In case loader caches paths
             if verbose: print("Running from compiled:", pkg_name)
             d2 = run_module(pkg_name) # Read from bytecode
             self.assertIn("x", d2)
@@ -252,6 +254,7 @@
             __import__(mod_name)
             os.remove(mod_fname)
             make_legacy_pyc(mod_fname)
+            unload(mod_name)  # In case the loader caches paths
             if verbose: print("Running from compiled:", mod_name)
             d2 = run_module(mod_name, run_name=run_name) # Read from bytecode
             self.assertIn("__package__", d2)
@@ -405,7 +408,11 @@
 
 
 def test_main():
-    run_unittest(RunModuleCodeTest, RunModuleTest, RunPathTest)
+    run_unittest(
+                 RunModuleCodeTest,
+                 RunModuleTest,
+                 RunPathTest
+                 )
 
 if __name__ == "__main__":
     test_main()

From python-checkins at python.org  Sat Jul  3 23:50:52 2010
From: python-checkins at python.org (brett.cannon)
Date: Sat,  3 Jul 2010 23:50:52 +0200 (CEST)
Subject: [Python-checkins] r82519 - python/branches/py3k/Misc/Vim/vimrc
Message-ID: <20100703215052.48B17EC40@mail.python.org>

Author: brett.cannon
Date: Sat Jul  3 23:50:52 2010
New Revision: 82519

Log:
Trailing whitespace is bad for .rst files.

Modified:
   python/branches/py3k/Misc/Vim/vimrc

Modified: python/branches/py3k/Misc/Vim/vimrc
==============================================================================
--- python/branches/py3k/Misc/Vim/vimrc	(original)
+++ python/branches/py3k/Misc/Vim/vimrc	Sat Jul  3 23:50:52 2010
@@ -43,7 +43,7 @@
 " Display tabs at the beginning of a line in Python mode as bad.
 au BufRead,BufNewFile *.py,*.pyw match BadWhitespace /^\t\+/
 " Make trailing whitespace be flagged as bad.
-au BufRead,BufNewFile *.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/
+au BufRead,BufNewFile *.py,*.pyw,*.c,*.h,*.rst match BadWhitespace /\s\+$/
 
 " Wrap text after a certain number of characters
 " Python: 79 

From python-checkins at python.org  Sun Jul  4 00:03:16 2010
From: python-checkins at python.org (brett.cannon)
Date: Sun,  4 Jul 2010 00:03:16 +0200 (CEST)
Subject: [Python-checkins] r82520 -
	python/branches/py3k/Lib/importlib/test/test_api.py
Message-ID: <20100703220316.E611EF2DA@mail.python.org>

Author: brett.cannon
Date: Sun Jul  4 00:03:16 2010
New Revision: 82520

Log:
Fix a spelling mistake in a comment.

Modified:
   python/branches/py3k/Lib/importlib/test/test_api.py

Modified: python/branches/py3k/Lib/importlib/test/test_api.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/test_api.py	(original)
+++ python/branches/py3k/Lib/importlib/test/test_api.py	Sun Jul  4 00:03:16 2010
@@ -27,7 +27,7 @@
                 self.assertEqual(module.__name__, name)
 
     def test_shallow_relative_package_import(self):
-        # Test importing a module from a package through a relatve import.
+        # Test importing a module from a package through a relative import.
         pkg_name = 'pkg'
         pkg_long_name = '{0}.__init__'.format(pkg_name)
         module_name = 'mod'

From python-checkins at python.org  Sun Jul  4 00:05:41 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Sun,  4 Jul 2010 00:05:41 +0200 (CEST)
Subject: [Python-checkins] r82521 -
	python/branches/py3k/Demo/classes/Dates.py
Message-ID: <20100703220541.3BBA1EE9A4@mail.python.org>

Author: alexander.belopolsky
Date: Sun Jul  4 00:05:41 2010
New Revision: 82521

Log:
Issue #9151: Demo/classes/Dates.py does not work in 3.x Converted
descriptive comment into a docstring.  Cast attributes to int in
__init__.  Use __new__ instead of deleting attributes to
"uninitialize".


Modified:
   python/branches/py3k/Demo/classes/Dates.py

Modified: python/branches/py3k/Demo/classes/Dates.py
==============================================================================
--- python/branches/py3k/Demo/classes/Dates.py	(original)
+++ python/branches/py3k/Demo/classes/Dates.py	Sun Jul  4 00:05:41 2010
@@ -1,43 +1,45 @@
-# Class Date supplies date objects that support date arithmetic.
-#
-# Date(month,day,year) returns a Date object.  An instance prints as,
-# e.g., 'Mon 16 Aug 1993'.
-#
-# Addition, subtraction, comparison operators, min, max, and sorting
-# all work as expected for date objects:  int+date or date+int returns
-# the date `int' days from `date'; date+date raises an exception;
-# date-int returns the date `int' days before `date'; date2-date1 returns
-# an integer, the number of days from date1 to date2; int-date raises an
-# exception; date1 < date2 is true iff date1 occurs before date2 (&
-# similarly for other comparisons); min(date1,date2) is the earlier of
-# the two dates and max(date1,date2) the later; and date objects can be
-# used as dictionary keys.
-#
-# Date objects support one visible method, date.weekday().  This returns
-# the day of the week the date falls on, as a string.
-#
-# Date objects also have 4 read-only data attributes:
-#   .month  in 1..12
-#   .day    in 1..31
-#   .year   int or long int
-#   .ord    the ordinal of the date relative to an arbitrary staring point
-#
-# The Dates module also supplies function today(), which returns the
-# current date as a date object.
-#
-# Those entranced by calendar trivia will be disappointed, as no attempt
-# has been made to accommodate the Julian (etc) system.  On the other
-# hand, at least this package knows that 2000 is a leap year but 2100
-# isn't, and works fine for years with a hundred decimal digits <wink>.
+"""
+Class Date supplies date objects that support date arithmetic.
 
-# Tim Peters   tim at ksr.com
-# not speaking for Kendall Square Research Corp
+Date(month,day,year) returns a Date object.  An instance prints as,
+e.g., 'Mon 16 Aug 1993'.
 
-# Adapted to Python 1.1 (where some hacks to overcome coercion are unnecessary)
-# by Guido van Rossum
-
-# Note that as of Python 2.3, a datetime module is included in the stardard
-# library.
+Addition, subtraction, comparison operators, min, max, and sorting
+all work as expected for date objects:  int+date or date+int returns
+the date `int' days from `date'; date+date raises an exception;
+date-int returns the date `int' days before `date'; date2-date1 returns
+an integer, the number of days from date1 to date2; int-date raises an
+exception; date1 < date2 is true iff date1 occurs before date2 (&
+similarly for other comparisons); min(date1,date2) is the earlier of
+the two dates and max(date1,date2) the later; and date objects can be
+used as dictionary keys.
+
+Date objects support one visible method, date.weekday().  This returns
+the day of the week the date falls on, as a string.
+
+Date objects also have 4 read-only data attributes:
+  .month  in 1..12
+  .day    in 1..31
+  .year   int or long int
+  .ord    the ordinal of the date relative to an arbitrary staring point
+
+The Dates module also supplies function today(), which returns the
+current date as a date object.
+
+Those entranced by calendar trivia will be disappointed, as no attempt
+has been made to accommodate the Julian (etc) system.  On the other
+hand, at least this package knows that 2000 is a leap year but 2100
+isn't, and works fine for years with a hundred decimal digits <wink>.
+
+Tim Peters   tim at ksr.com
+not speaking for Kendall Square Research Corp
+
+Adapted to Python 1.1 (where some hacks to overcome coercion are unnecessary)
+by Guido van Rossum
+
+Note that as of Python 2.3, a datetime module is included in the stardard
+library.
+"""
 
 import functools
 
@@ -86,8 +88,9 @@
     if not isinstance(n, int):
         raise TypeError('argument must be integer: %r' % type(n))
 
-    ans = Date(1,1,1)   # arguments irrelevant; just getting a Date obj
-    del ans.ord, ans.month, ans.day, ans.year # un-initialize it
+    # Get uninitialized Date object.  This is necesary because once
+    # attributes are set, they cannot be changed.
+    ans = Date.__new__(Date)
     ans.ord = n
 
     n400 = (n-1)//_DI400Y                # # of 400-year blocks preceding
@@ -97,11 +100,7 @@
     if dby >= n:
         more = more - 1
         dby = dby - _days_in_year(more)
-    year, n = year + more, int(n - dby)
-
-    try: year = int(year)               # chop to int, if it fits
-    except (ValueError, OverflowError): pass
-
+    year, n = year + more, n - dby
     month = min(n//29 + 1, 12)
     dbm = _days_before_month(month, year)
     if dbm >= n:
@@ -112,7 +111,7 @@
     return ans
 
 def _num2day(n):      # return weekday name of day with ordinal n
-    return _DAY_NAMES[ int(n % 7) ]
+    return _DAY_NAMES[n % 7]
 
 @functools.total_ordering
 class Date:
@@ -122,7 +121,7 @@
         dim = _days_in_month(month, year)
         if not 1 <= day <= dim:
             raise ValueError('day must be in 1..%r: %r' % (dim, day))
-        self.month, self.day, self.year = month, day, year
+        self.month, self.day, self.year = map(int, (month, day, year))
         self.ord = _date2num(self)
 
     # don't allow setting existing attributes

From python-checkins at python.org  Sun Jul  4 00:18:47 2010
From: python-checkins at python.org (brett.cannon)
Date: Sun,  4 Jul 2010 00:18:47 +0200 (CEST)
Subject: [Python-checkins] r82522 - in
	python/branches/py3k/Lib/importlib/test/source:
	test_file_loader.py test_finder.py test_path_hook.py
Message-ID: <20100703221847.C9A28CA36@mail.python.org>

Author: brett.cannon
Date: Sun Jul  4 00:18:47 2010
New Revision: 82522

Log:
Make importlib.abc.SourceLoader the primary mechanism for importlib.

This required moving the class from importlib/abc.py into
importlib/_bootstrap.py and jiggering some code to work better with the class.
This included changing how the file finder worked to better meet import
semantics. This also led to fixing importlib to handle the empty string from
sys.path as import currently does (and making me wish we didn't support that
instead just required people to insert '.' instead to represent cwd).

It also required making the new set_data abstractmethod create
any needed subdirectories implicitly thanks to __pycache__ (it was either this
or grow the SourceLoader ABC to gain an 'exists' method and either a mkdir
method or have set_data with no data arg mean to create a directory).

Lastly, as an optimization the file loaders cache the file path where the
finder found something to use for loading (this is thanks to having a
sourceless loader separate from the source loader to simplify the code and
cut out stat calls).
Unfortunately test_runpy assumed a loader would always work for a module, even
if you changed from underneath it what it was expected to work with. By simply
dropping the previous loader in test_runpy so the proper loader can be returned
by the finder fixed the failure.

At this point importlib deviates from import on two points:

1. The exception raised when trying to import a file is different (import does
an explicit file check to print a special message, importlib just says the path
cannot be imported as if it was just some module name).

2. the co_filename on a code object is not being set to where bytecode was
actually loaded from instead of where the marshalled code object originally
came from (a solution for this has already been agreed upon on python-dev but has
not been implemented yet; issue8611).


Modified:
   python/branches/py3k/Lib/importlib/test/source/test_file_loader.py
   python/branches/py3k/Lib/importlib/test/source/test_finder.py
   python/branches/py3k/Lib/importlib/test/source/test_path_hook.py

Modified: python/branches/py3k/Lib/importlib/test/source/test_file_loader.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_file_loader.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_file_loader.py	Sun Jul  4 00:18:47 2010
@@ -1,6 +1,7 @@
 import importlib
 from importlib import _bootstrap
 from .. import abc
+from .. import util
 from . import util as source_util
 
 import imp
@@ -108,6 +109,22 @@
                 loader.load_module('_temp')
             self.assertTrue('_temp' not in sys.modules)
 
+    def test_file_from_empty_string_dir(self):
+        # Loading a module found from an empty string entry on sys.path should
+        # not only work, but keep all attributes relative.
+        with open('_temp.py', 'w') as file:
+            file.write("# test file for importlib")
+        try:
+            with util.uncache('_temp'):
+                loader = _bootstrap._SourceFileLoader('_temp', '_temp.py')
+                mod = loader.load_module('_temp')
+                self.assertEqual('_temp.py', mod.__file__)
+                self.assertEqual(imp.cache_from_source('_temp.py'),
+                                 mod.__cached__)
+
+        finally:
+            os.unlink('_temp.py')
+
 
 class BadBytecodeTest(unittest.TestCase):
 

Modified: python/branches/py3k/Lib/importlib/test/source/test_finder.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_finder.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_finder.py	Sun Jul  4 00:18:47 2010
@@ -115,7 +115,6 @@
 
     # [package over modules]
     def test_package_over_module(self):
-        # XXX This is not a blackbox test!
         name = '_temp'
         loader = self.run_test(name, {'{0}.__init__'.format(name), name})
         self.assertTrue('__init__' in loader.get_filename(name))
@@ -133,6 +132,17 @@
             with self.assertRaises(ImportWarning):
                 self.run_test('pkg', {'pkg.__init__'}, unlink={'pkg.__init__'})
 
+    def test_empty_string_for_dir(self):
+        # The empty string from sys.path means to search in the cwd.
+        finder = _bootstrap._FileFinder('', _bootstrap._SourceFinderDetails())
+        with open('mod.py', 'w') as file:
+            file.write("# test file for importlib")
+        try:
+            loader = finder.find_module('mod')
+            self.assertTrue(hasattr(loader, 'load_module'))
+        finally:
+            os.unlink('mod.py')
+
 
 def test_main():
     from test.support import run_unittest

Modified: python/branches/py3k/Lib/importlib/test/source/test_path_hook.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_path_hook.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_path_hook.py	Sun Jul  4 00:18:47 2010
@@ -12,6 +12,10 @@
             self.assertTrue(hasattr(_bootstrap._file_path_hook(mapping['.root']),
                                  'find_module'))
 
+    def test_empty_string(self):
+        # The empty string represents the cwd.
+        self.assertTrue(hasattr(_bootstrap._file_path_hook(''), 'find_module'))
+
 
 def test_main():
     from test.support import run_unittest

From python-checkins at python.org  Sun Jul  4 00:32:41 2010
From: python-checkins at python.org (brett.cannon)
Date: Sun,  4 Jul 2010 00:32:41 +0200 (CEST)
Subject: [Python-checkins] r82523 - in python/branches/py3k/Lib/importlib:
	_bootstrap.py test/source/test_abc_loader.py
Message-ID: <20100703223241.E5CE7EFBA@mail.python.org>

Author: brett.cannon
Date: Sun Jul  4 00:32:41 2010
New Revision: 82523

Log:
Make importlib.abc.SourceLoader the primary mechanism for importlib.

This required moving the class from importlib/abc.py into
importlib/_bootstrap.py and jiggering some code to work better with the class.
This included changing how the file finder worked to better meet import
semantics. This also led to fixing importlib to handle the empty string from
sys.path as import currently does (and making me wish we didn't support that
instead just required people to insert '.' instead to represent cwd).

It also required making the new set_data abstractmethod create
any needed subdirectories implicitly thanks to __pycache__ (it was either this
or grow the SourceLoader ABC to gain an 'exists' method and either a mkdir
method or have set_data with no data arg mean to create a directory).

Lastly, as an optimization the file loaders cache the file path where the
finder found something to use for loading (this is thanks to having a
sourceless loader separate from the source loader to simplify the code and
cut out stat calls).
Unfortunately test_runpy assumed a loader would always work for a module, even
if you changed from underneath it what it was expected to work with. By simply
dropping the previous loader in test_runpy so the proper loader can be returned
by the finder fixed the failure.

At this point importlib deviates from import on two points:

1. The exception raised when trying to import a file is different (import does
an explicit file check to print a special message, importlib just says the path
cannot be imported as if it was just some module name).

2. the co_filename on a code object is not being set to where bytecode was
actually loaded from instead of where the marshalled code object originally
came from (a solution for this has already been agreed upon on python-dev but has
not been implemented yet; issue8611).


Modified:
   python/branches/py3k/Lib/importlib/_bootstrap.py
   python/branches/py3k/Lib/importlib/test/source/test_abc_loader.py

Modified: python/branches/py3k/Lib/importlib/_bootstrap.py
==============================================================================
--- python/branches/py3k/Lib/importlib/_bootstrap.py	(original)
+++ python/branches/py3k/Lib/importlib/_bootstrap.py	Sun Jul  4 00:32:41 2010
@@ -386,8 +386,8 @@
         except IOError:
             raise ImportError("source not available through get_data()")
         encoding = tokenize.detect_encoding(_io.BytesIO(source_bytes).readline)
-        # XXX Universal newlines?
-        return source_bytes.decode(encoding[0])
+        newline_decoder = _io.IncrementalNewlineDecoder(None, True)
+        return newline_decoder.decode(source_bytes.decode(encoding[0]))
 
     def get_code(self, fullname):
         """Concrete implementation of InspectLoader.get_code.

Modified: python/branches/py3k/Lib/importlib/test/source/test_abc_loader.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/source/test_abc_loader.py	(original)
+++ python/branches/py3k/Lib/importlib/test/source/test_abc_loader.py	Sun Jul  4 00:32:41 2010
@@ -7,6 +7,7 @@
 
 import imp
 import inspect
+import io
 import marshal
 import os
 import sys
@@ -327,30 +328,6 @@
             mock.get_filename(name)
 
 
-class PyLoaderGetSourceTests(unittest.TestCase):
-
-    """Tests for importlib.abc.PyLoader.get_source()."""
-
-    def test_default_encoding(self):
-        # Should have no problems with UTF-8 text.
-        name = 'mod'
-        mock = PyLoaderMock({name: os.path.join('path', 'to', 'mod')})
-        source = 'x = "?"'
-        mock.source = source.encode('utf-8')
-        returned_source = mock.get_source(name)
-        self.assertEqual(returned_source, source)
-
-    def test_decoded_source(self):
-        # Decoding should work.
-        name = 'mod'
-        mock = PyLoaderMock({name: os.path.join('path', 'to', 'mod')})
-        source = "# coding: Latin-1\nx='?'"
-        assert source.encode('latin-1') != source.encode('utf-8')
-        mock.source = source.encode('latin-1')
-        returned_source = mock.get_source(name)
-        self.assertEqual(returned_source, source)
-
-
 class PyPycLoaderTests(PyLoaderTests):
 
     """Tests for importlib.abc.PyPycLoader."""
@@ -752,6 +729,39 @@
         code_object = self.loader.get_code(self.name)
         self.verify_code(code_object)
 
+
+class SourceLoaderGetSourceTests(unittest.TestCase):
+
+    """Tests for importlib.abc.SourceLoader.get_source()."""
+
+    def test_default_encoding(self):
+        # Should have no problems with UTF-8 text.
+        name = 'mod'
+        mock = SourceOnlyLoaderMock('mod.file')
+        source = 'x = "?"'
+        mock.source = source.encode('utf-8')
+        returned_source = mock.get_source(name)
+        self.assertEqual(returned_source, source)
+
+    def test_decoded_source(self):
+        # Decoding should work.
+        name = 'mod'
+        mock = SourceOnlyLoaderMock("mod.file")
+        source = "# coding: Latin-1\nx='?'"
+        assert source.encode('latin-1') != source.encode('utf-8')
+        mock.source = source.encode('latin-1')
+        returned_source = mock.get_source(name)
+        self.assertEqual(returned_source, source)
+
+    def test_universal_newlines(self):
+        # PEP 302 says universal newlines should be used.
+        name = 'mod'
+        mock = SourceOnlyLoaderMock('mod.file')
+        source = "x = 42\r\ny = -13\r\n"
+        mock.source = source.encode('utf-8')
+        expect = io.IncrementalNewlineDecoder(None, True).decode(source)
+        self.assertEqual(mock.get_source(name), expect)
+
 class AbstractMethodImplTests(unittest.TestCase):
 
     """Test the concrete abstractmethod implementations."""
@@ -852,12 +862,13 @@
 def test_main():
     from test.support import run_unittest
     run_unittest(PyLoaderTests, PyLoaderCompatTests,
-                    PyLoaderInterfaceTests, PyLoaderGetSourceTests,
+                    PyLoaderInterfaceTests,
                     PyPycLoaderTests, PyPycLoaderInterfaceTests,
                     SkipWritingBytecodeTests, RegeneratedBytecodeTests,
                     BadBytecodeFailureTests, MissingPathsTests,
                     SourceOnlyLoaderTests,
                     SourceLoaderBytecodeTests,
+                    SourceLoaderGetSourceTests,
                     AbstractMethodImplTests)
 
 

From python-checkins at python.org  Sun Jul  4 00:36:07 2010
From: python-checkins at python.org (alexander.belopolsky)
Date: Sun,  4 Jul 2010 00:36:07 +0200 (CEST)
Subject: [Python-checkins] r82524 -
	python/branches/py3k/Demo/classes/Complex.py
Message-ID: <20100703223607.250BDEFBA@mail.python.org>

Author: alexander.belopolsky
Date: Sun Jul  4 00:36:06 2010
New Revision: 82524

Log:
Made minimal modifications to pass included tests

Modified:
   python/branches/py3k/Demo/classes/Complex.py

Modified: python/branches/py3k/Demo/classes/Complex.py
==============================================================================
--- python/branches/py3k/Demo/classes/Complex.py	(original)
+++ python/branches/py3k/Demo/classes/Complex.py	Sun Jul  4 00:36:06 2010
@@ -151,13 +151,9 @@
             raise ValueError("can't convert Complex with nonzero im to float")
         return float(self.re)
 
-    def __cmp__(self, other):
+    def __eq__(self, other):
         other = ToComplex(other)
-        return cmp((self.re, self.im), (other.re, other.im))
-
-    def __rcmp__(self, other):
-        other = ToComplex(other)
-        return cmp(other, self)
+        return (self.re, self.im) == (other.re, other.im)
 
     def __bool__(self):
         return not (self.re == self.im == 0)
@@ -190,14 +186,14 @@
 
     __rmul__ = __mul__
 
-    def __div__(self, other):
+    def __truediv__(self, other):
         other = ToComplex(other)
         d = float(other.re*other.re + other.im*other.im)
         if not d: raise ZeroDivisionError('Complex division')
         return Complex((self.re*other.re + self.im*other.im) / d,
                        (self.im*other.re - self.re*other.im) / d)
 
-    def __rdiv__(self, other):
+    def __rtruediv__(self, other):
         other = ToComplex(other)
         return other / self
 
@@ -226,8 +222,9 @@
     print('       ', a, 'and', b, end=' ')
     try:
         result = eval(expr)
-    except:
-        result = sys.exc_info()[0]
+    except Exception as e:
+        print('!!\t!!\t!! error: {}'.format(e))
+        return
     print('->', result)
     if isinstance(result, str) or isinstance(value, str):
         ok = (result == value)
@@ -295,13 +292,6 @@
                     (Complex(1), Complex(0,10), 1),
                     (2, Complex(4,0), 16),
             ],
-            'cmp(a,b)': [
-                    (1, 10, -1),
-                    (1, Complex(0,10), 1),
-                    (Complex(0,10), 1, -1),
-                    (Complex(0,10), Complex(1), -1),
-                    (Complex(1), Complex(0,10), 1),
-            ],
     }
     for expr in sorted(testsuite):
         print(expr + ':')

From solipsis at pitrou.net  Sun Jul  4 01:25:33 2010
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun,  4 Jul 2010 01:25:33 +0200 (CEST)
Subject: [Python-checkins] Daily py3k reference leaks (r82515): sum=9
Message-ID: <20100703232533.C23591771C@ns6635.ovh.net>

py3k results for svn r82515 (hg cset 25d975bb6fd5)
--------------------------------------------------

test_audioop leaked [3, 3, 3] references, sum=9


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflog8VuWBG', '-x']

From python-checkins at python.org  Sun Jul  4 03:35:45 2010
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Jul 2010 03:35:45 +0200 (CEST)
Subject: [Python-checkins] r82525 - in tracker/roundup-src:
	roundup/cgi/templating.py test/test_templating.py
Message-ID: <20100704013545.D70B8EE9A0@mail.python.org>

Author: ezio.melotti
Date: Sun Jul  4 03:35:45 2010
New Revision: 82525

Log:
#254: now URLs inside parentheses (e.g. www.python.org) are linkified properly.

Modified:
   tracker/roundup-src/roundup/cgi/templating.py
   tracker/roundup-src/test/test_templating.py

Modified: tracker/roundup-src/roundup/cgi/templating.py
==============================================================================
--- tracker/roundup-src/roundup/cgi/templating.py	(original)
+++ tracker/roundup-src/roundup/cgi/templating.py	Sun Jul  4 03:35:45 2010
@@ -1343,16 +1343,21 @@
             u = s = match.group('url')
             if not self.protocol_re.search(s):
                 u = 'http://' + s
-            # catch an escaped ">" at the end of the URL
             if s.endswith('&gt;'):
+                # catch an escaped ">" at the end of the URL
                 u = s = s[:-4]
                 e = '&gt;'
+            elif s.count('(') != s.count(')'):
+                # don't include extraneous ')' in the link
+                pos = s.rfind(')')
+                e = s[pos:]
+                u = s = s[:pos]
             else:
                 e = ''
-            return '<a href="%s">%s</a>%s'%(u, s, e)
+            return '<a href="%s">%s</a>%s' % (u, s, e)
         elif match.group('email'):
             s = match.group('email')
-            return '<a href="mailto:%s">%s</a>'%(s, s)
+            return '<a href="mailto:%s">%s</a>' % (s, s)
         elif len(match.group('id')) < 10:
             return self._hyper_repl_item(match,
                 '<a href="%(cls)s%(id)s">%(item)s</a>')

Modified: tracker/roundup-src/test/test_templating.py
==============================================================================
--- tracker/roundup-src/test/test_templating.py	(original)
+++ tracker/roundup-src/test/test_templating.py	Sun Jul  4 03:35:45 2010
@@ -147,9 +147,23 @@
         p = StringHTMLProperty(self.client, 'test', '1', None, 'test', '')
         def t(s): return p.hyper_re.sub(p._hyper_repl, s)
         ae = self.assertEquals
-        ae(t('http://roundup.net/'), '<a href="http://roundup.net/">http://roundup.net/</a>')
-        ae(t('&lt;HTTP://roundup.net/&gt;'), '&lt;<a href="HTTP://roundup.net/">HTTP://roundup.net/</a>&gt;')
-        ae(t('&lt;www.roundup.net&gt;'), '&lt;<a href="http://www.roundup.net">www.roundup.net</a>&gt;')
+        ae(t('http://roundup.net/'),
+           '<a href="http://roundup.net/">http://roundup.net/</a>')
+        ae(t('&lt;HTTP://roundup.net/&gt;'),
+           '&lt;<a href="HTTP://roundup.net/">HTTP://roundup.net/</a>&gt;')
+        ae(t('&lt;www.roundup.net&gt;'),
+           '&lt;<a href="http://www.roundup.net">www.roundup.net</a>&gt;')
+        ae(t('(www.roundup.net)'),
+           '(<a href="http://www.roundup.net">www.roundup.net</a>)')
+        ae(t('foo http://msdn.microsoft.com/en-us/library/ms741540(VS.85).aspx bar'),
+           'foo <a href="http://msdn.microsoft.com/en-us/library/ms741540(VS.85).aspx">'
+           'http://msdn.microsoft.com/en-us/library/ms741540(VS.85).aspx</a> bar')
+        ae(t('(e.g. http://en.wikipedia.org/wiki/Python_(programming_language))'),
+           '(e.g. <a href="http://en.wikipedia.org/wiki/Python_(programming_language)">'
+           'http://en.wikipedia.org/wiki/Python_(programming_language)</a>)')
+        ae(t('(e.g. http://en.wikipedia.org/wiki/Python_(programming_language)).'),
+           '(e.g. <a href="http://en.wikipedia.org/wiki/Python_(programming_language)">'
+           'http://en.wikipedia.org/wiki/Python_(programming_language)</a>).')
 
 '''
 class HTMLPermissions:

From python-checkins at python.org  Sun Jul  4 09:25:18 2010
From: python-checkins at python.org (georg.brandl)
Date: Sun,  4 Jul 2010 09:25:18 +0200 (CEST)
Subject: [Python-checkins] r82526 - python/branches/py3k/Demo/classes/Dbm.py
Message-ID: <20100704072518.A0C34EECF@mail.python.org>

Author: georg.brandl
Date: Sun Jul  4 09:25:18 2010
New Revision: 82526

Log:
Remove old and unsafe Dbm demo class.

Removed:
   python/branches/py3k/Demo/classes/Dbm.py

Deleted: python/branches/py3k/Demo/classes/Dbm.py
==============================================================================
--- python/branches/py3k/Demo/classes/Dbm.py	Sun Jul  4 09:25:18 2010
+++ (empty file)
@@ -1,66 +0,0 @@
-# A wrapper around the (optional) built-in class dbm, supporting keys
-# and values of almost any type instead of just string.
-# (Actually, this works only for keys and values that can be read back
-# correctly after being converted to a string.)
-
-
-class Dbm:
-
-    def __init__(self, filename, mode, perm):
-        import dbm.ndbm
-        self.db = dbm.ndbm.open(filename, mode, perm)
-
-    def __repr__(self):
-        s = ''
-        for key in self.keys():
-            t = repr(key) + ': ' + repr(self[key])
-            if s: t = ', ' + t
-            s = s + t
-        return '{' + s + '}'
-
-    def __len__(self):
-        return len(self.db)
-
-    def __getitem__(self, key):
-        return eval(self.db[repr(key)])
-
-    def __setitem__(self, key, value):
-        self.db[repr(key)] = repr(value)
-
-    def __delitem__(self, key):
-        del self.db[repr(key)]
-
-    def keys(self):
-        res = []
-        for key in self.db.keys():
-            res.append(eval(key))
-        return res
-
-    def has_key(self, key):
-        return repr(key) in self.db
-
-
-def test():
-    d = Dbm('@dbm', 'rw', 0o600)
-    print(d)
-    while 1:
-        try:
-            key = eval(input('key: '))
-            if key in d:
-                value = d[key]
-                print('currently:', value)
-            value = eval(input('value: '))
-            if value is None:
-                del d[key]
-            else:
-                d[key] = value
-        except KeyboardInterrupt:
-            print('')
-            print(d)
-        except EOFError:
-            print('[eof]')
-            break
-    print(d)
-
-
-test()

From python-checkins at python.org  Sun Jul  4 11:16:45 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:16:45 +0200
Subject: [Python-checkins] distutils2: [mq]: util.Mixin2to3,
	util.run_2to3 added(wrappers). tests added.
Message-ID: <E1OVLJd-0008FM-UC@dinsdale.python.org>

tarek.ziade pushed bf6057787636 to distutils2:

http://hg.python.org/distutils2/rev/bf6057787636
changeset:   253:bf6057787636
user:        Zubin Mithra <zubin.mithra at gmail.com>
date:        Sun Jul 04 02:46:38 2010 +0530
summary:     [mq]: util.Mixin2to3, util.run_2to3 added(wrappers). tests added.
files:       src/distutils2/tests/test_util.py, src/distutils2/util.py

diff --git a/src/distutils2/tests/test_util.py b/src/distutils2/tests/test_util.py
--- a/src/distutils2/tests/test_util.py
+++ b/src/distutils2/tests/test_util.py
@@ -296,6 +296,35 @@
         res = find_packages([root], ['pkg1.pkg2'])
         self.assertEqual(set(res), set(['pkg1', 'pkg5', 'pkg1.pkg3', 'pkg1.pkg3.pkg6']))
 
+    def test_run_2to3_on_code(self):
+        content = "print 'test'"
+        converted_content = "print('test')"
+        file_handle = tempfile.NamedTemporaryFile(delete=True)
+        file_name = file_handle.name
+        file_handle.write(content)
+        file_handle.flush()
+        file_handle.seek(0)
+        from distutils2.util import run_2to3
+        run_2to3([file_name])
+        new_content = "".join(file_handle.read())
+        file_handle.close()
+        self.assertEquals(new_content, converted_content)
+
+    def test_run_2to3_on_doctests(self):
+        # to check if text files containing doctests only get converted.
+        content = ">>> print 'test'\ntest\n"
+        converted_content = ">>> print('test')\ntest\n\n"
+        file_handle = tempfile.NamedTemporaryFile(delete=True)
+        file_name = file_handle.name
+        file_handle.write(content)
+        file_handle.flush()
+        file_handle.seek(0)
+        from distutils2.util import run_2to3
+        run_2to3([file_name], doctests_only=True)
+        new_content = "".join(file_handle.readlines())
+        file_handle.close()
+        self.assertEquals(new_content, converted_content)
+
 
 def test_suite():
     return unittest.makeSuite(UtilTestCase)
diff --git a/src/distutils2/util.py b/src/distutils2/util.py
--- a/src/distutils2/util.py
+++ b/src/distutils2/util.py
@@ -616,3 +616,48 @@
                 packages.append(package_name)
     return packages
 
+
+# utility functions for 2to3 support
+
+def run_2to3(files, doctests_only=False, fixer_names=None, options=None, 
+                                                            explicit=None):
+    """ Wrapper function around the refactor() class which
+	performs the conversions on a list of python files.
+	Invoke 2to3 on a list of Python files. The files should all come 
+	from the build area, as the modification is done in-place."""
+
+    if not files:
+        return
+
+    # Make this class local, to delay import of 2to3
+    from lib2to3.refactor import get_fixers_from_package
+    from distutils2.converter.refactor import DistutilsRefactoringTool
+
+    if fixer_names is None:
+        fixer_names = get_fixers_from_package('lib2to3.fixes')
+
+    r = DistutilsRefactoringTool(fixer_names, options=options)
+    if doctests_only:
+        r.refactor(files, doctests_only=True, write=True)
+    else:
+        r.refactor(files, write=True)
+
+class Mixin2to3:
+    """ Wrapper class for commands that run 2to3.
+    To configure 2to3, setup scripts may either change
+    the class variables, or inherit from this class
+    to override how 2to3 is invoked.
+    """
+    # provide list of fixers to run.
+    # defaults to all from lib2to3.fixers
+    fixer_names = None
+
+    # options dictionary
+    options = None
+
+    # list of fixers to invoke even though they are marked as explicit
+    explicit = None
+
+    def run_2to3(self, files, doctests_only=False):
+        """ Issues a call to util.run_2to3. """
+        return run_2to3(files, doctests_only, self.fixer_names, self.options, self.explicit)

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:16:45 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:16:45 +0200
Subject: [Python-checkins] distutils2: [mq]: test for build_py.Mixin2to3
	added
Message-ID: <E1OVLJd-0008FT-VK@dinsdale.python.org>

tarek.ziade pushed 47a7885ad97a to distutils2:

http://hg.python.org/distutils2/rev/47a7885ad97a
changeset:   255:47a7885ad97a
user:        Zubin Mithra <zubin.mithra at gmail.com>
date:        Sun Jul 04 02:51:59 2010 +0530
summary:     [mq]: test for build_py.Mixin2to3 added
files:       src/distutils2/tests/test_Mixin2to3.py

diff --git a/src/distutils2/tests/test_Mixin2to3.py b/src/distutils2/tests/test_Mixin2to3.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/tests/test_Mixin2to3.py
@@ -0,0 +1,47 @@
+"""Tests for distutils.command.build_py."""
+
+import tempfile
+import distutils2
+from distutils2.tests import support
+from distutils2.tests.support import unittest
+from distutils2.command.build_py import Mixin2to3
+
+class Mixin2to3TestCase(unittest.TestCase):
+    def test_convert_code_only(self):
+        # used to check if code gets converted properly.
+        code_content = "print 'test'\n"
+        code_handle = tempfile.NamedTemporaryFile(delete=True)
+        code_name = code_handle.name
+
+        code_handle.write(code_content)
+        code_handle.flush()
+
+        mixin2to3 = Mixin2to3() 
+        mixin2to3._run_2to3([code_name])
+        converted_code_content = "print('test')\n"
+        new_code_content = "".join(open(code_name).readlines())
+
+        self.assertEquals(new_code_content, converted_code_content)
+
+    def test_doctests_only(self):
+        # used to check if doctests gets converted properly.
+        doctest_content = '"""\n>>> print test\ntest\n"""\nprint test\n\n'
+        doctest_handle = tempfile.NamedTemporaryFile(delete=True)
+        doctest_name = doctest_handle.name
+
+        doctest_handle.write(doctest_content)
+        doctest_handle.flush()
+
+        mixin2to3 = Mixin2to3()
+        mixin2to3._run_2to3([doctest_name])
+
+        converted_doctest_content = '"""\n>>> print(test)\ntest\n"""\nprint(test)\n\n\n'
+        new_doctest_content = "".join(open(doctest_name).readlines())
+
+        self.assertEquals(new_doctest_content, converted_doctest_content)
+
+def test_suite():
+    return unittest.makeSuite(Mixin2to3TestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:16:45 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:16:45 +0200
Subject: [Python-checkins] distutils2: [mq]: core.py,
	dist.py modified to include use_2to3, convert_2to3_doctests
Message-ID: <E1OVLJd-0008FC-TU@dinsdale.python.org>

tarek.ziade pushed 961a8257a8b9 to distutils2:

http://hg.python.org/distutils2/rev/961a8257a8b9
changeset:   252:961a8257a8b9
user:        Zubin Mithra <zubin.mithra at gmail.com>
date:        Sun Jul 04 02:44:25 2010 +0530
summary:     [mq]: core.py, dist.py modified to include use_2to3, convert_2to3_doctests
files:       src/distutils2/core.py, src/distutils2/dist.py

diff --git a/src/distutils2/core.py b/src/distutils2/core.py
--- a/src/distutils2/core.py
+++ b/src/distutils2/core.py
@@ -49,7 +49,8 @@
                   'maintainer', 'maintainer_email', 'url', 'license',
                   'description', 'long_description', 'keywords',
                   'platforms', 'classifiers', 'download_url',
-                  'requires', 'provides', 'obsoletes',
+                  'requires', 'provides', 'obsoletes', 'use_2to3',
+                  'convert_2to3_doctests',
                   )
 
 # Legal keyword arguments for the Extension constructor
diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -112,7 +112,11 @@
         ('requires', None,
          "print the list of packages/modules required"),
         ('obsoletes', None,
-         "print the list of packages/modules made obsolete")
+         "print the list of packages/modules made obsolete"),
+        ('use-2to3', None,
+         "use 2to3 to make source python 3.x compatible"),
+        ('convert-2to3-doctests', None,
+         "use 2to3 to convert doctests in seperate text files"), 
         ]
     display_option_names = map(lambda x: translate_longopt(x[0]),
                                display_options)
@@ -206,6 +210,8 @@
         self.scripts = None
         self.data_files = None
         self.password = ''
+        self.use_2to3 = False
+        self.convert_2to3_doctests = []
 
         # And now initialize bookkeeping stuff that can't be supplied by
         # the caller at all.  'command_obj' maps command names to
@@ -581,15 +587,11 @@
         instance, analogous to the .finalize_options() method of Command
         objects.
         """
-
-        # XXX conversion -- removed
-        #for attr in ('keywords', 'platforms'):
-        #    value = self.metadata.get_field(attr)
-        #    if value is None:
-        #        continue
-        #    if isinstance(value, str):
-        #        value = [elm.strip() for elm in value.split(',')]
-        #        setattr(self.metadata, attr, value)
+        if getattr(self, 'convert_2to3_doctests', None):
+            self.convert_2to3_doctests = [os.path.join(p) 
+                                for p in self.convert_2to3_doctests]
+        else:
+            self.convert_2to3_doctests = []
 
     def _show_help(self, parser, global_options=1, display_options=1,
                    commands=[]):

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:16:45 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:16:45 +0200
Subject: [Python-checkins] distutils2: [mq]: use_2to3,
	convert_2to3_doctests added to build_py.py
Message-ID: <E1OVLJd-0008FQ-Ul@dinsdale.python.org>

tarek.ziade pushed 1dae0574c333 to distutils2:

http://hg.python.org/distutils2/rev/1dae0574c333
changeset:   254:1dae0574c333
user:        Zubin Mithra <zubin.mithra at gmail.com>
date:        Sun Jul 04 02:49:48 2010 +0530
summary:     [mq]: use_2to3, convert_2to3_doctests added to build_py.py
files:       src/distutils2/__init__.py, src/distutils2/command/build_py.py

diff --git a/src/distutils2/__init__.py b/src/distutils2/__init__.py
--- a/src/distutils2/__init__.py
+++ b/src/distutils2/__init__.py
@@ -18,3 +18,9 @@
 
 __revision__ = "$Id: __init__.py 78020 2010-02-06 16:37:32Z benjamin.peterson $"
 __version__ = "1.0a2"
+
+
+# when set to True, converts doctests by default too 
+run_2to3_on_doctests = True
+# Standard package names for fixer packages
+lib2to3_fixer_packages = ['lib2to3.fixes']
diff --git a/src/distutils2/command/build_py.py b/src/distutils2/command/build_py.py
--- a/src/distutils2/command/build_py.py
+++ b/src/distutils2/command/build_py.py
@@ -6,14 +6,65 @@
 
 import os
 import sys
+import logging
 from glob import glob
 
 from distutils2.core import Command
 from distutils2.errors import DistutilsOptionError, DistutilsFileError
 from distutils2.util import convert_path
-from distutils2 import log
+from distutils2.converter.refactor import DistutilsRefactoringTool
 
-class build_py(Command):
+# marking public APIs
+__all__ = ['Mixin2to3', 'build_py']
+
+try:
+    from distutils2.util import Mixin2to3 as _Mixin2to3
+    from lib2to3.refactor import get_fixers_from_package
+    _CONVERT = True
+    _KLASS = _Mixin2to3
+except ImportError:
+    _CONVERT = False
+    _KLASS = object
+
+class Mixin2to3(_KLASS):
+    """ The base class which can be used for refactoring. When run under
+    Python 3.0, the run_2to3 method provided by Mixin2to3 is overridden. 
+    When run on Python 2.x, it merely creates a class which overrides run_2to3, 
+    yet does nothing in particular with it. 
+    """
+    if _CONVERT:
+        def _run_2to3(self, files, doctests=[]):
+            """ Takes a list of files and doctests, and performs conversion
+            on those. 
+              - First, the files which contain the code(`files`) are converted.
+              - Second, the doctests in `files` are converted.
+              - Thirdly, the doctests in `doctests` are converted.
+            """
+
+            # Convert the ".py" files.
+            logging.info("Converting Python code")
+            _KLASS.run_2to3(self, files)
+
+            # Convert the doctests in the ".py" files.
+            logging.info("Converting doctests with '.py' files")
+            _KLASS.run_2to3(self, files, doctests_only=True)
+
+            # If the following conditions are met, then convert:-
+            # 1. User has specified the 'convert_2to3_doctests' option. So, we
+            #    can expect that the list 'doctests' is not empty.
+            # 2. The default is allow distutils2 to allow conversion of text files
+            #    containing doctests. It is set as 
+            #    distutils2.run_2to3_on_doctests
+
+            if doctests != [] and distutils2.run_2to3_on_doctests:
+                logging.info("Converting text files which contain doctests")
+                _KLASS.run_2to3(self, doctests, doctests_only=True)
+    else:
+        # If run on Python 2.x, there is nothing to do.
+        def _run_2to3(self, files, doctests=[]):
+            pass
+
+class build_py(Command, Mixin2to3):
 
     description = "\"build\" pure Python modules (copy to build directory)"
 
@@ -39,6 +90,8 @@
         self.compile = 0
         self.optimize = 0
         self.force = None
+        self._updated_files = []
+        self._doctests_2to3 = []
 
     def finalize_options(self):
         self.set_undefined_options('build',
@@ -93,6 +146,9 @@
             self.build_packages()
             self.build_package_data()
 
+        if self.distribution.use_2to3 and self_updated_files:
+            self.run_2to3(self._updated_files, self._doctests_2to3)
+
         self.byte_compile(self.get_outputs(include_bytecode=0))
 
     def get_data_files(self):
@@ -137,8 +193,10 @@
             for filename in filenames:
                 target = os.path.join(build_dir, filename)
                 self.mkpath(os.path.dirname(target))
-                self.copy_file(os.path.join(src_dir, filename), target,
-                               preserve_mode=False)
+                outf, copied = self.copy_file(os.path.join(src_dir, filename),
+                               target, preserve_mode=False)
+                if copied and srcfile in self.distribution.convert_2to3.doctests:
+                    self._doctests_2to3.append(outf)
 
     def get_package_dir(self, package):
         """Return the directory, relative to the top of the source

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:16:45 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:16:45 +0200
Subject: [Python-checkins] distutils2: Making sure the code works on all
	Python versions.
Message-ID: <E1OVLJd-0008FY-W3@dinsdale.python.org>

tarek.ziade pushed f696d39e9e86 to distutils2:

http://hg.python.org/distutils2/rev/f696d39e9e86
changeset:   256:f696d39e9e86
tag:         tip
user:        Tarek Ziade <tarek at ziade.org>
date:        Sun Jul 04 11:16:37 2010 +0200
summary:     Making sure the code works on all Python versions.
files:       src/distutils2/command/build_py.py, src/distutils2/tests/support.py, src/distutils2/tests/test_Mixin2to3.py, src/distutils2/tests/test_util.py, src/distutils2/util.py

diff --git a/src/distutils2/command/build_py.py b/src/distutils2/command/build_py.py
--- a/src/distutils2/command/build_py.py
+++ b/src/distutils2/command/build_py.py
@@ -28,14 +28,14 @@
 
 class Mixin2to3(_KLASS):
     """ The base class which can be used for refactoring. When run under
-    Python 3.0, the run_2to3 method provided by Mixin2to3 is overridden. 
-    When run on Python 2.x, it merely creates a class which overrides run_2to3, 
-    yet does nothing in particular with it. 
+    Python 3.0, the run_2to3 method provided by Mixin2to3 is overridden.
+    When run on Python 2.x, it merely creates a class which overrides run_2to3,
+    yet does nothing in particular with it.
     """
     if _CONVERT:
         def _run_2to3(self, files, doctests=[]):
             """ Takes a list of files and doctests, and performs conversion
-            on those. 
+            on those.
               - First, the files which contain the code(`files`) are converted.
               - Second, the doctests in `files` are converted.
               - Thirdly, the doctests in `doctests` are converted.
@@ -53,7 +53,7 @@
             # 1. User has specified the 'convert_2to3_doctests' option. So, we
             #    can expect that the list 'doctests' is not empty.
             # 2. The default is allow distutils2 to allow conversion of text files
-            #    containing doctests. It is set as 
+            #    containing doctests. It is set as
             #    distutils2.run_2to3_on_doctests
 
             if doctests != [] and distutils2.run_2to3_on_doctests:
@@ -258,8 +258,8 @@
             if os.path.isfile(init_py):
                 return init_py
             else:
-                log.warn(("package init file '%s' not found " +
-                          "(or not a regular file)"), init_py)
+                logging.warning(("package init file '%s' not found " +
+                                 "(or not a regular file)"), init_py)
 
         # Either not in a package at all (__init__.py not expected), or
         # __init__.py doesn't exist -- so don't return the filename.
@@ -267,7 +267,8 @@
 
     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)
+            logging.warning("file %s (for module %s) not found",
+                            module_file, module)
             return False
         else:
             return True
diff --git a/src/distutils2/tests/support.py b/src/distutils2/tests/support.py
--- a/src/distutils2/tests/support.py
+++ b/src/distutils2/tests/support.py
@@ -64,12 +64,22 @@
     def setUp(self):
         super(TempdirManager, self).setUp()
         self.tempdirs = []
+        self.tempfiles = []
 
     def tearDown(self):
         super(TempdirManager, self).tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()
             shutil.rmtree(d, os.name in ('nt', 'cygwin'))
+        for file_ in self.tempfiles:
+            if os.path.exists(file_):
+                os.remove(file_)
+
+    def mktempfile(self):
+        """Create a temporary file that will be cleaned up."""
+        tempfile_ = tempfile.NamedTemporaryFile()
+        self.tempfiles.append(tempfile_.name)
+        return tempfile_
 
     def mkdtemp(self):
         """Create a temporary directory that will be cleaned up.
diff --git a/src/distutils2/tests/test_Mixin2to3.py b/src/distutils2/tests/test_Mixin2to3.py
--- a/src/distutils2/tests/test_Mixin2to3.py
+++ b/src/distutils2/tests/test_Mixin2to3.py
@@ -1,32 +1,37 @@
 """Tests for distutils.command.build_py."""
+import sys
+import tempfile
 
-import tempfile
 import distutils2
 from distutils2.tests import support
 from distutils2.tests.support import unittest
 from distutils2.command.build_py import Mixin2to3
 
-class Mixin2to3TestCase(unittest.TestCase):
+
+class Mixin2to3TestCase(support.TempdirManager, unittest.TestCase):
+
+    @unittest.skipUnless(sys.version > '2.6', 'Need >= 2.6')
     def test_convert_code_only(self):
         # used to check if code gets converted properly.
         code_content = "print 'test'\n"
-        code_handle = tempfile.NamedTemporaryFile(delete=True)
+        code_handle = self.mktempfile()
         code_name = code_handle.name
 
         code_handle.write(code_content)
         code_handle.flush()
 
-        mixin2to3 = Mixin2to3() 
+        mixin2to3 = Mixin2to3()
         mixin2to3._run_2to3([code_name])
         converted_code_content = "print('test')\n"
         new_code_content = "".join(open(code_name).readlines())
 
         self.assertEquals(new_code_content, converted_code_content)
 
+    @unittest.skipUnless(sys.version > '2.6', 'Need >= 2.6')
     def test_doctests_only(self):
         # used to check if doctests gets converted properly.
         doctest_content = '"""\n>>> print test\ntest\n"""\nprint test\n\n'
-        doctest_handle = tempfile.NamedTemporaryFile(delete=True)
+        doctest_handle = self.mktempfile()
         doctest_name = doctest_handle.name
 
         doctest_handle.write(doctest_content)
@@ -35,7 +40,9 @@
         mixin2to3 = Mixin2to3()
         mixin2to3._run_2to3([doctest_name])
 
-        converted_doctest_content = '"""\n>>> print(test)\ntest\n"""\nprint(test)\n\n\n'
+        converted_doctest_content = ['"""', '>>> print(test)', 'test', '"""',
+                                     'print(test)', '', '', '']
+        converted_doctest_content = '\n'.join(converted_doctest_content)
         new_doctest_content = "".join(open(doctest_name).readlines())
 
         self.assertEquals(new_doctest_content, converted_doctest_content)
diff --git a/src/distutils2/tests/test_util.py b/src/distutils2/tests/test_util.py
--- a/src/distutils2/tests/test_util.py
+++ b/src/distutils2/tests/test_util.py
@@ -296,10 +296,11 @@
         res = find_packages([root], ['pkg1.pkg2'])
         self.assertEqual(set(res), set(['pkg1', 'pkg5', 'pkg1.pkg3', 'pkg1.pkg3.pkg6']))
 
+    @unittest.skipUnless(sys.version > '2.6', 'Need Python 2.6 or more')
     def test_run_2to3_on_code(self):
         content = "print 'test'"
         converted_content = "print('test')"
-        file_handle = tempfile.NamedTemporaryFile(delete=True)
+        file_handle = self.mktempfile()
         file_name = file_handle.name
         file_handle.write(content)
         file_handle.flush()
@@ -310,11 +311,12 @@
         file_handle.close()
         self.assertEquals(new_content, converted_content)
 
+    @unittest.skipUnless(sys.version > '2.6', 'Need Python 2.6 or more')
     def test_run_2to3_on_doctests(self):
         # to check if text files containing doctests only get converted.
         content = ">>> print 'test'\ntest\n"
         converted_content = ">>> print('test')\ntest\n\n"
-        file_handle = tempfile.NamedTemporaryFile(delete=True)
+        file_handle = self.mktempfile()
         file_name = file_handle.name
         file_handle.write(content)
         file_handle.flush()
diff --git a/src/distutils2/util.py b/src/distutils2/util.py
--- a/src/distutils2/util.py
+++ b/src/distutils2/util.py
@@ -5,7 +5,10 @@
 
 __revision__ = "$Id: util.py 77761 2010-01-26 22:46:15Z tarek.ziade $"
 
-import sys, os, string, re
+import sys
+import os
+import string
+import re
 from copy import copy
 from fnmatch import fnmatchcase
 
@@ -17,6 +20,7 @@
 
 _PLATFORM = None
 
+
 def newer(source, target):
     """Tells if the target is newer than the source.
 
@@ -37,6 +41,7 @@
 
     return os.stat(source).st_mtime > os.stat(target).st_mtime
 
+
 def get_platform():
     """Return a string that identifies the current platform.
 
@@ -48,6 +53,7 @@
         _PLATFORM = _sysconfig.get_platform()
     return _PLATFORM
 
+
 def set_platform(identifier):
     """Sets the platform string identifier returned by get_platform().
 
@@ -57,6 +63,7 @@
     global _PLATFORM
     _PLATFORM = identifier
 
+
 def convert_path(pathname):
     """Return 'pathname' as a name that will work on the native filesystem.
 
@@ -125,6 +132,7 @@
 
 _environ_checked = 0
 
+
 def check_environ():
     """Ensure that 'os.environ' has all the environment variables needed.
 
@@ -147,6 +155,7 @@
 
     _environ_checked = 1
 
+
 def subst_vars(s, local_vars):
     """Perform shell/Perl-style variable substitution on 'string'.
 
@@ -158,7 +167,8 @@
     variables not found in either 'local_vars' or 'os.environ'.
     """
     check_environ()
-    def _subst (match, local_vars=local_vars):
+
+    def _subst(match, local_vars=local_vars):
         var_name = match.group(1)
         if var_name in local_vars:
             return str(local_vars[var_name])
@@ -170,6 +180,7 @@
     except KeyError, var:
         raise ValueError("invalid variable '$%s'" % var)
 
+
 def grok_environment_error(exc, prefix="error: "):
     """Generate a useful error message from an EnvironmentError.
 
@@ -196,12 +207,14 @@
 # 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):
     """Split a string up according to Unix shell-like rules for quotes and
     backslashes.
@@ -217,7 +230,8 @@
     # 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()
+    if _wordchars_re is None:
+        _init_regex()
 
     s = s.strip()
     words = []
@@ -237,8 +251,8 @@
 
         elif s[end] == '\\':            # preserve whatever is being escaped;
                                         # will become part of the current word
-            s = s[:end] + s[end+1:]
-            pos = end+1
+            s = s[:end] + s[end + 1:]
+            pos = end + 1
 
         else:
             if s[end] == "'":           # slurp singly-quoted string
@@ -253,7 +267,7 @@
                 raise ValueError("bad string (mismatched %s quotes?)" % s[end])
 
             (beg, end) = m.span()
-            s = s[:beg] + s[beg+1:end-1] + s[end:]
+            s = s[:beg] + s[beg + 1:end - 1] + s[end:]
             pos = m.end() - 2
 
         if pos >= len(s):
@@ -296,7 +310,7 @@
     elif val in ('n', 'no', 'f', 'false', 'off', '0'):
         return 0
     else:
-        raise ValueError, "invalid truth value %r" % (val,)
+        raise ValueError("invalid truth value %r" % (val,))
 
 
 def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
@@ -450,7 +464,9 @@
     return sep.join(lines)
 
 _RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)')
-_MAC_OS_X_LD_VERSION = re.compile('^@\(#\)PROGRAM:ld  PROJECT:ld64-((\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."""
@@ -459,6 +475,7 @@
     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.
 
@@ -488,6 +505,7 @@
         return None
     return result.group(1)
 
+
 def get_compiler_versions():
     """Returns a tuple providing the versions of gcc, ld and dllwrap
 
@@ -499,6 +517,7 @@
     dllwrap = _find_exe_version('dllwrap --version')
     return gcc, ld, dllwrap
 
+
 def newer_group(sources, target, missing='error'):
     """Return true if 'target' is out-of-date with respect to any file
     listed in 'sources'.
@@ -538,6 +557,7 @@
 
     return False
 
+
 def write_file(filename, contents):
     """Create a file with the specified name and write 'contents' (a
     sequence of strings without line terminators) to it.
@@ -549,12 +569,14 @@
     finally:
         f.close()
 
+
 def _is_package(path):
     """Returns True if path is a package (a dir with an __init__ file."""
     if not os.path.isdir(path):
         return False
     return os.path.isfile(os.path.join(path, '__init__.py'))
 
+
 def _under(path, root):
     path = path.split(os.sep)
     root = root.split(os.sep)
@@ -565,12 +587,14 @@
             return False
     return True
 
+
 def _package_name(root_path, path):
     """Returns a dotted package name, given a subpath."""
     if not _under(path, root_path):
         raise ValueError('"%s" is not a subpath of "%s"' % (path, root_path))
     return path[len(root_path) + 1:].replace(os.sep, '.')
 
+
 def find_packages(paths=('.',), exclude=()):
     """Return a list all Python packages found recursively within
     directories 'paths'
@@ -585,6 +609,7 @@
     """
     packages = []
     discarded = []
+
     def _discarded(path):
         for discard in discarded:
             if _under(path, discard):
@@ -619,12 +644,12 @@
 
 # utility functions for 2to3 support
 
-def run_2to3(files, doctests_only=False, fixer_names=None, options=None, 
+def run_2to3(files, doctests_only=False, fixer_names=None, options=None,
                                                             explicit=None):
     """ Wrapper function around the refactor() class which
-	performs the conversions on a list of python files.
-	Invoke 2to3 on a list of Python files. The files should all come 
-	from the build area, as the modification is done in-place."""
+    performs the conversions on a list of python files.
+    Invoke 2to3 on a list of Python files. The files should all come
+    from the build area, as the modification is done in-place."""
 
     if not files:
         return
@@ -642,6 +667,7 @@
     else:
         r.refactor(files, write=True)
 
+
 class Mixin2to3:
     """ Wrapper class for commands that run 2to3.
     To configure 2to3, setup scripts may either change
@@ -660,4 +686,5 @@
 
     def run_2to3(self, files, doctests_only=False):
         """ Issues a call to util.run_2to3. """
-        return run_2to3(files, doctests_only, self.fixer_names, self.options, self.explicit)
+        return run_2to3(files, doctests_only, self.fixer_names,
+                        self.options, self.explicit)

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: two typos fixed
Message-ID: <E1OVLoU-0000fv-IG@dinsdale.python.org>

tarek.ziade pushed 2f6b9df54955 to distutils2:

http://hg.python.org/distutils2/rev/2f6b9df54955
changeset:   257:2f6b9df54955
parent:      82:342424580a5f
user:        Konrad Delong <konryd at gmail.com>
date:        Fri Mar 19 09:38:42 2010 -0400
summary:     two typos fixed
files:       docs/design/pep-0376.txt, docs/design/wiki.rst

diff --git a/docs/design/pep-0376.txt b/docs/design/pep-0376.txt
--- a/docs/design/pep-0376.txt
+++ b/docs/design/pep-0376.txt
@@ -633,7 +633,7 @@
 
 Distributions installed using existing, pre-standardization formats do not have
 the necessary metadata available for the new API, and thus will be
-ignored. Third-party tools may of course to continue to support previous
+ignored. Third-party tools may of course continue to support previous
 formats in addition to the new format, in order to ease the transition.
 
 
diff --git a/docs/design/wiki.rst b/docs/design/wiki.rst
--- a/docs/design/wiki.rst
+++ b/docs/design/wiki.rst
@@ -282,7 +282,7 @@
   mailman/etc/*               = {config}                # 8
   mailman/foo/**/bar/*.cfg    = {config}/baz            # 9
   mailman/foo/**/*.cfg        = {config}/hmm            # 9, 10
-  some-new-semantic.txt       = {funky-crazy-category}  # 11
+  some-new-semantic.sns       = {funky-crazy-category}  # 11
 
 The glob definitions are relative paths that match files from the top
 of the source tree (the location of ``setup.cfg``). Forward slashes

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: docs updated
Message-ID: <E1OVLoU-0000gI-OR@dinsdale.python.org>

tarek.ziade pushed dc5fbc82c929 to distutils2:

http://hg.python.org/distutils2/rev/dc5fbc82c929
changeset:   261:dc5fbc82c929
user:        Konrad Delong <konryd at gmail.com>
date:        Sun May 09 14:10:36 2010 -0400
summary:     docs updated
files:       docs/source/index.rst, docs/source/new_commands.rst

diff --git a/docs/source/index.rst b/docs/source/index.rst
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -12,6 +12,7 @@
    :maxdepth: 2
 
    metadata
+   new_commands
 
 Indices and tables
 ==================
diff --git a/docs/source/new_commands.rst b/docs/source/new_commands.rst
new file mode 100644
--- /dev/null
+++ b/docs/source/new_commands.rst
@@ -0,0 +1,64 @@
+========
+Commands
+========
+
+Distutils2 provides a set of commands that are not present in distutils itself.
+You might recognize some of them from other projects, like Distribute or
+Setuptools.
+
+``upload_docs`` - Upload package documentation to PyPI
+======================================================
+
+PyPI now supports uploading project documentation to the dedicated URL
+http://packages.python.org/<project>/.
+
+The ``upload_docs`` command will create the necessary zip file out of a
+documentation directory and will post to the repository.
+
+Note that to upload the documentation of a project, the corresponding version
+must already be registered with PyPI, using the distutils ``register``
+command -- just like the ``upload`` command.
+
+Assuming there is an ``Example`` project with documentation in the
+subdirectory ``docs``, e.g.::
+
+  Example/
+  |-- example.py
+  |-- setup.cfg
+  |-- setup.py
+  |-- docs
+  |   |-- build
+  |   |   `-- html
+  |   |   |   |-- index.html
+  |   |   |   `-- tips_tricks.html
+  |   |-- conf.py
+  |   |-- index.txt
+  |   `-- tips_tricks.txt
+
+You can simply pass the documentation directory path to the ``upload_docs``
+command::
+
+    python setup.py upload_docs --upload-dir=docs/build/html
+
+As with any other ``setuptools`` based command, you can define useful
+defaults in the ``setup.cfg`` of your Python project, e.g.:
+
+.. code-block:: ini
+
+    [upload_docs]
+    upload-dir = docs/build/html
+
+The ``upload_docs`` command has the following options:
+
+``--upload-dir``
+    The directory to be uploaded to the repository.
+
+``--show-response``
+    Display the full response text from server; this is useful for debugging
+    PyPI problems.
+
+``--repository=URL, -r URL``
+    The URL of the repository to upload to.  Defaults to
+    http://pypi.python.org/pypi (i.e., the main PyPI installation).
+
+

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: merged upstream
Message-ID: <E1OVLoU-0000g6-M5@dinsdale.python.org>

tarek.ziade pushed 0b00b7e6e0b8 to distutils2:

http://hg.python.org/distutils2/rev/0b00b7e6e0b8
changeset:   258:0b00b7e6e0b8
parent:      257:2f6b9df54955
parent:      122:69952f1f6af5
user:        Konrad Delong <konryd at gmail.com>
date:        Fri Apr 30 13:47:23 2010 -0400
summary:     merged upstream
files:       docs/design/wiki.rst

diff --git a/docs/design/wiki.rst b/docs/design/wiki.rst
--- a/docs/design/wiki.rst
+++ b/docs/design/wiki.rst
@@ -332,6 +332,7 @@
 
 What happens?
 ~~~~~~~~~~~~~
+
 As an example, ``mailman/database/schemas/blah.schema``:
 
 1. The file ``mailman/database/schemas/blah.schema`` in the source
@@ -397,8 +398,17 @@
   be nice to not need an equivalent of ``setup.py develop``. Can we just walk up
   the folder hierarchy from the module until we find a setup.cfg? A setup.cfg is
   necessary if you use distutils2, is it not?
+
+  -> information founded in setup.cfg will be put in the *FILES* file upon
+  installation in the egg-info directory. 
+  IOW in the unbuit-egg case, we would need to create that dir, then use 
+  pkgutil APIs.
+
 * If sysconfig.cfg lands in Python 2.7, what happens when we run distutils2 in
   2.4?
+
+  -> A backport of sysconfig.cfg is provided within the distutils2 distribution.
+  
 * Our new glob-based [resources] section is much more compact (and consistent
   with other systems, like bash) than the explicit MANIFEST.in directives, but
   they don't offer some of the old features. Is it okay to lose exclude,
@@ -406,6 +416,8 @@
   cover their behavior? I think we could probably use a [resource:exclude]
   section with additional exclude globs in it.
 
+  -> let's list the use cases we don't cover, and see
+
 API
 ===
 
diff --git a/src/distutils2/_backport/pkgutil.py b/src/distutils2/_backport/pkgutil.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/pkgutil.py
@@ -0,0 +1,791 @@
+"""Utilities to support packages."""
+
+# NOTE: This module must remain compatible with Python 2.3, as it is shared
+# by setuptools for distribution with Python 2.3 and up.
+
+import os
+import sys
+import imp
+import os.path
+from csv import reader as csv_reader
+from types import ModuleType
+from distutils2.errors import DistutilsError
+from distutils2.metadata import DistributionMetadata
+from distutils2.version import suggest_normalized_version
+
+__all__ = [
+    'get_importer', 'iter_importers', 'get_loader', 'find_loader',
+    'walk_packages', 'iter_modules',
+    'ImpImporter', 'ImpLoader', 'read_code', 'extend_path',
+    'Distribution', 'distinfo_dirname', 'get_distributions',
+    'get_distribution', 'get_file_users', 
+]
+
+def read_code(stream):
+    # This helper is needed in order for the PEP 302 emulation to
+    # correctly handle compiled files
+    import marshal
+
+    magic = stream.read(4)
+    if magic != imp.get_magic():
+        return None
+
+    stream.read(4) # Skip timestamp
+    return marshal.load(stream)
+
+
+def simplegeneric(func):
+    """Make a trivial single-dispatch generic function"""
+    registry = {}
+    def wrapper(*args, **kw):
+        ob = args[0]
+        try:
+            cls = ob.__class__
+        except AttributeError:
+            cls = type(ob)
+        try:
+            mro = cls.__mro__
+        except AttributeError:
+            try:
+                class cls(cls, object):
+                    pass
+                mro = cls.__mro__[1:]
+            except TypeError:
+                mro = object,   # must be an ExtensionClass or some such  :(
+        for t in mro:
+            if t in registry:
+                return registry[t](*args, **kw)
+        else:
+            return func(*args, **kw)
+    try:
+        wrapper.__name__ = func.__name__
+    except (TypeError, AttributeError):
+        pass    # Python 2.3 doesn't allow functions to be renamed
+
+    def register(typ, func=None):
+        if func is None:
+            return lambda f: register(typ, f)
+        registry[typ] = func
+        return func
+
+    wrapper.__dict__ = func.__dict__
+    wrapper.__doc__ = func.__doc__
+    wrapper.register = register
+    return wrapper
+
+
+def walk_packages(path=None, prefix='', onerror=None):
+    """Yields (module_loader, name, ispkg) for all modules recursively
+    on path, or, if path is None, all accessible modules.
+
+    'path' should be either None or a list of paths to look for
+    modules in.
+
+    'prefix' is a string to output on the front of every module name
+    on output.
+
+    Note that this function must import all *packages* (NOT all
+    modules!) on the given path, in order to access the __path__
+    attribute to find submodules.
+
+    'onerror' is a function which gets called with one argument (the
+    name of the package which was being imported) if any exception
+    occurs while trying to import a package.  If no onerror function is
+    supplied, ImportErrors are caught and ignored, while all other
+    exceptions are propagated, terminating the search.
+
+    Examples:
+
+    # list all modules python can access
+    walk_packages()
+
+    # list all submodules of ctypes
+    walk_packages(ctypes.__path__, ctypes.__name__+'.')
+    """
+
+    def seen(p, m={}):
+        if p in m:
+            return True
+        m[p] = True
+
+    for importer, name, ispkg in iter_modules(path, prefix):
+        yield importer, name, ispkg
+
+        if ispkg:
+            try:
+                __import__(name)
+            except ImportError:
+                if onerror is not None:
+                    onerror(name)
+            except Exception:
+                if onerror is not None:
+                    onerror(name)
+                else:
+                    raise
+            else:
+                path = getattr(sys.modules[name], '__path__', None) or []
+
+                # don't traverse path items we've seen before
+                path = [p for p in path if not seen(p)]
+
+                for item in walk_packages(path, name+'.', onerror):
+                    yield item
+
+
+def iter_modules(path=None, prefix=''):
+    """Yields (module_loader, name, ispkg) for all submodules on path,
+    or, if path is None, all top-level modules on sys.path.
+
+    'path' should be either None or a list of paths to look for
+    modules in.
+
+    'prefix' is a string to output on the front of every module name
+    on output.
+    """
+
+    if path is None:
+        importers = iter_importers()
+    else:
+        importers = map(get_importer, path)
+
+    yielded = {}
+    for i in importers:
+        for name, ispkg in iter_importer_modules(i, prefix):
+            if name not in yielded:
+                yielded[name] = 1
+                yield i, name, ispkg
+
+
+#@simplegeneric
+def iter_importer_modules(importer, prefix=''):
+    if not hasattr(importer, 'iter_modules'):
+        return []
+    return importer.iter_modules(prefix)
+
+iter_importer_modules = simplegeneric(iter_importer_modules)
+
+
+class ImpImporter:
+    """PEP 302 Importer that wraps Python's "classic" import algorithm
+
+    ImpImporter(dirname) produces a PEP 302 importer that searches that
+    directory.  ImpImporter(None) produces a PEP 302 importer that searches
+    the current sys.path, plus any modules that are frozen or built-in.
+
+    Note that ImpImporter does not currently support being used by placement
+    on sys.meta_path.
+    """
+
+    def __init__(self, path=None):
+        self.path = path
+
+    def find_module(self, fullname, path=None):
+        # Note: we ignore 'path' argument since it is only used via meta_path
+        subname = fullname.split(".")[-1]
+        if subname != fullname and self.path is None:
+            return None
+        if self.path is None:
+            path = None
+        else:
+            path = [os.path.realpath(self.path)]
+        try:
+            file, filename, etc = imp.find_module(subname, path)
+        except ImportError:
+            return None
+        return ImpLoader(fullname, file, filename, etc)
+
+    def iter_modules(self, prefix=''):
+        if self.path is None or not os.path.isdir(self.path):
+            return
+
+        yielded = {}
+        import inspect
+
+        filenames = os.listdir(self.path)
+        filenames.sort()  # handle packages before same-named modules
+
+        for fn in filenames:
+            modname = inspect.getmodulename(fn)
+            if modname=='__init__' or modname in yielded:
+                continue
+
+            path = os.path.join(self.path, fn)
+            ispkg = False
+
+            if not modname and os.path.isdir(path) and '.' not in fn:
+                modname = fn
+                for fn in os.listdir(path):
+                    subname = inspect.getmodulename(fn)
+                    if subname=='__init__':
+                        ispkg = True
+                        break
+                else:
+                    continue    # not a package
+
+            if modname and '.' not in modname:
+                yielded[modname] = 1
+                yield prefix + modname, ispkg
+
+
+class ImpLoader:
+    """PEP 302 Loader that wraps Python's "classic" import algorithm
+    """
+    code = source = None
+
+    def __init__(self, fullname, file, filename, etc):
+        self.file = file
+        self.filename = filename
+        self.fullname = fullname
+        self.etc = etc
+
+    def load_module(self, fullname):
+        self._reopen()
+        try:
+            mod = imp.load_module(fullname, self.file, self.filename, self.etc)
+        finally:
+            if self.file:
+                self.file.close()
+        # Note: we don't set __loader__ because we want the module to look
+        # normal; i.e. this is just a wrapper for standard import machinery
+        return mod
+
+    def get_data(self, pathname):
+        return open(pathname, "rb").read()
+
+    def _reopen(self):
+        if self.file and self.file.closed:
+            mod_type = self.etc[2]
+            if mod_type==imp.PY_SOURCE:
+                self.file = open(self.filename, 'rU')
+            elif mod_type in (imp.PY_COMPILED, imp.C_EXTENSION):
+                self.file = open(self.filename, 'rb')
+
+    def _fix_name(self, fullname):
+        if fullname is None:
+            fullname = self.fullname
+        elif fullname != self.fullname:
+            raise ImportError("Loader for module %s cannot handle "
+                              "module %s" % (self.fullname, fullname))
+        return fullname
+
+    def is_package(self, fullname):
+        fullname = self._fix_name(fullname)
+        return self.etc[2]==imp.PKG_DIRECTORY
+
+    def get_code(self, fullname=None):
+        fullname = self._fix_name(fullname)
+        if self.code is None:
+            mod_type = self.etc[2]
+            if mod_type==imp.PY_SOURCE:
+                source = self.get_source(fullname)
+                self.code = compile(source, self.filename, 'exec')
+            elif mod_type==imp.PY_COMPILED:
+                self._reopen()
+                try:
+                    self.code = read_code(self.file)
+                finally:
+                    self.file.close()
+            elif mod_type==imp.PKG_DIRECTORY:
+                self.code = self._get_delegate().get_code()
+        return self.code
+
+    def get_source(self, fullname=None):
+        fullname = self._fix_name(fullname)
+        if self.source is None:
+            mod_type = self.etc[2]
+            if mod_type==imp.PY_SOURCE:
+                self._reopen()
+                try:
+                    self.source = self.file.read()
+                finally:
+                    self.file.close()
+            elif mod_type==imp.PY_COMPILED:
+                if os.path.exists(self.filename[:-1]):
+                    f = open(self.filename[:-1], 'rU')
+                    self.source = f.read()
+                    f.close()
+            elif mod_type==imp.PKG_DIRECTORY:
+                self.source = self._get_delegate().get_source()
+        return self.source
+
+
+    def _get_delegate(self):
+        return ImpImporter(self.filename).find_module('__init__')
+
+    def get_filename(self, fullname=None):
+        fullname = self._fix_name(fullname)
+        mod_type = self.etc[2]
+        if self.etc[2]==imp.PKG_DIRECTORY:
+            return self._get_delegate().get_filename()
+        elif self.etc[2] in (imp.PY_SOURCE, imp.PY_COMPILED, imp.C_EXTENSION):
+            return self.filename
+        return None
+
+
+try:
+    import zipimport
+    from zipimport import zipimporter
+
+    def iter_zipimport_modules(importer, prefix=''):
+        dirlist = zipimport._zip_directory_cache[importer.archive].keys()
+        dirlist.sort()
+        _prefix = importer.prefix
+        plen = len(_prefix)
+        yielded = {}
+        import inspect
+        for fn in dirlist:
+            if not fn.startswith(_prefix):
+                continue
+
+            fn = fn[plen:].split(os.sep)
+
+            if len(fn)==2 and fn[1].startswith('__init__.py'):
+                if fn[0] not in yielded:
+                    yielded[fn[0]] = 1
+                    yield fn[0], True
+
+            if len(fn)!=1:
+                continue
+
+            modname = inspect.getmodulename(fn[0])
+            if modname=='__init__':
+                continue
+
+            if modname and '.' not in modname and modname not in yielded:
+                yielded[modname] = 1
+                yield prefix + modname, False
+
+    iter_importer_modules.register(zipimporter, iter_zipimport_modules)
+
+except ImportError:
+    pass
+
+
+def get_importer(path_item):
+    """Retrieve a PEP 302 importer for the given path item
+
+    The returned importer is cached in sys.path_importer_cache
+    if it was newly created by a path hook.
+
+    If there is no importer, a wrapper around the basic import
+    machinery is returned. This wrapper is never inserted into
+    the importer cache (None is inserted instead).
+
+    The cache (or part of it) can be cleared manually if a
+    rescan of sys.path_hooks is necessary.
+    """
+    try:
+        importer = sys.path_importer_cache[path_item]
+    except KeyError:
+        for path_hook in sys.path_hooks:
+            try:
+                importer = path_hook(path_item)
+                break
+            except ImportError:
+                pass
+        else:
+            importer = None
+        sys.path_importer_cache.setdefault(path_item, importer)
+
+    if importer is None:
+        try:
+            importer = ImpImporter(path_item)
+        except ImportError:
+            importer = None
+    return importer
+
+
+def iter_importers(fullname=""):
+    """Yield PEP 302 importers for the given module name
+
+    If fullname contains a '.', the importers will be for the package
+    containing fullname, otherwise they will be importers for sys.meta_path,
+    sys.path, and Python's "classic" import machinery, in that order.  If
+    the named module is in a package, that package is imported as a side
+    effect of invoking this function.
+
+    Non PEP 302 mechanisms (e.g. the Windows registry) used by the
+    standard import machinery to find files in alternative locations
+    are partially supported, but are searched AFTER sys.path. Normally,
+    these locations are searched BEFORE sys.path, preventing sys.path
+    entries from shadowing them.
+
+    For this to cause a visible difference in behaviour, there must
+    be a module or package name that is accessible via both sys.path
+    and one of the non PEP 302 file system mechanisms. In this case,
+    the emulation will find the former version, while the builtin
+    import mechanism will find the latter.
+
+    Items of the following types can be affected by this discrepancy:
+        imp.C_EXTENSION, imp.PY_SOURCE, imp.PY_COMPILED, imp.PKG_DIRECTORY
+    """
+    if fullname.startswith('.'):
+        raise ImportError("Relative module names not supported")
+    if '.' in fullname:
+        # Get the containing package's __path__
+        pkg = '.'.join(fullname.split('.')[:-1])
+        if pkg not in sys.modules:
+            __import__(pkg)
+        path = getattr(sys.modules[pkg], '__path__', None) or []
+    else:
+        for importer in sys.meta_path:
+            yield importer
+        path = sys.path
+    for item in path:
+        yield get_importer(item)
+    if '.' not in fullname:
+        yield ImpImporter()
+
+def get_loader(module_or_name):
+    """Get a PEP 302 "loader" object for module_or_name
+
+    If the module or package is accessible via the normal import
+    mechanism, a wrapper around the relevant part of that machinery
+    is returned.  Returns None if the module cannot be found or imported.
+    If the named module is not already imported, its containing package
+    (if any) is imported, in order to establish the package __path__.
+
+    This function uses iter_importers(), and is thus subject to the same
+    limitations regarding platform-specific special import locations such
+    as the Windows registry.
+    """
+    if module_or_name in sys.modules:
+        module_or_name = sys.modules[module_or_name]
+    if isinstance(module_or_name, ModuleType):
+        module = module_or_name
+        loader = getattr(module, '__loader__', None)
+        if loader is not None:
+            return loader
+        fullname = module.__name__
+    else:
+        fullname = module_or_name
+    return find_loader(fullname)
+
+def find_loader(fullname):
+    """Find a PEP 302 "loader" object for fullname
+
+    If fullname contains dots, path must be the containing package's __path__.
+    Returns None if the module cannot be found or imported. This function uses
+    iter_importers(), and is thus subject to the same limitations regarding
+    platform-specific special import locations such as the Windows registry.
+    """
+    for importer in iter_importers(fullname):
+        loader = importer.find_module(fullname)
+        if loader is not None:
+            return loader
+
+    return None
+
+
+def extend_path(path, name):
+    """Extend a package's path.
+
+    Intended use is to place the following code in a package's __init__.py:
+
+        from pkgutil import extend_path
+        __path__ = extend_path(__path__, __name__)
+
+    This will add to the package's __path__ all subdirectories of
+    directories on sys.path named after the package.  This is useful
+    if one wants to distribute different parts of a single logical
+    package as multiple directories.
+
+    It also looks for *.pkg files beginning where * matches the name
+    argument.  This feature is similar to *.pth files (see site.py),
+    except that it doesn't special-case lines starting with 'import'.
+    A *.pkg file is trusted at face value: apart from checking for
+    duplicates, all entries found in a *.pkg file are added to the
+    path, regardless of whether they are exist the filesystem.  (This
+    is a feature.)
+
+    If the input path is not a list (as is the case for frozen
+    packages) it is returned unchanged.  The input path is not
+    modified; an extended copy is returned.  Items are only appended
+    to the copy at the end.
+
+    It is assumed that sys.path is a sequence.  Items of sys.path that
+    are not (unicode or 8-bit) strings referring to existing
+    directories are ignored.  Unicode items of sys.path that cause
+    errors when used as filenames may cause this function to raise an
+    exception (in line with os.path.isdir() behavior).
+    """
+
+    if not isinstance(path, list):
+        # This could happen e.g. when this is called from inside a
+        # frozen package.  Return the path unchanged in that case.
+        return path
+
+    pname = os.path.join(*name.split('.')) # Reconstitute as relative path
+    # Just in case os.extsep != '.'
+    sname = os.extsep.join(name.split('.'))
+    sname_pkg = sname + os.extsep + "pkg"
+    init_py = "__init__" + os.extsep + "py"
+
+    path = path[:] # Start with a copy of the existing path
+
+    for dir in sys.path:
+        if not isinstance(dir, basestring) or not os.path.isdir(dir):
+            continue
+        subdir = os.path.join(dir, pname)
+        # XXX This may still add duplicate entries to path on
+        # case-insensitive filesystems
+        initfile = os.path.join(subdir, init_py)
+        if subdir not in path and os.path.isfile(initfile):
+            path.append(subdir)
+        # XXX Is this the right thing for subpackages like zope.app?
+        # It looks for a file named "zope.app.pkg"
+        pkgfile = os.path.join(dir, sname_pkg)
+        if os.path.isfile(pkgfile):
+            try:
+                f = open(pkgfile)
+            except IOError, msg:
+                sys.stderr.write("Can't open %s: %s\n" %
+                                 (pkgfile, msg))
+            else:
+                for line in f:
+                    line = line.rstrip('\n')
+                    if not line or line.startswith('#'):
+                        continue
+                    path.append(line) # Don't check for existence!
+                f.close()
+
+    return path
+
+def get_data(package, resource):
+    """Get a resource from a package.
+
+    This is a wrapper round the PEP 302 loader get_data API. The package
+    argument should be the name of a package, in standard module format
+    (foo.bar). The resource argument should be in the form of a relative
+    filename, using '/' as the path separator. The parent directory name '..'
+    is not allowed, and nor is a rooted name (starting with a '/').
+
+    The function returns a binary string, which is the contents of the
+    specified resource.
+
+    For packages located in the filesystem, which have already been imported,
+    this is the rough equivalent of
+
+        d = os.path.dirname(sys.modules[package].__file__)
+        data = open(os.path.join(d, resource), 'rb').read()
+
+    If the package cannot be located or loaded, or it uses a PEP 302 loader
+    which does not support get_data(), then None is returned.
+    """
+
+    loader = get_loader(package)
+    if loader is None or not hasattr(loader, 'get_data'):
+        return None
+    mod = sys.modules.get(package) or loader.load_module(package)
+    if mod is None or not hasattr(mod, '__file__'):
+        return None
+
+    # Modify the resource name to be compatible with the loader.get_data
+    # signature - an os.path format "filename" starting with the dirname of
+    # the package's __file__
+    parts = resource.split('/')
+    parts.insert(0, os.path.dirname(mod.__file__))
+    resource_name = os.path.join(*parts)
+    return loader.get_data(resource_name)
+
+##########################
+# PEP 376 Implementation #
+##########################
+
+DIST_FILES = ('INSTALLER', 'METADATA', 'RECORD', 'REQUESTED',)
+
+class Distribution(object):
+    """Created with the *path* of the ``.dist-info`` directory provided to the
+    constructor. It reads the metadata contained in METADATA when it is
+    instantiated."""
+
+    # Attribute documenting for Sphinx style documentation, see for more info:
+    #   http://sphinx.pocoo.org/ext/autodoc.html#dir-autoattribute
+    name = ''
+    """The name of the distribution."""
+    metadata = None
+    """A :class:`distutils2.metadata.DistributionMetadata` instance loaded with 
+    the distribution's METADATA file."""
+    requested = False
+    """A boolean that indicates whether the REQUESTED metadata file is present
+    (in other words, whether the package was installed by user request)."""
+
+    def __init__(self, path):
+        self.path = path
+        metadata_path = os.path.join(path, 'METADATA')
+        self.metadata = DistributionMetadata(path=metadata_path)
+        self.name = self.metadata['name']
+
+    def _get_records(self, local=False):
+        RECORD = os.path.join(self.path, 'RECORD')
+        record_reader = csv_reader(open(RECORD, 'rb'), delimiter=',')
+        for row in record_reader:
+            path, md5, size = row[:] + [ None for i in xrange(len(row), 3) ]
+            if local:
+                path = path.replace('/', os.sep)
+                path = os.path.join(sys.prefix, path)
+            yield path, md5, size
+
+    def get_installed_files(self, local=False):
+        """
+        Iterates over the RECORD entries and returns a tuple (path, md5, size)
+        for each line. If *local* is ``True``, the returned path is transformed
+        into a local absolute path. Otherwise the raw value from RECORD is
+        returned.
+
+        A local absolute path is an absolute path in which occurrences of
+        ``'/'`` have been replaced by the system separator given by ``os.sep``.
+
+        :parameter local: flag to say if the path should be returned a local
+                          absolute path
+        :type local: boolean
+        :returns: iterator of (path, md5, size)
+        """
+        return self._get_records(local)
+
+
+    def uses(self, path):
+        """
+        Returns ``True`` if path is listed in RECORD. *path* can be a local 
+        absolute path or a relative ``'/'``-separated path.
+
+        :rtype: boolean
+        """
+        for p, md5, size in self._get_records():
+            local_absolute = os.path.join(sys.prefix, p)
+            if path == p or path == local_absolute:
+                return True
+        return False
+
+    def get_distinfo_file(self, path, binary=False):
+        """
+        Returns a file located under the ``.dist-info`` directory. Returns a
+        ``file`` instance for the file pointed by *path*.
+
+        :parameter path: a ``'/'``-separated path relative to the ``.dist-info``
+                         directory or an absolute path; If *path* is an absolute 
+                         path and doesn't start with the ``.dist-info``
+                         directory path, a :class:`DistutilsError` is raised
+        :type path: string
+        :parameter binary: If *binary* is ``True``, opens the file in read-only
+                           binary mode (rb), otherwise opens it in read-only
+                           mode (r).
+        :rtype: file object
+        """
+        open_flags = 'r'
+        if binary:
+            open_flags += 'b'
+
+        # Check if it is an absolute path
+        if path.find(os.sep) >= 0:
+            # it's an absolute path?
+            distinfo_dirname, path = path.split(os.sep)[-2:]
+            if distinfo_dirname != self.path.split(os.sep)[-1]:
+                raise DistutilsError("Requested dist-info file does not "
+                    "belong to the %s distribution. '%s' was requested." \
+                    % (self.name, os.sep.join([distinfo_dirname, path])))
+
+        # The file must be relative
+        if path not in DIST_FILES:
+            raise DistutilsError("Requested an invalid dist-info file: "
+                "%s" % path)
+
+        # Convert the relative path back to absolute
+        path = os.path.join(self.path, path)
+        return open(path, open_flags)
+
+    def get_distinfo_files(self, local=False):
+        """
+        Iterates over the RECORD entries and returns paths for each line if the 
+        path is pointing to a file located in the ``.dist-info`` directory or 
+        one of its subdirectories.
+
+        :parameter local: If *local* is ``True``, each returned path is
+                          transformed into a local absolute path. Otherwise the
+                          raw value from RECORD is returned.
+        :type local: boolean
+        :returns: iterator of paths
+        """
+        for path, md5, size in self._get_records(local):
+            yield path
+
+
+def _normalize_dist_name(name):
+    """Returns a normalized name from the given *name*.
+    :rtype: string"""
+    return name.replace('-', '_')
+
+def distinfo_dirname(name, version):
+    """
+    The *name* and *version* parameters are converted into their
+    filename-escaped form, i.e. any ``'-'`` characters are replaced with ``'_'``
+    other than the one in ``'dist-info'`` and the one separating the name from 
+    the version number.
+
+    :parameter name: is converted to a standard distribution name by replacing
+                     any runs of non- alphanumeric characters with a single
+                     ``'-'``.
+    :type name: string
+    :parameter version: is converted to a standard version string. Spaces become
+                        dots, and all other non-alphanumeric characters (except
+                        dots) become dashes, with runs of multiple dashes
+                        condensed to a single dash.
+    :type version: string
+    :returns: directory name
+    :rtype: string"""
+    file_extension = '.dist-info'
+    name = _normalize_dist_name(name)
+    normalized_version = suggest_normalized_version(version)
+    # Because this is a lookup procedure, something will be returned even if
+    #   it is a version that cannot be normalized
+    if normalized_version is None:
+        # Unable to achieve normality?
+        normalized_version = version
+    return '-'.join([name, normalized_version]) + file_extension
+
+def get_distributions():
+    """
+    Provides an iterator that looks for ``.dist-info`` directories in
+    ``sys.path`` and returns :class:`Distribution` instances for each one of
+    them.
+
+    :rtype: iterator of :class:`Distribution` instances"""
+    for path in sys.path:
+        realpath = os.path.realpath(path)
+        if not os.path.isdir(realpath):
+            continue
+        for dir in os.listdir(realpath):
+            if dir.endswith('.dist-info'):
+                dist = Distribution(os.path.join(realpath, dir))
+                yield dist
+
+def get_distribution(name):
+    """
+    Scans all elements in ``sys.path`` and looks for all directories ending with
+    ``.dist-info``. Returns a :class:`Distribution` corresponding to the 
+    ``.dist-info`` directory that contains the METADATA that matches *name* for
+    the *name* metadata.
+
+    This function only returns the first result founded, as no more than one
+    value is expected. If the directory is not found, ``None`` is returned.
+
+    :rtype: :class:`Distribution` or None"""
+    found = None
+    for dist in get_distributions():
+        if dist.name == name:
+            found = dist
+            break
+    return found
+
+def get_file_users(path):
+    """
+    Iterates over all distributions to find out which distributions uses
+    *path*.
+
+    :parameter path: can be a local absolute path or a relative
+                     ``'/'``-separated path.
+    :type path: string
+    :rtype: iterator of :class:`Distribution` instances"""
+    for dist in get_distributions():
+        if dist.uses(path):
+            yield dist
diff --git a/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9.dist-info/INSTALLER b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9.dist-info/INSTALLER
new file mode 100644
diff --git a/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9.dist-info/METADATA b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9.dist-info/METADATA
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9.dist-info/METADATA
@@ -0,0 +1,6 @@
+Metadata-Version: 1.2
+Name: choxie
+Version: 2.0.0.9
+Summary: Chocolate with a kick!
+Requires-Dist: towel-stuff (0.1)
+Provides-Dist: truffles (1.0)
diff --git a/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9.dist-info/RECORD b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9.dist-info/RECORD
new file mode 100644
diff --git a/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9.dist-info/REQUESTED b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9.dist-info/REQUESTED
new file mode 100644
diff --git a/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9/choxie/__init__.py b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9/choxie/__init__.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9/choxie/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+
diff --git a/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9/choxie/chocolate.py b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9/choxie/chocolate.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9/choxie/chocolate.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+from towel_stuff import Towel
+
+class Chocolate(object):
+    """A piece of chocolate."""
+
+    def wrap_with_towel(self):
+        towel = Towel()
+        towel.wrap(self)
+        return towel
diff --git a/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9/truffles.py b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9/truffles.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/fake_dists/choxie-2.0.0.9/truffles.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+from choxie.chocolate import Chocolate
+
+class Truffle(Chocolate):
+    """A truffle."""
diff --git a/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4.dist-info/INSTALLER b/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4.dist-info/INSTALLER
new file mode 100644
diff --git a/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4.dist-info/METADATA b/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4.dist-info/METADATA
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4.dist-info/METADATA
@@ -0,0 +1,3 @@
+Metadata-Version: 1.2
+Name: grammar
+Version: 1.0a4
diff --git a/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4.dist-info/RECORD b/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4.dist-info/RECORD
new file mode 100644
diff --git a/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4.dist-info/REQUESTED b/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4.dist-info/REQUESTED
new file mode 100644
diff --git a/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4/grammar/__init__.py b/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4/grammar/__init__.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4/grammar/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+
diff --git a/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4/grammar/utils.py b/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4/grammar/utils.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/fake_dists/grammar-1.0a4/grammar/utils.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+from random import randint
+
+def is_valid_grammar(sentence):
+    if randint(0, 10) < 2:
+        return False
+    else:
+        return True
diff --git a/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1.dist-info/INSTALLER b/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1.dist-info/INSTALLER
new file mode 100644
diff --git a/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1.dist-info/METADATA b/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1.dist-info/METADATA
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1.dist-info/METADATA
@@ -0,0 +1,3 @@
+Metadata-Version: 1.2
+Name: towel-stuff
+Version: 0.1
diff --git a/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1.dist-info/RECORD b/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1.dist-info/RECORD
new file mode 100644
diff --git a/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1.dist-info/REQUESTED b/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1.dist-info/REQUESTED
new file mode 100644
diff --git a/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1/towel_stuff/__init__.py b/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1/towel_stuff/__init__.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/fake_dists/towel_stuff-0.1/towel_stuff/__init__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+class Towel(object):
+    """A towel, that one should never be without."""
+
+    def __init__(self, color='tie-dye'):
+        self.color = color
+        self.wrapped_obj = None
+
+    def wrap(self, obj):
+        """Wrap an object up in our towel."""
+        self.wrapped_obj = obj
+
+    def unwrap(self):
+        """Unwrap whatever is in our towel and return whatever it is."""
+        obj = self.wrapped_obj
+        self.wrapped_obj = None
+        return obj
diff --git a/src/distutils2/_backport/tests/test_pkgutil.py b/src/distutils2/_backport/tests/test_pkgutil.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/_backport/tests/test_pkgutil.py
@@ -0,0 +1,275 @@
+# -*- coding: utf-8 -*-
+"""Tests for PEP 376 pkgutil functionality"""
+import unittest2
+import sys
+import os
+import csv
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
+
+from test.test_support import run_unittest, TESTFN
+
+import distutils2._backport.pkgutil
+
+# TODO Add a test for getting a distribution that is provided by another
+#   distribution.
+
+# TODO Add a test for absolute pathed RECORD items (e.g. /etc/myapp/config.ini)
+
+class TestPkgUtilDistribution(unittest2.TestCase):
+    """Tests the pkgutil.Distribution class"""
+
+    def setUp(self):
+        super(TestPkgUtilDistribution, self).setUp()
+
+        self.fake_dists_path = os.path.abspath(
+            os.path.join(os.path.dirname(__file__), 'fake_dists'))
+        self.distinfo_dirs = [ os.path.join(self.fake_dists_path, dir)
+            for dir in os.listdir(self.fake_dists_path)
+            if dir.endswith('.dist-info')
+            ]
+
+        def get_hexdigest(file):
+            md5_hash = md5()
+            md5_hash.update(open(file).read())
+            return md5_hash.hexdigest()
+        def record_pieces(file):
+            path = os.path.relpath(file, sys.prefix)
+            digest = get_hexdigest(file)
+            size = os.path.getsize(file)
+            return [path, digest, size]
+
+        self.records = {}
+        for distinfo_dir in self.distinfo_dirs:
+            # Setup the RECORD file for this dist
+            record_file = os.path.join(distinfo_dir, 'RECORD')
+            record_writer = csv.writer(open(record_file, 'w'), delimiter=',',
+                quoting=csv.QUOTE_NONE)
+            dist_location = distinfo_dir.replace('.dist-info', '')
+
+            for path, dirs, files in os.walk(dist_location):
+                for f in files:
+                    record_writer.writerow(record_pieces(os.path.join(path, f)))
+            for file in ['INSTALLER', 'METADATA', 'REQUESTED']:
+                record_writer.writerow(record_pieces(
+                    os.path.join(distinfo_dir, file)))
+            record_writer.writerow([os.path.relpath(record_file, sys.prefix)])
+            del record_writer # causes the RECORD file to close
+            record_reader = csv.reader(open(record_file, 'rb'))
+            record_data = []
+            for row in record_reader:
+                path, md5_, size = row[:] + [ None for i in xrange(len(row), 3) ]
+                record_data.append([path, (md5_, size,)])
+            self.records[distinfo_dir] = dict(record_data)
+
+    def tearDown(self):
+        self.records = None
+        for distinfo_dir in self.distinfo_dirs:
+            record_file = os.path.join(distinfo_dir, 'RECORD')
+            open(record_file, 'w').close()
+        super(TestPkgUtilDistribution, self).tearDown()
+
+    def test_instantiation(self):
+        """Test the Distribution class's instantiation provides us with usable
+        attributes."""
+        # Import the Distribution class
+        from distutils2._backport.pkgutil import distinfo_dirname, Distribution
+
+        here = os.path.abspath(os.path.dirname(__file__))
+        name = 'choxie'
+        version = '2.0.0.9'
+        dist_path = os.path.join(here, 'fake_dists',
+            distinfo_dirname(name, version))
+        dist = Distribution(dist_path)
+
+        self.assertEqual(dist.name, name)
+        from distutils2.metadata import DistributionMetadata
+        self.assertTrue(isinstance(dist.metadata, DistributionMetadata))
+        self.assertEqual(dist.metadata['version'], version)
+        self.assertTrue(isinstance(dist.requested, type(bool())))
+
+    def test_installed_files(self):
+        """Test the iteration of installed files."""
+        # Test the distribution's installed files
+        from distutils2._backport.pkgutil import Distribution
+        for distinfo_dir in self.distinfo_dirs:
+            dist = Distribution(distinfo_dir)
+            for path, md5_, size in dist.get_installed_files():
+                record_data = self.records[dist.path]
+                self.assertTrue(path in record_data.keys())
+                self.assertEqual(md5_, record_data[path][0])
+                self.assertEqual(size, record_data[path][1])
+
+    def test_uses(self):
+        """Test to determine if a distribution uses a specified file."""
+        # Criteria to test against
+        distinfo_name = 'grammar-1.0a4'
+        distinfo_dir = os.path.join(self.fake_dists_path,
+            distinfo_name + '.dist-info')
+        true_path = [self.fake_dists_path, distinfo_name, 'grammar', 'utils.py']
+        true_path = os.path.relpath(os.path.join(*true_path), sys.prefix)
+        false_path = [self.fake_dists_path, 'towel_stuff-0.1', 'towel_stuff',
+            '__init__.py']
+        false_path = os.path.relpath(os.path.join(*false_path), sys.prefix)
+
+        # Test if the distribution uses the file in question
+        from distutils2._backport.pkgutil import Distribution
+        dist = Distribution(distinfo_dir)
+        self.assertTrue(dist.uses(true_path))
+        self.assertFalse(dist.uses(false_path))
+
+    def test_get_distinfo_file(self):
+        """Test the retrieval of dist-info file objects."""
+        from distutils2._backport.pkgutil import Distribution
+        distinfo_name = 'choxie-2.0.0.9'
+        other_distinfo_name = 'grammar-1.0a4'
+        distinfo_dir = os.path.join(self.fake_dists_path,
+            distinfo_name + '.dist-info')
+        dist = Distribution(distinfo_dir)
+        # Test for known good file matches
+        distinfo_files = [
+            # Relative paths
+            'INSTALLER', 'METADATA',
+            # Absolute paths
+            os.path.join(distinfo_dir, 'RECORD'),
+            os.path.join(distinfo_dir, 'REQUESTED'),
+            ]
+
+        for distfile in distinfo_files:
+            value = dist.get_distinfo_file(distfile)
+            self.assertTrue(isinstance(value, file))
+            # Is it the correct file?
+            self.assertEqual(value.name, os.path.join(distinfo_dir, distfile))
+
+        from distutils2.errors import DistutilsError
+        # Test an absolute path that is part of another distributions dist-info
+        other_distinfo_file = os.path.join(self.fake_dists_path,
+            other_distinfo_name + '.dist-info', 'REQUESTED')
+        self.assertRaises(DistutilsError, dist.get_distinfo_file,
+            other_distinfo_file)
+        # Test for a file that does not exist and should not exist
+        self.assertRaises(DistutilsError, dist.get_distinfo_file, 'ENTRYPOINTS')
+
+    def test_get_distinfo_files(self):
+        """Test for the iteration of RECORD path entries."""
+        from distutils2._backport.pkgutil import Distribution
+        distinfo_name = 'towel_stuff-0.1'
+        distinfo_dir = os.path.join(self.fake_dists_path,
+            distinfo_name + '.dist-info')
+        dist = Distribution(distinfo_dir)
+        # Test for the iteration of the raw path
+        distinfo_record_paths = self.records[distinfo_dir].keys()
+        found = [ path for path in dist.get_distinfo_files() ]
+        self.assertEqual(sorted(found), sorted(distinfo_record_paths))
+        # Test for the iteration of local absolute paths
+        distinfo_record_paths = [ os.path.join(sys.prefix, path)
+            for path in self.records[distinfo_dir].keys()
+            ]
+        found = [ path for path in dist.get_distinfo_files(local=True) ]
+        self.assertEqual(sorted(found), sorted(distinfo_record_paths))
+
+
+class TestPkgUtilFunctions(unittest2.TestCase):
+    """Tests for the new functionality added in PEP 376."""
+
+    def setUp(self):
+        super(TestPkgUtilFunctions, self).setUp()
+        # Setup the path environment with our fake distributions
+        current_path = os.path.abspath(os.path.dirname(__file__))
+        self.sys_path = sys.path[:]
+        self.fake_dists_path = os.path.join(current_path, 'fake_dists')
+        sys.path[0:0] = [self.fake_dists_path]
+
+    def tearDown(self):
+        super(TestPkgUtilFunctions, self).tearDown()
+        sys.path[:] = self.sys_path
+
+    def test_distinfo_dirname(self):
+        """Given a name and a version, we expect the distinfo_dirname function
+        to return a standard distribution information directory name."""
+
+        items = [ # (name, version, standard_dirname)
+            # Test for a very simple single word name and decimal version number
+            ('docutils', '0.5', 'docutils-0.5.dist-info'),
+            # Test for another except this time with a '-' in the name, which
+            #   needs to be transformed during the name lookup
+            ('python-ldap', '2.5', 'python_ldap-2.5.dist-info'),
+            # Test for both '-' in the name and a funky version number
+            ('python-ldap', '2.5 a---5', 'python_ldap-2.5 a---5.dist-info'),
+            ]
+
+        # Import the function in question
+        from distutils2._backport.pkgutil import distinfo_dirname
+
+        # Loop through the items to validate the results
+        for name, version, standard_dirname in items:
+            dirname = distinfo_dirname(name, version)
+            self.assertEqual(dirname, standard_dirname)
+
+    def test_get_distributions(self):
+        """Lookup all distributions found in the ``sys.path``."""
+        # This test could potentially pick up other installed distributions
+        fake_dists = [('grammar', '1.0a4'), ('choxie', '2.0.0.9'),
+            ('towel-stuff', '0.1')]
+        found_dists = []
+
+        # Import the function in question
+        from distutils2._backport.pkgutil import get_distributions, Distribution
+
+        # Verify the fake dists have been found.
+        dists = [ dist for dist in get_distributions() ]
+        for dist in dists:
+            if not isinstance(dist, Distribution):
+                self.fail("item received was not a Distribution instance: "
+                    "%s" % type(dist))
+            if dist.name in dict(fake_dists).keys():
+                found_dists.append((dist.name, dist.metadata['version'],))
+            # otherwise we don't care what other distributions are found
+
+        # Finally, test that we found all that we were looking for
+        self.assertListEqual(sorted(found_dists), sorted(fake_dists))
+
+    def test_get_distribution(self):
+        """Test for looking up a distribution by name."""
+        # Test the lookup of the towel-stuff distribution
+        name = 'towel-stuff' # Note: This is different from the directory name
+
+        # Import the function in question
+        from distutils2._backport.pkgutil import get_distribution, Distribution
+
+        # Lookup the distribution
+        dist = get_distribution(name)
+        self.assertTrue(isinstance(dist, Distribution))
+        self.assertEqual(dist.name, name)
+
+        # Verify that an unknown distribution returns None
+        self.assertEqual(None, get_distribution('bogus'))
+
+        # Verify partial name matching doesn't work
+        self.assertEqual(None, get_distribution('towel'))
+
+    def test_get_file_users(self):
+        """Test the iteration of distributions that use a file."""
+        from distutils2._backport.pkgutil import get_file_users, Distribution
+        name = 'towel_stuff-0.1'
+        path = os.path.join(self.fake_dists_path, name,
+            'towel_stuff', '__init__.py')
+        for dist in get_file_users(path):
+            self.assertTrue(isinstance(dist, Distribution))
+            self.assertEqual(dist.name, name)
+
+
+def test_suite():
+    suite = unittest2.TestSuite()
+    testcase_loader = unittest2.loader.defaultTestLoader.loadTestsFromTestCase
+    suite.addTest(testcase_loader(TestPkgUtilFunctions))
+    suite.addTest(testcase_loader(TestPkgUtilDistribution))
+    return suite
+
+def test_main():
+    run_unittest(test_suite())
+
+if __name__ == "__main__":
+    test_main()
diff --git a/src/distutils2/command/check.py b/src/distutils2/command/check.py
--- a/src/distutils2/command/check.py
+++ b/src/distutils2/command/check.py
@@ -25,14 +25,14 @@
         self.restructuredtext = 0
         self.metadata = 1
         self.strict = 0
-        self._warnings = 0
+        self._warnings = []
 
     def finalize_options(self):
         pass
 
     def warn(self, msg):
         """Counts the number of warnings that occurs."""
-        self._warnings += 1
+        self._warnings.append(msg)
         return Command.warn(self, msg)
 
     def run(self):
@@ -48,8 +48,9 @@
 
         # let's raise an error in strict mode, if we have at least
         # one warning
-        if self.strict and self._warnings > 0:
-            raise DistutilsSetupError('Please correct your package.')
+        if self.strict and len(self._warnings) > 0:
+            msg = '\n'.join(self._warnings)
+            raise DistutilsSetupError(msg)
 
     def check_metadata(self):
         """Ensures that all required elements of meta-data are supplied.
diff --git a/src/distutils2/command/register.py b/src/distutils2/command/register.py
--- a/src/distutils2/command/register.py
+++ b/src/distutils2/command/register.py
@@ -224,39 +224,11 @@
     def build_post_data(self, action):
         # figure the data to send - the metadata plus some additional
         # information used by the package server
-        meta = self.distribution.metadata
-        data = {
-            ':action': action,
-            'metadata_version' : meta.version,
-            'name': meta['Name'],
-            'version': meta['Version'],
-            'summary': meta['Summary'],
-            'home_page': meta['Home-page'],
-            'author': meta['Author'],
-            'author_email': meta['Author-email'],
-            'license': meta['License'],
-            'description': meta['Description'],
-            'keywords': meta['Keywords'],
-            'platform': meta['Platform'],
-            'classifier': meta['Classifier'],
-            'download_url': meta['Download-URL'],
-        }
-
-        if meta.version == '1.2':
-            data['requires_dist'] = meta['Requires-Dist']
-            data['requires_python'] = meta['Requires-Python']
-            data['requires_external'] = meta['Requires-External']
-            data['provides_dist'] = meta['Provides-Dist']
-            data['obsoletes_dist'] = meta['Obsoletes-Dist']
-            data['project_url'] = meta['Project-Url']
-
-        elif meta.version == '1.1':
-            data['provides'] = meta['Provides']
-            data['requires'] = meta['Requires']
-            data['obsoletes'] = meta['Obsoletes']
-
+        data = self._metadata_to_pypy_dict()
+        data[':action'] = action
         return data
 
+    # XXX to be refactored with upload.upload_file
     def post_to_server(self, data, auth=None):
         ''' Post a query to the server, and return a string response.
         '''
diff --git a/src/distutils2/command/upload.py b/src/distutils2/command/upload.py
--- a/src/distutils2/command/upload.py
+++ b/src/distutils2/command/upload.py
@@ -7,7 +7,7 @@
 from urllib2 import urlopen, Request, HTTPError
 from base64 import standard_b64encode
 import urlparse
-import cStringIO as StringIO
+import StringIO as StringIO
 try:
     from hashlib import md5
 except ImportError:
@@ -62,6 +62,7 @@
         for command, pyversion, filename in self.distribution.dist_files:
             self.upload_file(command, pyversion, filename)
 
+    # XXX to be refactored with register.post_to_server
     def upload_file(self, command, pyversion, filename):
         # Makes sure the repository URL is compliant
         schema, netloc, url, params, query, fragments = \
@@ -83,42 +84,17 @@
         # Fill in the data - send all the meta-data in case we need to
         # register a new release
         content = open(filename,'rb').read()
-        meta = self.distribution.metadata
 
-        data = {
-            # action
-            ':action': 'file_upload',
-            'protcol_version': '1',
+        data = self._metadata_to_pypy_dict()
 
-            # identify release
-            'name': meta['Name'],
-            'version': meta['Version'],
+        # extra upload infos
+        data[':action'] = 'file_upload'
+        data['protcol_version'] = '1'
+        data['content'] = [os.path.basename(filename), content]
+        data['filetype'] = command
+        data['pyversion'] = pyversion
+        data['md5_digest'] = md5(content).hexdigest()
 
-            # file content
-            'content': (os.path.basename(filename),content),
-            'filetype': command,
-            'pyversion': pyversion,
-            'md5_digest': md5(content).hexdigest(),
-
-            # additional meta-data
-            # XXX Implement 1.1
-            'metadata_version' : '1.0',
-            'name': meta['Name'],
-            'version': meta['Version'],
-            'summary': meta['Summary'],
-            'home_page': meta['Home-page'],
-            'author': meta['Author'],
-            'author_email': meta['Author-email'],
-            'license': meta['License'],
-            'description': meta['Description'],
-            'keywords': meta['Keywords'],
-            'platform': meta['Platform'],
-            'classifiers': meta['Classifier'],
-            'download_url': meta['Download-URL'],
-            #'provides': meta['Provides'],
-            #'requires': meta['Requires'],
-            #'obsoletes': meta['Obsoletes'],
-            }
         comment = ''
         if command == 'bdist_rpm':
             dist, version, id = platform.dist()
@@ -129,8 +105,8 @@
         data['comment'] = comment
 
         if self.sign:
-            data['gpg_signature'] = (os.path.basename(filename) + ".asc",
-                                     open(filename+".asc").read())
+            data['gpg_signature'] = [(os.path.basename(filename) + ".asc",
+                                      open(filename+".asc").read())]
 
         # set up the authentication
         auth = "Basic " + standard_b64encode(self.username + ":" +
@@ -141,29 +117,41 @@
         sep_boundary = '\n--' + boundary
         end_boundary = sep_boundary + '--'
         body = StringIO.StringIO()
-        for key, value in data.items():
+        file_fields = ('content', 'gpg_signature')
+
+        for key, values in data.items():
             # handle multiple entries for the same name
-            if not isinstance(value, list):
-                value = [value]
-            for value in value:
-                if isinstance(value, tuple):
-                    fn = ';filename="%s"' % value[0]
-                    value = value[1]
-                else:
-                    fn = ""
+            if not isinstance(values, (tuple, list)):
+                values = [values]
 
+            content_dispo = 'Content-Disposition: form-data; name="%s"' % key
+
+            if key in file_fields:
+                filename_, content = values
+                filename_ = ';filename="%s"' % filename_
                 body.write(sep_boundary)
-                body.write('\nContent-Disposition: form-data; name="%s"'%key)
-                body.write(fn)
+                body.write("\n")
+                body.write(content_dispo)
+                body.write(filename_)
                 body.write("\n\n")
-                body.write(value)
-                if value and value[-1] == '\r':
-                    body.write('\n')  # write an extra newline (lurve Macs)
+                body.write(content)
+            else:
+                for value in values:
+                    body.write(sep_boundary)
+                    body.write("\n")
+                    body.write(content_dispo)
+                    body.write("\n\n")
+                    body.write(value)
+                    if value and value[-1] == '\r':
+                        # write an extra newline (lurve Macs)
+                        body.write('\n')
+
         body.write(end_boundary)
         body.write("\n")
         body = body.getvalue()
 
-        self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
+        self.announce("Submitting %s to %s" % (filename, self.repository),
+                      log.INFO)
 
         # build the Request
         headers = {'Content-type':
diff --git a/src/distutils2/config.py b/src/distutils2/config.py
--- a/src/distutils2/config.py
+++ b/src/distutils2/config.py
@@ -107,6 +107,40 @@
 
         return {}
 
+    def _metadata_to_pypy_dict(self):
+        meta = self.distribution.metadata
+        data = {
+            'metadata_version' : meta.version,
+            'name': meta['Name'],
+            'version': meta['Version'],
+            'summary': meta['Summary'],
+            'home_page': meta['Home-page'],
+            'author': meta['Author'],
+            'author_email': meta['Author-email'],
+            'license': meta['License'],
+            'description': meta['Description'],
+            'keywords': meta['Keywords'],
+            'platform': meta['Platform'],
+            'classifier': meta['Classifier'],
+            'download_url': meta['Download-URL'],
+        }
+
+        if meta.version == '1.2':
+            data['requires_dist'] = meta['Requires-Dist']
+            data['requires_python'] = meta['Requires-Python']
+            data['requires_external'] = meta['Requires-External']
+            data['provides_dist'] = meta['Provides-Dist']
+            data['obsoletes_dist'] = meta['Obsoletes-Dist']
+            data['project_url'] = [','.join(url) for url in
+                                   meta['Project-URL']]
+
+        elif meta.version == '1.1':
+            data['provides'] = meta['Provides']
+            data['requires'] = meta['Requires']
+            data['obsoletes'] = meta['Obsoletes']
+
+        return data
+
     def initialize_options(self):
         """Initialize options."""
         self.repository = None
diff --git a/src/distutils2/metadata.py b/src/distutils2/metadata.py
--- a/src/distutils2/metadata.py
+++ b/src/distutils2/metadata.py
@@ -77,8 +77,8 @@
                'Requires-Python', 'Requires-External')
 
 _345_MARKERS = ('Provides-Dist', 'Requires-Dist', 'Requires-Python',
-        'Obsoletes-Dist', 'Requires-External', 'Maintainer',
-        'Maintainer-email')
+                'Obsoletes-Dist', 'Requires-External', 'Maintainer',
+                'Maintainer-email', 'Project-URL')
 
 _ALL_FIELDS = []
 
@@ -153,6 +153,7 @@
         'Requires', 'Provides', 'Obsoletes-Dist',
         'Provides-Dist', 'Requires-Dist', 'Requires-External',
         'Project-URL')
+_LISTTUPLEFIELDS = ('Project-URL',)
 
 _ELEMENTSFIELD = ('Keywords',)
 
@@ -355,7 +356,11 @@
                 valid, val = self._platform(val)
                 if not valid:
                     continue
-                res.append(self._encode_field(val))
+                if name not in _LISTTUPLEFIELDS:
+                    res.append(self._encode_field(val))
+                else:
+                    # That's for Project-URL
+                    res.append((self._encode_field(val[0]), val[1]))
             return res
 
         elif name in _ELEMENTSFIELD:
@@ -382,6 +387,30 @@
             warnings = self._check_rst_data(self['Description'])
         else:
             warnings = []
+
+        # checking metadata 1.2 (XXX needs to check 1.1, 1.0)
+        if self['Metadata-Version'] != '1.2':
+            return missing, warnings
+
+
+        def is_valid_predicates(value):
+            for v in value:
+                if not is_valid_predicate(v.split(';')[0]):
+                    return False
+            return True
+
+        for fields, controller in ((_PREDICATE_FIELDS, is_valid_predicates),
+                                  (_VERSIONS_FIELDS, is_valid_versions),
+                                  (_VERSION_FIELDS, is_valid_version)):
+            for field in fields:
+                value = self[field]
+                if value == 'UNKNOWN':
+                    continue
+
+                if not controller(value):
+                    warnings.append('Wrong value for "%s": %s' \
+                            % (field, value))
+
         return missing, warnings
 
     def keys(self):
diff --git a/src/distutils2/mkpkg.py b/src/distutils2/mkpkg.py
--- a/src/distutils2/mkpkg.py
+++ b/src/distutils2/mkpkg.py
@@ -73,774 +73,776 @@
 }
 
 troveList = [
-      'Development Status :: 1 - Planning',
-		'Development Status :: 2 - Pre-Alpha',
-		'Development Status :: 3 - Alpha',
-		'Development Status :: 4 - Beta',
-		'Development Status :: 5 - Production/Stable',
-		'Development Status :: 6 - Mature',
-		'Development Status :: 7 - Inactive',
-		'Environment :: Console',
-		'Environment :: Console :: Curses',
-		'Environment :: Console :: Framebuffer',
-		'Environment :: Console :: Newt',
-		'Environment :: Console :: svgalib',
-		'Environment :: Handhelds/PDA\'s',
-		'Environment :: MacOS X',
-		'Environment :: MacOS X :: Aqua',
-		'Environment :: MacOS X :: Carbon',
-		'Environment :: MacOS X :: Cocoa',
-		'Environment :: No Input/Output (Daemon)',
-		'Environment :: Other Environment',
-		'Environment :: Plugins',
-		'Environment :: Web Environment',
-		'Environment :: Web Environment :: Buffet',
-		'Environment :: Web Environment :: Mozilla',
-		'Environment :: Web Environment :: ToscaWidgets',
-		'Environment :: Win32 (MS Windows)',
-		'Environment :: X11 Applications',
-		'Environment :: X11 Applications :: Gnome',
-		'Environment :: X11 Applications :: GTK',
-		'Environment :: X11 Applications :: KDE',
-		'Environment :: X11 Applications :: Qt',
-		'Framework :: BFG',
-		'Framework :: Buildout',
-		'Framework :: Chandler',
-		'Framework :: CubicWeb',
-		'Framework :: Django',
-		'Framework :: IDLE',
-		'Framework :: Paste',
-		'Framework :: Plone',
-		'Framework :: Pylons',
-		'Framework :: Setuptools Plugin',
-		'Framework :: Trac',
-		'Framework :: TurboGears',
-		'Framework :: TurboGears :: Applications',
-		'Framework :: TurboGears :: Widgets',
-		'Framework :: Twisted',
-		'Framework :: ZODB',
-		'Framework :: Zope2',
-		'Framework :: Zope3',
-		'Intended Audience :: Customer Service',
-		'Intended Audience :: Developers',
-		'Intended Audience :: Education',
-		'Intended Audience :: End Users/Desktop',
-		'Intended Audience :: Financial and Insurance Industry',
-		'Intended Audience :: Healthcare Industry',
-		'Intended Audience :: Information Technology',
-		'Intended Audience :: Legal Industry',
-		'Intended Audience :: Manufacturing',
-		'Intended Audience :: Other Audience',
-		'Intended Audience :: Religion',
-		'Intended Audience :: Science/Research',
-		'Intended Audience :: System Administrators',
-		'Intended Audience :: Telecommunications Industry',
-		'License :: Aladdin Free Public License (AFPL)',
-		'License :: DFSG approved',
-		'License :: Eiffel Forum License (EFL)',
-		'License :: Free For Educational Use',
-		'License :: Free For Home Use',
-		'License :: Free for non-commercial use',
-		'License :: Freely Distributable',
-		'License :: Free To Use But Restricted',
-		'License :: Freeware',
-		'License :: Netscape Public License (NPL)',
-		'License :: Nokia Open Source License (NOKOS)',
-		'License :: OSI Approved',
-		'License :: OSI Approved :: Academic Free License (AFL)',
-		'License :: OSI Approved :: Apache Software License',
-		'License :: OSI Approved :: Apple Public Source License',
-		'License :: OSI Approved :: Artistic License',
-		'License :: OSI Approved :: Attribution Assurance License',
-		'License :: OSI Approved :: BSD License',
-		'License :: OSI Approved :: Common Public License',
-		'License :: OSI Approved :: Eiffel Forum License',
-		'License :: OSI Approved :: European Union Public Licence 1.0 (EUPL 1.0)',
-		'License :: OSI Approved :: European Union Public Licence 1.1 (EUPL 1.1)',
-		'License :: OSI Approved :: GNU Affero General Public License v3',
-		'License :: OSI Approved :: GNU Free Documentation License (FDL)',
-		'License :: OSI Approved :: GNU General Public License (GPL)',
-		'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
-		'License :: OSI Approved :: IBM Public License',
-		'License :: OSI Approved :: Intel Open Source License',
-		'License :: OSI Approved :: ISC License (ISCL)',
-		'License :: OSI Approved :: Jabber Open Source License',
-		'License :: OSI Approved :: MIT License',
-		'License :: OSI Approved :: MITRE Collaborative Virtual Workspace License (CVW)',
-		'License :: OSI Approved :: Motosoto License',
-		'License :: OSI Approved :: Mozilla Public License 1.0 (MPL)',
-		'License :: OSI Approved :: Mozilla Public License 1.1 (MPL 1.1)',
-		'License :: OSI Approved :: Nethack General Public License',
-		'License :: OSI Approved :: Nokia Open Source License',
-		'License :: OSI Approved :: Open Group Test Suite License',
-		'License :: OSI Approved :: Python License (CNRI Python License)',
-		'License :: OSI Approved :: Python Software Foundation License',
-		'License :: OSI Approved :: Qt Public License (QPL)',
-		'License :: OSI Approved :: Ricoh Source Code Public License',
-		'License :: OSI Approved :: Sleepycat License',
-		'License :: OSI Approved :: Sun Industry Standards Source License (SISSL)',
-		'License :: OSI Approved :: Sun Public License',
-		'License :: OSI Approved :: University of Illinois/NCSA Open Source License',
-		'License :: OSI Approved :: Vovida Software License 1.0',
-		'License :: OSI Approved :: W3C License',
-		'License :: OSI Approved :: X.Net License',
-		'License :: OSI Approved :: zlib/libpng License',
-		'License :: OSI Approved :: Zope Public License',
-		'License :: Other/Proprietary License',
-		'License :: Public Domain',
-		'License :: Repoze Public License',
-		'Natural Language :: Afrikaans',
-		'Natural Language :: Arabic',
-		'Natural Language :: Bengali',
-		'Natural Language :: Bosnian',
-		'Natural Language :: Bulgarian',
-		'Natural Language :: Catalan',
-		'Natural Language :: Chinese (Simplified)',
-		'Natural Language :: Chinese (Traditional)',
-		'Natural Language :: Croatian',
-		'Natural Language :: Czech',
-		'Natural Language :: Danish',
-		'Natural Language :: Dutch',
-		'Natural Language :: English',
-		'Natural Language :: Esperanto',
-		'Natural Language :: Finnish',
-		'Natural Language :: French',
-		'Natural Language :: German',
-		'Natural Language :: Greek',
-		'Natural Language :: Hebrew',
-		'Natural Language :: Hindi',
-		'Natural Language :: Hungarian',
-		'Natural Language :: Icelandic',
-		'Natural Language :: Indonesian',
-		'Natural Language :: Italian',
-		'Natural Language :: Japanese',
-		'Natural Language :: Javanese',
-		'Natural Language :: Korean',
-		'Natural Language :: Latin',
-		'Natural Language :: Latvian',
-		'Natural Language :: Macedonian',
-		'Natural Language :: Malay',
-		'Natural Language :: Marathi',
-		'Natural Language :: Norwegian',
-		'Natural Language :: Panjabi',
-		'Natural Language :: Persian',
-		'Natural Language :: Polish',
-		'Natural Language :: Portuguese',
-		'Natural Language :: Portuguese (Brazilian)',
-		'Natural Language :: Romanian',
-		'Natural Language :: Russian',
-		'Natural Language :: Serbian',
-		'Natural Language :: Slovak',
-		'Natural Language :: Slovenian',
-		'Natural Language :: Spanish',
-		'Natural Language :: Swedish',
-		'Natural Language :: Tamil',
-		'Natural Language :: Telugu',
-		'Natural Language :: Thai',
-		'Natural Language :: Turkish',
-		'Natural Language :: Ukranian',
-		'Natural Language :: Urdu',
-		'Natural Language :: Vietnamese',
-		'Operating System :: BeOS',
-		'Operating System :: MacOS',
-		'Operating System :: MacOS :: MacOS 9',
-		'Operating System :: MacOS :: MacOS X',
-		'Operating System :: Microsoft',
-		'Operating System :: Microsoft :: MS-DOS',
-		'Operating System :: Microsoft :: Windows',
-		'Operating System :: Microsoft :: Windows :: Windows 3.1 or Earlier',
-		'Operating System :: Microsoft :: Windows :: Windows 95/98/2000',
-		'Operating System :: Microsoft :: Windows :: Windows CE',
-		'Operating System :: Microsoft :: Windows :: Windows NT/2000',
-		'Operating System :: OS/2',
-		'Operating System :: OS Independent',
-		'Operating System :: Other OS',
-		'Operating System :: PalmOS',
-		'Operating System :: PDA Systems',
-		'Operating System :: POSIX',
-		'Operating System :: POSIX :: AIX',
-		'Operating System :: POSIX :: BSD',
-		'Operating System :: POSIX :: BSD :: BSD/OS',
-		'Operating System :: POSIX :: BSD :: FreeBSD',
-		'Operating System :: POSIX :: BSD :: NetBSD',
-		'Operating System :: POSIX :: BSD :: OpenBSD',
-		'Operating System :: POSIX :: GNU Hurd',
-		'Operating System :: POSIX :: HP-UX',
-		'Operating System :: POSIX :: IRIX',
-		'Operating System :: POSIX :: Linux',
-		'Operating System :: POSIX :: Other',
-		'Operating System :: POSIX :: SCO',
-		'Operating System :: POSIX :: SunOS/Solaris',
-		'Operating System :: Unix',
-		'Programming Language :: Ada',
-		'Programming Language :: APL',
-		'Programming Language :: ASP',
-		'Programming Language :: Assembly',
-		'Programming Language :: Awk',
-		'Programming Language :: Basic',
-		'Programming Language :: C',
-		'Programming Language :: C#',
-		'Programming Language :: C++',
-		'Programming Language :: Cold Fusion',
-		'Programming Language :: Cython',
-		'Programming Language :: Delphi/Kylix',
-		'Programming Language :: Dylan',
-		'Programming Language :: Eiffel',
-		'Programming Language :: Emacs-Lisp',
-		'Programming Language :: Erlang',
-		'Programming Language :: Euler',
-		'Programming Language :: Euphoria',
-		'Programming Language :: Forth',
-		'Programming Language :: Fortran',
-		'Programming Language :: Haskell',
-		'Programming Language :: Java',
-		'Programming Language :: JavaScript',
-		'Programming Language :: Lisp',
-		'Programming Language :: Logo',
-		'Programming Language :: ML',
-		'Programming Language :: Modula',
-		'Programming Language :: Objective C',
-		'Programming Language :: Object Pascal',
-		'Programming Language :: OCaml',
-		'Programming Language :: Other',
-		'Programming Language :: Other Scripting Engines',
-		'Programming Language :: Pascal',
-		'Programming Language :: Perl',
-		'Programming Language :: PHP',
-		'Programming Language :: Pike',
-		'Programming Language :: Pliant',
-		'Programming Language :: PL/SQL',
-		'Programming Language :: PROGRESS',
-		'Programming Language :: Prolog',
-		'Programming Language :: Python',
-		'Programming Language :: Python :: 2',
-		'Programming Language :: Python :: 2.3',
-		'Programming Language :: Python :: 2.4',
-		'Programming Language :: Python :: 2.5',
-		'Programming Language :: Python :: 2.6',
-		'Programming Language :: Python :: 2.7',
-		'Programming Language :: Python :: 3',
-		'Programming Language :: Python :: 3.0',
-		'Programming Language :: Python :: 3.1',
-		'Programming Language :: Python :: 3.2',
-		'Programming Language :: REBOL',
-		'Programming Language :: Rexx',
-		'Programming Language :: Ruby',
-		'Programming Language :: Scheme',
-		'Programming Language :: Simula',
-		'Programming Language :: Smalltalk',
-		'Programming Language :: SQL',
-		'Programming Language :: Tcl',
-		'Programming Language :: Unix Shell',
-		'Programming Language :: Visual Basic',
-		'Programming Language :: XBasic',
-		'Programming Language :: YACC',
-		'Programming Language :: Zope',
-		'Topic :: Adaptive Technologies',
-		'Topic :: Artistic Software',
-		'Topic :: Communications',
-		'Topic :: Communications :: BBS',
-		'Topic :: Communications :: Chat',
-		'Topic :: Communications :: Chat :: AOL Instant Messenger',
-		'Topic :: Communications :: Chat :: ICQ',
-		'Topic :: Communications :: Chat :: Internet Relay Chat',
-		'Topic :: Communications :: Chat :: Unix Talk',
-		'Topic :: Communications :: Conferencing',
-		'Topic :: Communications :: Email',
-		'Topic :: Communications :: Email :: Address Book',
-		'Topic :: Communications :: Email :: Email Clients (MUA)',
-		'Topic :: Communications :: Email :: Filters',
-		'Topic :: Communications :: Email :: Mailing List Servers',
-		'Topic :: Communications :: Email :: Mail Transport Agents',
-		'Topic :: Communications :: Email :: Post-Office',
-		'Topic :: Communications :: Email :: Post-Office :: IMAP',
-		'Topic :: Communications :: Email :: Post-Office :: POP3',
-		'Topic :: Communications :: Fax',
-		'Topic :: Communications :: FIDO',
-		'Topic :: Communications :: File Sharing',
-		'Topic :: Communications :: File Sharing :: Gnutella',
-		'Topic :: Communications :: File Sharing :: Napster',
-		'Topic :: Communications :: Ham Radio',
-		'Topic :: Communications :: Internet Phone',
-		'Topic :: Communications :: Telephony',
-		'Topic :: Communications :: Usenet News',
-		'Topic :: Database',
-		'Topic :: Database :: Database Engines/Servers',
-		'Topic :: Database :: Front-Ends',
-		'Topic :: Desktop Environment',
-		'Topic :: Desktop Environment :: File Managers',
-		'Topic :: Desktop Environment :: Gnome',
-		'Topic :: Desktop Environment :: GNUstep',
-		'Topic :: Desktop Environment :: K Desktop Environment (KDE)',
-		'Topic :: Desktop Environment :: K Desktop Environment (KDE) :: Themes',
-		'Topic :: Desktop Environment :: PicoGUI',
-		'Topic :: Desktop Environment :: PicoGUI :: Applications',
-		'Topic :: Desktop Environment :: PicoGUI :: Themes',
-		'Topic :: Desktop Environment :: Screen Savers',
-		'Topic :: Desktop Environment :: Window Managers',
-		'Topic :: Desktop Environment :: Window Managers :: Afterstep',
-		'Topic :: Desktop Environment :: Window Managers :: Afterstep :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: Applets',
-		'Topic :: Desktop Environment :: Window Managers :: Blackbox',
-		'Topic :: Desktop Environment :: Window Managers :: Blackbox :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: CTWM',
-		'Topic :: Desktop Environment :: Window Managers :: CTWM :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: Enlightenment',
-		'Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Epplets',
-		'Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Themes DR15',
-		'Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Themes DR16',
-		'Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Themes DR17',
-		'Topic :: Desktop Environment :: Window Managers :: Fluxbox',
-		'Topic :: Desktop Environment :: Window Managers :: Fluxbox :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: FVWM',
-		'Topic :: Desktop Environment :: Window Managers :: FVWM :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: IceWM',
-		'Topic :: Desktop Environment :: Window Managers :: IceWM :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: MetaCity',
-		'Topic :: Desktop Environment :: Window Managers :: MetaCity :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: Oroborus',
-		'Topic :: Desktop Environment :: Window Managers :: Oroborus :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: Sawfish',
-		'Topic :: Desktop Environment :: Window Managers :: Sawfish :: Themes 0.30',
-		'Topic :: Desktop Environment :: Window Managers :: Sawfish :: Themes pre-0.30',
-		'Topic :: Desktop Environment :: Window Managers :: Waimea',
-		'Topic :: Desktop Environment :: Window Managers :: Waimea :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: Window Maker',
-		'Topic :: Desktop Environment :: Window Managers :: Window Maker :: Applets',
-		'Topic :: Desktop Environment :: Window Managers :: Window Maker :: Themes',
-		'Topic :: Desktop Environment :: Window Managers :: XFCE',
-		'Topic :: Desktop Environment :: Window Managers :: XFCE :: Themes',
-		'Topic :: Documentation',
-		'Topic :: Education',
-		'Topic :: Education :: Computer Aided Instruction (CAI)',
-		'Topic :: Education :: Testing',
-		'Topic :: Games/Entertainment',
-		'Topic :: Games/Entertainment :: Arcade',
-		'Topic :: Games/Entertainment :: Board Games',
-		'Topic :: Games/Entertainment :: First Person Shooters',
-		'Topic :: Games/Entertainment :: Fortune Cookies',
-		'Topic :: Games/Entertainment :: Multi-User Dungeons (MUD)',
-		'Topic :: Games/Entertainment :: Puzzle Games',
-		'Topic :: Games/Entertainment :: Real Time Strategy',
-		'Topic :: Games/Entertainment :: Role-Playing',
-		'Topic :: Games/Entertainment :: Side-Scrolling/Arcade Games',
-		'Topic :: Games/Entertainment :: Simulation',
-		'Topic :: Games/Entertainment :: Turn Based Strategy',
-		'Topic :: Home Automation',
-		'Topic :: Internet',
-		'Topic :: Internet :: File Transfer Protocol (FTP)',
-		'Topic :: Internet :: Finger',
-		'Topic :: Internet :: Log Analysis',
-		'Topic :: Internet :: Name Service (DNS)',
-		'Topic :: Internet :: Proxy Servers',
-		'Topic :: Internet :: WAP',
-		'Topic :: Internet :: WWW/HTTP',
-		'Topic :: Internet :: WWW/HTTP :: Browsers',
-		'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
-		'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries',
-		'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards',
-		'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: News/Diary',
-		'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Page Counters',
-		'Topic :: Internet :: WWW/HTTP :: HTTP Servers',
-		'Topic :: Internet :: WWW/HTTP :: Indexing/Search',
-		'Topic :: Internet :: WWW/HTTP :: Site Management',
-		'Topic :: Internet :: WWW/HTTP :: Site Management :: Link Checking',
-		'Topic :: Internet :: WWW/HTTP :: WSGI',
-		'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
-		'Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware',
-		'Topic :: Internet :: WWW/HTTP :: WSGI :: Server',
-		'Topic :: Internet :: Z39.50',
-		'Topic :: Multimedia',
-		'Topic :: Multimedia :: Graphics',
-		'Topic :: Multimedia :: Graphics :: 3D Modeling',
-		'Topic :: Multimedia :: Graphics :: 3D Rendering',
-		'Topic :: Multimedia :: Graphics :: Capture',
-		'Topic :: Multimedia :: Graphics :: Capture :: Digital Camera',
-		'Topic :: Multimedia :: Graphics :: Capture :: Scanners',
-		'Topic :: Multimedia :: Graphics :: Capture :: Screen Capture',
-		'Topic :: Multimedia :: Graphics :: Editors',
-		'Topic :: Multimedia :: Graphics :: Editors :: Raster-Based',
-		'Topic :: Multimedia :: Graphics :: Editors :: Vector-Based',
-		'Topic :: Multimedia :: Graphics :: Graphics Conversion',
-		'Topic :: Multimedia :: Graphics :: Presentation',
-		'Topic :: Multimedia :: Graphics :: Viewers',
-		'Topic :: Multimedia :: Sound/Audio',
-		'Topic :: Multimedia :: Sound/Audio :: Analysis',
-		'Topic :: Multimedia :: Sound/Audio :: Capture/Recording',
-		'Topic :: Multimedia :: Sound/Audio :: CD Audio',
-		'Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Playing',
-		'Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Ripping',
-		'Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Writing',
-		'Topic :: Multimedia :: Sound/Audio :: Conversion',
-		'Topic :: Multimedia :: Sound/Audio :: Editors',
-		'Topic :: Multimedia :: Sound/Audio :: MIDI',
-		'Topic :: Multimedia :: Sound/Audio :: Mixers',
-		'Topic :: Multimedia :: Sound/Audio :: Players',
-		'Topic :: Multimedia :: Sound/Audio :: Players :: MP3',
-		'Topic :: Multimedia :: Sound/Audio :: Sound Synthesis',
-		'Topic :: Multimedia :: Sound/Audio :: Speech',
-		'Topic :: Multimedia :: Video',
-		'Topic :: Multimedia :: Video :: Capture',
-		'Topic :: Multimedia :: Video :: Conversion',
-		'Topic :: Multimedia :: Video :: Display',
-		'Topic :: Multimedia :: Video :: Non-Linear Editor',
-		'Topic :: Office/Business',
-		'Topic :: Office/Business :: Financial',
-		'Topic :: Office/Business :: Financial :: Accounting',
-		'Topic :: Office/Business :: Financial :: Investment',
-		'Topic :: Office/Business :: Financial :: Point-Of-Sale',
-		'Topic :: Office/Business :: Financial :: Spreadsheet',
-		'Topic :: Office/Business :: Groupware',
-		'Topic :: Office/Business :: News/Diary',
-		'Topic :: Office/Business :: Office Suites',
-		'Topic :: Office/Business :: Scheduling',
-		'Topic :: Other/Nonlisted Topic',
-		'Topic :: Printing',
-		'Topic :: Religion',
-		'Topic :: Scientific/Engineering',
-		'Topic :: Scientific/Engineering :: Artificial Intelligence',
-		'Topic :: Scientific/Engineering :: Astronomy',
-		'Topic :: Scientific/Engineering :: Atmospheric Science',
-		'Topic :: Scientific/Engineering :: Bio-Informatics',
-		'Topic :: Scientific/Engineering :: Chemistry',
-		'Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)',
-		'Topic :: Scientific/Engineering :: GIS',
-		'Topic :: Scientific/Engineering :: Human Machine Interfaces',
-		'Topic :: Scientific/Engineering :: Image Recognition',
-		'Topic :: Scientific/Engineering :: Information Analysis',
-		'Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator',
-		'Topic :: Scientific/Engineering :: Mathematics',
-		'Topic :: Scientific/Engineering :: Medical Science Apps.',
-		'Topic :: Scientific/Engineering :: Physics',
-		'Topic :: Scientific/Engineering :: Visualization',
-		'Topic :: Security',
-		'Topic :: Security :: Cryptography',
-		'Topic :: Sociology',
-		'Topic :: Sociology :: Genealogy',
-		'Topic :: Sociology :: History',
-		'Topic :: Software Development',
-		'Topic :: Software Development :: Assemblers',
-		'Topic :: Software Development :: Bug Tracking',
-		'Topic :: Software Development :: Build Tools',
-		'Topic :: Software Development :: Code Generators',
-		'Topic :: Software Development :: Compilers',
-		'Topic :: Software Development :: Debuggers',
-		'Topic :: Software Development :: Disassemblers',
-		'Topic :: Software Development :: Documentation',
-		'Topic :: Software Development :: Embedded Systems',
-		'Topic :: Software Development :: Internationalization',
-		'Topic :: Software Development :: Interpreters',
-		'Topic :: Software Development :: Libraries',
-		'Topic :: Software Development :: Libraries :: Application Frameworks',
-		'Topic :: Software Development :: Libraries :: Java Libraries',
-		'Topic :: Software Development :: Libraries :: Perl Modules',
-		'Topic :: Software Development :: Libraries :: PHP Classes',
-		'Topic :: Software Development :: Libraries :: Pike Modules',
-		'Topic :: Software Development :: Libraries :: pygame',
-		'Topic :: Software Development :: Libraries :: Python Modules',
-		'Topic :: Software Development :: Libraries :: Ruby Modules',
-		'Topic :: Software Development :: Libraries :: Tcl Extensions',
-		'Topic :: Software Development :: Localization',
-		'Topic :: Software Development :: Object Brokering',
-		'Topic :: Software Development :: Object Brokering :: CORBA',
-		'Topic :: Software Development :: Pre-processors',
-		'Topic :: Software Development :: Quality Assurance',
-		'Topic :: Software Development :: Testing',
-		'Topic :: Software Development :: Testing :: Traffic Generation',
-		'Topic :: Software Development :: User Interfaces',
-		'Topic :: Software Development :: Version Control',
-		'Topic :: Software Development :: Version Control :: CVS',
-		'Topic :: Software Development :: Version Control :: RCS',
-		'Topic :: Software Development :: Version Control :: SCCS',
-		'Topic :: Software Development :: Widget Sets',
-		'Topic :: System',
-		'Topic :: System :: Archiving',
-		'Topic :: System :: Archiving :: Backup',
-		'Topic :: System :: Archiving :: Compression',
-		'Topic :: System :: Archiving :: Mirroring',
-		'Topic :: System :: Archiving :: Packaging',
-		'Topic :: System :: Benchmark',
-		'Topic :: System :: Boot',
-		'Topic :: System :: Boot :: Init',
-		'Topic :: System :: Clustering',
-		'Topic :: System :: Console Fonts',
-		'Topic :: System :: Distributed Computing',
-		'Topic :: System :: Emulators',
-		'Topic :: System :: Filesystems',
-		'Topic :: System :: Hardware',
-		'Topic :: System :: Hardware :: Hardware Drivers',
-		'Topic :: System :: Hardware :: Mainframes',
-		'Topic :: System :: Hardware :: Symmetric Multi-processing',
-		'Topic :: System :: Installation/Setup',
-		'Topic :: System :: Logging',
-		'Topic :: System :: Monitoring',
-		'Topic :: System :: Networking',
-		'Topic :: System :: Networking :: Firewalls',
-		'Topic :: System :: Networking :: Monitoring',
-		'Topic :: System :: Networking :: Monitoring :: Hardware Watchdog',
-		'Topic :: System :: Networking :: Time Synchronization',
-		'Topic :: System :: Operating System',
-		'Topic :: System :: Operating System Kernels',
-		'Topic :: System :: Operating System Kernels :: BSD',
-		'Topic :: System :: Operating System Kernels :: GNU Hurd',
-		'Topic :: System :: Operating System Kernels :: Linux',
-		'Topic :: System :: Power (UPS)',
-		'Topic :: System :: Recovery Tools',
-		'Topic :: System :: Shells',
-		'Topic :: System :: Software Distribution',
-		'Topic :: System :: Systems Administration',
-		'Topic :: System :: Systems Administration :: Authentication/Directory',
-		'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP',
-		'Topic :: System :: Systems Administration :: Authentication/Directory :: NIS',
-		'Topic :: System :: System Shells',
-		'Topic :: Terminals',
-		'Topic :: Terminals :: Serial',
-		'Topic :: Terminals :: Telnet',
-		'Topic :: Terminals :: Terminal Emulators/X Terminals',
-		'Topic :: Text Editors',
-		'Topic :: Text Editors :: Documentation',
-		'Topic :: Text Editors :: Emacs',
-		'Topic :: Text Editors :: Integrated Development Environments (IDE)',
-		'Topic :: Text Editors :: Text Processing',
-		'Topic :: Text Editors :: Word Processors',
-		'Topic :: Text Processing',
-		'Topic :: Text Processing :: Filters',
-		'Topic :: Text Processing :: Fonts',
-		'Topic :: Text Processing :: General',
-		'Topic :: Text Processing :: Indexing',
-		'Topic :: Text Processing :: Linguistic',
-		'Topic :: Text Processing :: Markup',
-		'Topic :: Text Processing :: Markup :: HTML',
-		'Topic :: Text Processing :: Markup :: LaTeX',
-		'Topic :: Text Processing :: Markup :: SGML',
-		'Topic :: Text Processing :: Markup :: VRML',
-		'Topic :: Text Processing :: Markup :: XML',
-		'Topic :: Utilities',
+        'Development Status :: 1 - Planning',
+        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 3 - Alpha',
+        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 6 - Mature',
+        'Development Status :: 7 - Inactive',
+        'Environment :: Console',
+        'Environment :: Console :: Curses',
+        'Environment :: Console :: Framebuffer',
+        'Environment :: Console :: Newt',
+        'Environment :: Console :: svgalib',
+        'Environment :: Handhelds/PDA\'s',
+        'Environment :: MacOS X',
+        'Environment :: MacOS X :: Aqua',
+        'Environment :: MacOS X :: Carbon',
+        'Environment :: MacOS X :: Cocoa',
+        'Environment :: No Input/Output (Daemon)',
+        'Environment :: Other Environment',
+        'Environment :: Plugins',
+        'Environment :: Web Environment',
+        'Environment :: Web Environment :: Buffet',
+        'Environment :: Web Environment :: Mozilla',
+        'Environment :: Web Environment :: ToscaWidgets',
+        'Environment :: Win32 (MS Windows)',
+        'Environment :: X11 Applications',
+        'Environment :: X11 Applications :: Gnome',
+        'Environment :: X11 Applications :: GTK',
+        'Environment :: X11 Applications :: KDE',
+        'Environment :: X11 Applications :: Qt',
+        'Framework :: BFG',
+        'Framework :: Buildout',
+        'Framework :: Chandler',
+        'Framework :: CubicWeb',
+        'Framework :: Django',
+        'Framework :: IDLE',
+        'Framework :: Paste',
+        'Framework :: Plone',
+        'Framework :: Pylons',
+        'Framework :: Setuptools Plugin',
+        'Framework :: Trac',
+        'Framework :: TurboGears',
+        'Framework :: TurboGears :: Applications',
+        'Framework :: TurboGears :: Widgets',
+        'Framework :: Twisted',
+        'Framework :: ZODB',
+        'Framework :: Zope2',
+        'Framework :: Zope3',
+        'Intended Audience :: Customer Service',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Education',
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: Financial and Insurance Industry',
+        'Intended Audience :: Healthcare Industry',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: Legal Industry',
+        'Intended Audience :: Manufacturing',
+        'Intended Audience :: Other Audience',
+        'Intended Audience :: Religion',
+        'Intended Audience :: Science/Research',
+        'Intended Audience :: System Administrators',
+        'Intended Audience :: Telecommunications Industry',
+        'License :: Aladdin Free Public License (AFPL)',
+        'License :: DFSG approved',
+        'License :: Eiffel Forum License (EFL)',
+        'License :: Free For Educational Use',
+        'License :: Free For Home Use',
+        'License :: Free for non-commercial use',
+        'License :: Freely Distributable',
+        'License :: Free To Use But Restricted',
+        'License :: Freeware',
+        'License :: Netscape Public License (NPL)',
+        'License :: Nokia Open Source License (NOKOS)',
+        'License :: OSI Approved',
+        'License :: OSI Approved :: Academic Free License (AFL)',
+        'License :: OSI Approved :: Apache Software License',
+        'License :: OSI Approved :: Apple Public Source License',
+        'License :: OSI Approved :: Artistic License',
+        'License :: OSI Approved :: Attribution Assurance License',
+        'License :: OSI Approved :: BSD License',
+        'License :: OSI Approved :: Common Public License',
+        'License :: OSI Approved :: Eiffel Forum License',
+        'License :: OSI Approved :: European Union Public Licence 1.0 (EUPL 1.0)',
+        'License :: OSI Approved :: European Union Public Licence 1.1 (EUPL 1.1)',
+        'License :: OSI Approved :: GNU Affero General Public License v3',
+        'License :: OSI Approved :: GNU Free Documentation License (FDL)',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
+        'License :: OSI Approved :: IBM Public License',
+        'License :: OSI Approved :: Intel Open Source License',
+        'License :: OSI Approved :: ISC License (ISCL)',
+        'License :: OSI Approved :: Jabber Open Source License',
+        'License :: OSI Approved :: MIT License',
+        'License :: OSI Approved :: MITRE Collaborative Virtual Workspace License (CVW)',
+        'License :: OSI Approved :: Motosoto License',
+        'License :: OSI Approved :: Mozilla Public License 1.0 (MPL)',
+        'License :: OSI Approved :: Mozilla Public License 1.1 (MPL 1.1)',
+        'License :: OSI Approved :: Nethack General Public License',
+        'License :: OSI Approved :: Nokia Open Source License',
+        'License :: OSI Approved :: Open Group Test Suite License',
+        'License :: OSI Approved :: Python License (CNRI Python License)',
+        'License :: OSI Approved :: Python Software Foundation License',
+        'License :: OSI Approved :: Qt Public License (QPL)',
+        'License :: OSI Approved :: Ricoh Source Code Public License',
+        'License :: OSI Approved :: Sleepycat License',
+        'License :: OSI Approved :: Sun Industry Standards Source License (SISSL)',
+        'License :: OSI Approved :: Sun Public License',
+        'License :: OSI Approved :: University of Illinois/NCSA Open Source License',
+        'License :: OSI Approved :: Vovida Software License 1.0',
+        'License :: OSI Approved :: W3C License',
+        'License :: OSI Approved :: X.Net License',
+        'License :: OSI Approved :: zlib/libpng License',
+        'License :: OSI Approved :: Zope Public License',
+        'License :: Other/Proprietary License',
+        'License :: Public Domain',
+        'License :: Repoze Public License',
+        'Natural Language :: Afrikaans',
+        'Natural Language :: Arabic',
+        'Natural Language :: Bengali',
+        'Natural Language :: Bosnian',
+        'Natural Language :: Bulgarian',
+        'Natural Language :: Catalan',
+        'Natural Language :: Chinese (Simplified)',
+        'Natural Language :: Chinese (Traditional)',
+        'Natural Language :: Croatian',
+        'Natural Language :: Czech',
+        'Natural Language :: Danish',
+        'Natural Language :: Dutch',
+        'Natural Language :: English',
+        'Natural Language :: Esperanto',
+        'Natural Language :: Finnish',
+        'Natural Language :: French',
+        'Natural Language :: German',
+        'Natural Language :: Greek',
+        'Natural Language :: Hebrew',
+        'Natural Language :: Hindi',
+        'Natural Language :: Hungarian',
+        'Natural Language :: Icelandic',
+        'Natural Language :: Indonesian',
+        'Natural Language :: Italian',
+        'Natural Language :: Japanese',
+        'Natural Language :: Javanese',
+        'Natural Language :: Korean',
+        'Natural Language :: Latin',
+        'Natural Language :: Latvian',
+        'Natural Language :: Macedonian',
+        'Natural Language :: Malay',
+        'Natural Language :: Marathi',
+        'Natural Language :: Norwegian',
+        'Natural Language :: Panjabi',
+        'Natural Language :: Persian',
+        'Natural Language :: Polish',
+        'Natural Language :: Portuguese',
+        'Natural Language :: Portuguese (Brazilian)',
+        'Natural Language :: Romanian',
+        'Natural Language :: Russian',
+        'Natural Language :: Serbian',
+        'Natural Language :: Slovak',
+        'Natural Language :: Slovenian',
+        'Natural Language :: Spanish',
+        'Natural Language :: Swedish',
+        'Natural Language :: Tamil',
+        'Natural Language :: Telugu',
+        'Natural Language :: Thai',
+        'Natural Language :: Turkish',
+        'Natural Language :: Ukranian',
+        'Natural Language :: Urdu',
+        'Natural Language :: Vietnamese',
+        'Operating System :: BeOS',
+        'Operating System :: MacOS',
+        'Operating System :: MacOS :: MacOS 9',
+        'Operating System :: MacOS :: MacOS X',
+        'Operating System :: Microsoft',
+        'Operating System :: Microsoft :: MS-DOS',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: Microsoft :: Windows :: Windows 3.1 or Earlier',
+        'Operating System :: Microsoft :: Windows :: Windows 95/98/2000',
+        'Operating System :: Microsoft :: Windows :: Windows CE',
+        'Operating System :: Microsoft :: Windows :: Windows NT/2000',
+        'Operating System :: OS/2',
+        'Operating System :: OS Independent',
+        'Operating System :: Other OS',
+        'Operating System :: PalmOS',
+        'Operating System :: PDA Systems',
+        'Operating System :: POSIX',
+        'Operating System :: POSIX :: AIX',
+        'Operating System :: POSIX :: BSD',
+        'Operating System :: POSIX :: BSD :: BSD/OS',
+        'Operating System :: POSIX :: BSD :: FreeBSD',
+        'Operating System :: POSIX :: BSD :: NetBSD',
+        'Operating System :: POSIX :: BSD :: OpenBSD',
+        'Operating System :: POSIX :: GNU Hurd',
+        'Operating System :: POSIX :: HP-UX',
+        'Operating System :: POSIX :: IRIX',
+        'Operating System :: POSIX :: Linux',
+        'Operating System :: POSIX :: Other',
+        'Operating System :: POSIX :: SCO',
+        'Operating System :: POSIX :: SunOS/Solaris',
+        'Operating System :: Unix',
+        'Programming Language :: Ada',
+        'Programming Language :: APL',
+        'Programming Language :: ASP',
+        'Programming Language :: Assembly',
+        'Programming Language :: Awk',
+        'Programming Language :: Basic',
+        'Programming Language :: C',
+        'Programming Language :: C#',
+        'Programming Language :: C++',
+        'Programming Language :: Cold Fusion',
+        'Programming Language :: Cython',
+        'Programming Language :: Delphi/Kylix',
+        'Programming Language :: Dylan',
+        'Programming Language :: Eiffel',
+        'Programming Language :: Emacs-Lisp',
+        'Programming Language :: Erlang',
+        'Programming Language :: Euler',
+        'Programming Language :: Euphoria',
+        'Programming Language :: Forth',
+        'Programming Language :: Fortran',
+        'Programming Language :: Haskell',
+        'Programming Language :: Java',
+        'Programming Language :: JavaScript',
+        'Programming Language :: Lisp',
+        'Programming Language :: Logo',
+        'Programming Language :: ML',
+        'Programming Language :: Modula',
+        'Programming Language :: Objective C',
+        'Programming Language :: Object Pascal',
+        'Programming Language :: OCaml',
+        'Programming Language :: Other',
+        'Programming Language :: Other Scripting Engines',
+        'Programming Language :: Pascal',
+        'Programming Language :: Perl',
+        'Programming Language :: PHP',
+        'Programming Language :: Pike',
+        'Programming Language :: Pliant',
+        'Programming Language :: PL/SQL',
+        'Programming Language :: PROGRESS',
+        'Programming Language :: Prolog',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.3',
+        'Programming Language :: Python :: 2.4',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.0',
+        'Programming Language :: Python :: 3.1',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: REBOL',
+        'Programming Language :: Rexx',
+        'Programming Language :: Ruby',
+        'Programming Language :: Scheme',
+        'Programming Language :: Simula',
+        'Programming Language :: Smalltalk',
+        'Programming Language :: SQL',
+        'Programming Language :: Tcl',
+        'Programming Language :: Unix Shell',
+        'Programming Language :: Visual Basic',
+        'Programming Language :: XBasic',
+        'Programming Language :: YACC',
+        'Programming Language :: Zope',
+        'Topic :: Adaptive Technologies',
+        'Topic :: Artistic Software',
+        'Topic :: Communications',
+        'Topic :: Communications :: BBS',
+        'Topic :: Communications :: Chat',
+        'Topic :: Communications :: Chat :: AOL Instant Messenger',
+        'Topic :: Communications :: Chat :: ICQ',
+        'Topic :: Communications :: Chat :: Internet Relay Chat',
+        'Topic :: Communications :: Chat :: Unix Talk',
+        'Topic :: Communications :: Conferencing',
+        'Topic :: Communications :: Email',
+        'Topic :: Communications :: Email :: Address Book',
+        'Topic :: Communications :: Email :: Email Clients (MUA)',
+        'Topic :: Communications :: Email :: Filters',
+        'Topic :: Communications :: Email :: Mailing List Servers',
+        'Topic :: Communications :: Email :: Mail Transport Agents',
+        'Topic :: Communications :: Email :: Post-Office',
+        'Topic :: Communications :: Email :: Post-Office :: IMAP',
+        'Topic :: Communications :: Email :: Post-Office :: POP3',
+        'Topic :: Communications :: Fax',
+        'Topic :: Communications :: FIDO',
+        'Topic :: Communications :: File Sharing',
+        'Topic :: Communications :: File Sharing :: Gnutella',
+        'Topic :: Communications :: File Sharing :: Napster',
+        'Topic :: Communications :: Ham Radio',
+        'Topic :: Communications :: Internet Phone',
+        'Topic :: Communications :: Telephony',
+        'Topic :: Communications :: Usenet News',
+        'Topic :: Database',
+        'Topic :: Database :: Database Engines/Servers',
+        'Topic :: Database :: Front-Ends',
+        'Topic :: Desktop Environment',
+        'Topic :: Desktop Environment :: File Managers',
+        'Topic :: Desktop Environment :: Gnome',
+        'Topic :: Desktop Environment :: GNUstep',
+        'Topic :: Desktop Environment :: K Desktop Environment (KDE)',
+        'Topic :: Desktop Environment :: K Desktop Environment (KDE) :: Themes',
+        'Topic :: Desktop Environment :: PicoGUI',
+        'Topic :: Desktop Environment :: PicoGUI :: Applications',
+        'Topic :: Desktop Environment :: PicoGUI :: Themes',
+        'Topic :: Desktop Environment :: Screen Savers',
+        'Topic :: Desktop Environment :: Window Managers',
+        'Topic :: Desktop Environment :: Window Managers :: Afterstep',
+        'Topic :: Desktop Environment :: Window Managers :: Afterstep :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: Applets',
+        'Topic :: Desktop Environment :: Window Managers :: Blackbox',
+        'Topic :: Desktop Environment :: Window Managers :: Blackbox :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: CTWM',
+        'Topic :: Desktop Environment :: Window Managers :: CTWM :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: Enlightenment',
+        'Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Epplets',
+        'Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Themes DR15',
+        'Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Themes DR16',
+        'Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Themes DR17',
+        'Topic :: Desktop Environment :: Window Managers :: Fluxbox',
+        'Topic :: Desktop Environment :: Window Managers :: Fluxbox :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: FVWM',
+        'Topic :: Desktop Environment :: Window Managers :: FVWM :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: IceWM',
+        'Topic :: Desktop Environment :: Window Managers :: IceWM :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: MetaCity',
+        'Topic :: Desktop Environment :: Window Managers :: MetaCity :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: Oroborus',
+        'Topic :: Desktop Environment :: Window Managers :: Oroborus :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: Sawfish',
+        'Topic :: Desktop Environment :: Window Managers :: Sawfish :: Themes 0.30',
+        'Topic :: Desktop Environment :: Window Managers :: Sawfish :: Themes pre-0.30',
+        'Topic :: Desktop Environment :: Window Managers :: Waimea',
+        'Topic :: Desktop Environment :: Window Managers :: Waimea :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: Window Maker',
+        'Topic :: Desktop Environment :: Window Managers :: Window Maker :: Applets',
+        'Topic :: Desktop Environment :: Window Managers :: Window Maker :: Themes',
+        'Topic :: Desktop Environment :: Window Managers :: XFCE',
+        'Topic :: Desktop Environment :: Window Managers :: XFCE :: Themes',
+        'Topic :: Documentation',
+        'Topic :: Education',
+        'Topic :: Education :: Computer Aided Instruction (CAI)',
+        'Topic :: Education :: Testing',
+        'Topic :: Games/Entertainment',
+        'Topic :: Games/Entertainment :: Arcade',
+        'Topic :: Games/Entertainment :: Board Games',
+        'Topic :: Games/Entertainment :: First Person Shooters',
+        'Topic :: Games/Entertainment :: Fortune Cookies',
+        'Topic :: Games/Entertainment :: Multi-User Dungeons (MUD)',
+        'Topic :: Games/Entertainment :: Puzzle Games',
+        'Topic :: Games/Entertainment :: Real Time Strategy',
+        'Topic :: Games/Entertainment :: Role-Playing',
+        'Topic :: Games/Entertainment :: Side-Scrolling/Arcade Games',
+        'Topic :: Games/Entertainment :: Simulation',
+        'Topic :: Games/Entertainment :: Turn Based Strategy',
+        'Topic :: Home Automation',
+        'Topic :: Internet',
+        'Topic :: Internet :: File Transfer Protocol (FTP)',
+        'Topic :: Internet :: Finger',
+        'Topic :: Internet :: Log Analysis',
+        'Topic :: Internet :: Name Service (DNS)',
+        'Topic :: Internet :: Proxy Servers',
+        'Topic :: Internet :: WAP',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Internet :: WWW/HTTP :: Browsers',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: News/Diary',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Page Counters',
+        'Topic :: Internet :: WWW/HTTP :: HTTP Servers',
+        'Topic :: Internet :: WWW/HTTP :: Indexing/Search',
+        'Topic :: Internet :: WWW/HTTP :: Site Management',
+        'Topic :: Internet :: WWW/HTTP :: Site Management :: Link Checking',
+        'Topic :: Internet :: WWW/HTTP :: WSGI',
+        'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
+        'Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware',
+        'Topic :: Internet :: WWW/HTTP :: WSGI :: Server',
+        'Topic :: Internet :: Z39.50',
+        'Topic :: Multimedia',
+        'Topic :: Multimedia :: Graphics',
+        'Topic :: Multimedia :: Graphics :: 3D Modeling',
+        'Topic :: Multimedia :: Graphics :: 3D Rendering',
+        'Topic :: Multimedia :: Graphics :: Capture',
+        'Topic :: Multimedia :: Graphics :: Capture :: Digital Camera',
+        'Topic :: Multimedia :: Graphics :: Capture :: Scanners',
+        'Topic :: Multimedia :: Graphics :: Capture :: Screen Capture',
+        'Topic :: Multimedia :: Graphics :: Editors',
+        'Topic :: Multimedia :: Graphics :: Editors :: Raster-Based',
+        'Topic :: Multimedia :: Graphics :: Editors :: Vector-Based',
+        'Topic :: Multimedia :: Graphics :: Graphics Conversion',
+        'Topic :: Multimedia :: Graphics :: Presentation',
+        'Topic :: Multimedia :: Graphics :: Viewers',
+        'Topic :: Multimedia :: Sound/Audio',
+        'Topic :: Multimedia :: Sound/Audio :: Analysis',
+        'Topic :: Multimedia :: Sound/Audio :: Capture/Recording',
+        'Topic :: Multimedia :: Sound/Audio :: CD Audio',
+        'Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Playing',
+        'Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Ripping',
+        'Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Writing',
+        'Topic :: Multimedia :: Sound/Audio :: Conversion',
+        'Topic :: Multimedia :: Sound/Audio :: Editors',
+        'Topic :: Multimedia :: Sound/Audio :: MIDI',
+        'Topic :: Multimedia :: Sound/Audio :: Mixers',
+        'Topic :: Multimedia :: Sound/Audio :: Players',
+        'Topic :: Multimedia :: Sound/Audio :: Players :: MP3',
+        'Topic :: Multimedia :: Sound/Audio :: Sound Synthesis',
+        'Topic :: Multimedia :: Sound/Audio :: Speech',
+        'Topic :: Multimedia :: Video',
+        'Topic :: Multimedia :: Video :: Capture',
+        'Topic :: Multimedia :: Video :: Conversion',
+        'Topic :: Multimedia :: Video :: Display',
+        'Topic :: Multimedia :: Video :: Non-Linear Editor',
+        'Topic :: Office/Business',
+        'Topic :: Office/Business :: Financial',
+        'Topic :: Office/Business :: Financial :: Accounting',
+        'Topic :: Office/Business :: Financial :: Investment',
+        'Topic :: Office/Business :: Financial :: Point-Of-Sale',
+        'Topic :: Office/Business :: Financial :: Spreadsheet',
+        'Topic :: Office/Business :: Groupware',
+        'Topic :: Office/Business :: News/Diary',
+        'Topic :: Office/Business :: Office Suites',
+        'Topic :: Office/Business :: Scheduling',
+        'Topic :: Other/Nonlisted Topic',
+        'Topic :: Printing',
+        'Topic :: Religion',
+        'Topic :: Scientific/Engineering',
+        'Topic :: Scientific/Engineering :: Artificial Intelligence',
+        'Topic :: Scientific/Engineering :: Astronomy',
+        'Topic :: Scientific/Engineering :: Atmospheric Science',
+        'Topic :: Scientific/Engineering :: Bio-Informatics',
+        'Topic :: Scientific/Engineering :: Chemistry',
+        'Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)',
+        'Topic :: Scientific/Engineering :: GIS',
+        'Topic :: Scientific/Engineering :: Human Machine Interfaces',
+        'Topic :: Scientific/Engineering :: Image Recognition',
+        'Topic :: Scientific/Engineering :: Information Analysis',
+        'Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator',
+        'Topic :: Scientific/Engineering :: Mathematics',
+        'Topic :: Scientific/Engineering :: Medical Science Apps.',
+        'Topic :: Scientific/Engineering :: Physics',
+        'Topic :: Scientific/Engineering :: Visualization',
+        'Topic :: Security',
+        'Topic :: Security :: Cryptography',
+        'Topic :: Sociology',
+        'Topic :: Sociology :: Genealogy',
+        'Topic :: Sociology :: History',
+        'Topic :: Software Development',
+        'Topic :: Software Development :: Assemblers',
+        'Topic :: Software Development :: Bug Tracking',
+        'Topic :: Software Development :: Build Tools',
+        'Topic :: Software Development :: Code Generators',
+        'Topic :: Software Development :: Compilers',
+        'Topic :: Software Development :: Debuggers',
+        'Topic :: Software Development :: Disassemblers',
+        'Topic :: Software Development :: Documentation',
+        'Topic :: Software Development :: Embedded Systems',
+        'Topic :: Software Development :: Internationalization',
+        'Topic :: Software Development :: Interpreters',
+        'Topic :: Software Development :: Libraries',
+        'Topic :: Software Development :: Libraries :: Application Frameworks',
+        'Topic :: Software Development :: Libraries :: Java Libraries',
+        'Topic :: Software Development :: Libraries :: Perl Modules',
+        'Topic :: Software Development :: Libraries :: PHP Classes',
+        'Topic :: Software Development :: Libraries :: Pike Modules',
+        'Topic :: Software Development :: Libraries :: pygame',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Software Development :: Libraries :: Ruby Modules',
+        'Topic :: Software Development :: Libraries :: Tcl Extensions',
+        'Topic :: Software Development :: Localization',
+        'Topic :: Software Development :: Object Brokering',
+        'Topic :: Software Development :: Object Brokering :: CORBA',
+        'Topic :: Software Development :: Pre-processors',
+        'Topic :: Software Development :: Quality Assurance',
+        'Topic :: Software Development :: Testing',
+        'Topic :: Software Development :: Testing :: Traffic Generation',
+        'Topic :: Software Development :: User Interfaces',
+        'Topic :: Software Development :: Version Control',
+        'Topic :: Software Development :: Version Control :: CVS',
+        'Topic :: Software Development :: Version Control :: RCS',
+        'Topic :: Software Development :: Version Control :: SCCS',
+        'Topic :: Software Development :: Widget Sets',
+        'Topic :: System',
+        'Topic :: System :: Archiving',
+        'Topic :: System :: Archiving :: Backup',
+        'Topic :: System :: Archiving :: Compression',
+        'Topic :: System :: Archiving :: Mirroring',
+        'Topic :: System :: Archiving :: Packaging',
+        'Topic :: System :: Benchmark',
+        'Topic :: System :: Boot',
+        'Topic :: System :: Boot :: Init',
+        'Topic :: System :: Clustering',
+        'Topic :: System :: Console Fonts',
+        'Topic :: System :: Distributed Computing',
+        'Topic :: System :: Emulators',
+        'Topic :: System :: Filesystems',
+        'Topic :: System :: Hardware',
+        'Topic :: System :: Hardware :: Hardware Drivers',
+        'Topic :: System :: Hardware :: Mainframes',
+        'Topic :: System :: Hardware :: Symmetric Multi-processing',
+        'Topic :: System :: Installation/Setup',
+        'Topic :: System :: Logging',
+        'Topic :: System :: Monitoring',
+        'Topic :: System :: Networking',
+        'Topic :: System :: Networking :: Firewalls',
+        'Topic :: System :: Networking :: Monitoring',
+        'Topic :: System :: Networking :: Monitoring :: Hardware Watchdog',
+        'Topic :: System :: Networking :: Time Synchronization',
+        'Topic :: System :: Operating System',
+        'Topic :: System :: Operating System Kernels',
+        'Topic :: System :: Operating System Kernels :: BSD',
+        'Topic :: System :: Operating System Kernels :: GNU Hurd',
+        'Topic :: System :: Operating System Kernels :: Linux',
+        'Topic :: System :: Power (UPS)',
+        'Topic :: System :: Recovery Tools',
+        'Topic :: System :: Shells',
+        'Topic :: System :: Software Distribution',
+        'Topic :: System :: Systems Administration',
+        'Topic :: System :: Systems Administration :: Authentication/Directory',
+        'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP',
+        'Topic :: System :: Systems Administration :: Authentication/Directory :: NIS',
+        'Topic :: System :: System Shells',
+        'Topic :: Terminals',
+        'Topic :: Terminals :: Serial',
+        'Topic :: Terminals :: Telnet',
+        'Topic :: Terminals :: Terminal Emulators/X Terminals',
+        'Topic :: Text Editors',
+        'Topic :: Text Editors :: Documentation',
+        'Topic :: Text Editors :: Emacs',
+        'Topic :: Text Editors :: Integrated Development Environments (IDE)',
+        'Topic :: Text Editors :: Text Processing',
+        'Topic :: Text Editors :: Word Processors',
+        'Topic :: Text Processing',
+        'Topic :: Text Processing :: Filters',
+        'Topic :: Text Processing :: Fonts',
+        'Topic :: Text Processing :: General',
+        'Topic :: Text Processing :: Indexing',
+        'Topic :: Text Processing :: Linguistic',
+        'Topic :: Text Processing :: Markup',
+        'Topic :: Text Processing :: Markup :: HTML',
+        'Topic :: Text Processing :: Markup :: LaTeX',
+        'Topic :: Text Processing :: Markup :: SGML',
+        'Topic :: Text Processing :: Markup :: VRML',
+        'Topic :: Text Processing :: Markup :: XML',
+        'Topic :: Utilities',
    ]
 
 def askYn(question, default = None, helptext = None):
-	while True:
-		answer = ask(question, default, helptext, required = True)
-		if answer and answer[0].lower() in 'yn':
-			return(answer[0].lower())
+    while True:
+        answer = ask(question, default, helptext, required = True)
+        if answer and answer[0].lower() in 'yn':
+            return(answer[0].lower())
 
-		print '\nERROR: You must select "Y" or "N".\n'
+        print '\nERROR: You must select "Y" or "N".\n'
 
 
 def ask(question, default = None, helptext = None, required = True,
         lengthy = False, multiline = False):
-	prompt = '%s: ' % ( question, )
-	if default:
-		prompt = '%s [%s]: ' % ( question, default )
-		if default and len(question) + len(default) > 70:
-			prompt = '%s\n    [%s]: ' % ( question, default )
-	if lengthy or multiline:
-		prompt += '\n   >'
+    prompt = '%s: ' % ( question, )
+    if default:
+        prompt = '%s [%s]: ' % ( question, default )
+        if default and len(question) + len(default) > 70:
+            prompt = '%s\n    [%s]: ' % ( question, default )
+    if lengthy or multiline:
+        prompt += '\n   >'
 
-	if not helptext: helptext = 'No additional help available.'
-	if helptext[0] == '\n': helptext = helptext[1:]
-	if helptext[-1] == '\n': helptext = helptext[:-1]
+    if not helptext: helptext = 'No additional help available.'
+    if helptext[0] == '\n': helptext = helptext[1:]
+    if helptext[-1] == '\n': helptext = helptext[:-1]
 
-	while True:
-		sys.stdout.write(prompt)
-		sys.stdout.flush()
+    while True:
+        sys.stdout.write(prompt)
+        sys.stdout.flush()
 
-		line = sys.stdin.readline().strip()
-		if line == '?':
-			print '=' * 70
-			print helptext
-			print '=' * 70
-			continue
-		if default and not line: return(default)
-		if not line and required:
-			print '*' * 70
-			print 'This value cannot be empty.'
-			print '==========================='
-			if helptext: print helptext
-			print '*' * 70
-			continue
-		return(line)
+        line = sys.stdin.readline().strip()
+        if line == '?':
+            print '=' * 70
+            print helptext
+            print '=' * 70
+            continue
+        if default and not line: return(default)
+        if not line and required:
+            print '*' * 70
+            print 'This value cannot be empty.'
+            print '==========================='
+            if helptext: print helptext
+            print '*' * 70
+            continue
+        return(line)
 
 
 def buildTroveDict(troveList):
-	dict = {}
-	for key in troveList:
-		subDict = dict
-		for subkey in key.split(' :: '):
-			if not subkey in subDict: subDict[subkey] = {}
-			subDict = subDict[subkey]
-	return(dict)
+    dict = {}
+    for key in troveList:
+        subDict = dict
+        for subkey in key.split(' :: '):
+            if not subkey in subDict: subDict[subkey] = {}
+            subDict = subDict[subkey]
+    return(dict)
 troveDict = buildTroveDict(troveList)
 
 
 class SetupClass:
-	def __init__(self):
-		self.config = None
-		self.classifierDict = {}
-		self.setupData = {}
-		self.setupData['classifier'] = self.classifierDict
-		self.setupData['packages'] = {}
+    def __init__(self):
+        self.config = None
+        self.classifierDict = {}
+        self.setupData = {}
+        self.setupData['classifier'] = self.classifierDict
+        self.setupData['packages'] = {}
 
-		self.loadConfigFile()
+        self.loadConfigFile()
 
 
-	def lookupOption(self, key):
-		if not self.config.has_option('DEFAULT', key): return(None)
-		return(self.config.get('DEFAULT', key))
+    def lookupOption(self, key):
+        if not self.config.has_option('DEFAULT', key): return(None)
+        return(self.config.get('DEFAULT', key))
 
 
-	def loadConfigFile(self):
-		self.config = ConfigParser.RawConfigParser()
-		self.config.read(os.path.expanduser('~/.mkpkgpy'))
-		self.setupData['author'] = self.lookupOption('author')
-		self.setupData['author_email'] = self.lookupOption('author_email')
+    def loadConfigFile(self):
+        self.config = ConfigParser.RawConfigParser()
+        self.config.read(os.path.expanduser('~/.mkpkgpy'))
+        self.setupData['author'] = self.lookupOption('author')
+        self.setupData['author_email'] = self.lookupOption('author_email')
 
 
-	def updateConfigFile(self):
-		valuesDifferent = False
-		for compareKey in ('author', 'author_email'):
-			if self.lookupOption(compareKey) != self.setupData[compareKey]:
-				valuesDifferent = True
-				self.config.set('DEFAULT', compareKey, self.setupData[compareKey])
+    def updateConfigFile(self):
+        valuesDifferent = False
+        for compareKey in ('author', 'author_email'):
+            if self.lookupOption(compareKey) != self.setupData[compareKey]:
+                valuesDifferent = True
+                self.config.set('DEFAULT', compareKey,
+                    self.setupData[compareKey])
 
-		if not valuesDifferent: return
+        if not valuesDifferent: return
 
-		self.config.write(open(os.path.expanduser('~/.pygiver'), 'w'))
+        self.config.write(open(os.path.expanduser('~/.pygiver'), 'w'))
 
 
-	def loadExistingSetup(self):
-		raise NotImplementedError
+    def loadExistingSetup(self):
+        raise NotImplementedError
 
 
-	def inspectFile(self, path):
-		fp = open(path, 'r')
-		for line in [ fp.readline() for x in range(10) ]:
-			m = re.match(r'^#!.*python((?P<major>\d)(\.\d+)?)?$', line)
-			if m:
-				if m.group('major') == '3':
-					self.classifierDict['Programming Language :: Python :: 3'] = 1
-				else:
-					self.classifierDict['Programming Language :: Python :: 2'] = 1
-		fp.close()
+    def inspectFile(self, path):
+        fp = open(path, 'r')
+        for line in [ fp.readline() for x in range(10) ]:
+            m = re.match(r'^#!.*python((?P<major>\d)(\.\d+)?)?$', line)
+            if m:
+                if m.group('major') == '3':
+                    self.classifierDict['Programming Language :: Python :: 3'] = 1
+                else:
+                    self.classifierDict['Programming Language :: Python :: 2'] = 1
+        fp.close()
 
 
-	def inspectDirectory(self):
-		dirName = os.path.basename(os.getcwd())
-		self.setupData['name'] = dirName
-		m = re.match(r'(.*)-(\d.+)', dirName)
-		if m:
-			self.setupData['name'] = m.group(1)
-			self.setupData['version'] = m.group(2)
+    def inspectDirectory(self):
+        dirName = os.path.basename(os.getcwd())
+        self.setupData['name'] = dirName
+        m = re.match(r'(.*)-(\d.+)', dirName)
+        if m:
+            self.setupData['name'] = m.group(1)
+            self.setupData['version'] = m.group(2)
 
-		for root, dirs, files in os.walk('.'):
-			for file in files:
-				if root == '.' and file == 'setup.py': continue
-				fileName = os.path.join(root, file)
-				self.inspectFile(fileName)
+        for root, dirs, files in os.walk('.'):
+            for file in files:
+                if root == '.' and file == 'setup.py': continue
+                fileName = os.path.join(root, file)
+                self.inspectFile(fileName)
 
-				if file == '__init__.py':
-					trySrc = os.path.join('.', 'src')
-					tmpRoot = root
-					if tmpRoot.startswith(trySrc):
-						tmpRoot = tmpRoot[len(trySrc):]
-					if tmpRoot.startswith(os.path.sep):
-						tmpRoot = tmpRoot[len(os.path.sep):]
+                if file == '__init__.py':
+                    trySrc = os.path.join('.', 'src')
+                    tmpRoot = root
+                    if tmpRoot.startswith(trySrc):
+                        tmpRoot = tmpRoot[len(trySrc):]
+                    if tmpRoot.startswith(os.path.sep):
+                        tmpRoot = tmpRoot[len(os.path.sep):]
 
-					self.setupData['packages'][tmpRoot] = root[1 + len(os.path.sep):]
+                    self.setupData['packages'][tmpRoot] = root[1 + len(os.path.sep):]
 
 
-	def queryUser(self):
-		self.setupData['name'] = ask('Package name', self.setupData['name'],
-		      helpText['name'])
-		self.setupData['version'] = ask('Current version number',
-		      self.setupData.get('version'), helpText['version'])
-		self.setupData['description'] = ask('Package description',
-		      self.setupData.get('description'), helpText['description'],
-		      lengthy = True)
-		self.setupData['author'] = ask('Author name',
-		      self.setupData.get('author'), helpText['author'])
-		self.setupData['author_email'] = ask('Author e-mail address',
-		      self.setupData.get('author_email'), helpText['author_email'])
-		self.setupData['url'] = ask('Project URL',
-		      self.setupData.get('url'), helpText['url'], required = False)
+    def queryUser(self):
+        self.setupData['name'] = ask('Package name', self.setupData['name'],
+              helpText['name'])
+        self.setupData['version'] = ask('Current version number',
+              self.setupData.get('version'), helpText['version'])
+        self.setupData['description'] = ask('Package description',
+              self.setupData.get('description'), helpText['description'],
+              lengthy = True)
+        self.setupData['author'] = ask('Author name',
+              self.setupData.get('author'), helpText['author'])
+        self.setupData['author_email'] = ask('Author e-mail address',
+              self.setupData.get('author_email'), helpText['author_email'])
+        self.setupData['url'] = ask('Project URL',
+              self.setupData.get('url'), helpText['url'], required = False)
 
-		if (askYn('Do you want to set Trove classifiers?',
-				helptext = helpText['do_classifier']) == 'y'):
-			self.setTroveClassifier()
+        if (askYn('Do you want to set Trove classifiers?',
+                helptext = helpText['do_classifier']) == 'y'):
+            self.setTroveClassifier()
 
 
-	def setTroveClassifier(self):
-		self.setTroveDevStatus(self.classifierDict)
-		self.setTroveLicense(self.classifierDict)
-		self.setTroveOther(self.classifierDict)
+    def setTroveClassifier(self):
+        self.setTroveDevStatus(self.classifierDict)
+        self.setTroveLicense(self.classifierDict)
+        self.setTroveOther(self.classifierDict)
 
 
-	def setTroveOther(self, classifierDict):
-		if askYn('Do you want to set other trove identifiers', 'n',
-				helpText['trove_generic']) != 'y': return
+    def setTroveOther(self, classifierDict):
+        if askYn('Do you want to set other trove identifiers', 'n',
+                helpText['trove_generic']) != 'y': return
 
-		self.walkTrove(classifierDict, [troveDict], '')
-	
-	def walkTrove(self, classifierDict, trovePath, desc):
-		trove = trovePath[-1]
+        self.walkTrove(classifierDict, [troveDict], '')
 
-		if not trove:
-			return
+    def walkTrove(self, classifierDict, trovePath, desc):
+        trove = trovePath[-1]
 
-		for key in sorted(trove.keys()):
-			if len(trove[key]) == 0:
-				if askYn('Add "%s"' % desc[4:] + ' :: ' + key, 'n') == 'y':
-					classifierDict[desc[4:] + ' :: ' + key] = 1
-				continue
+        if not trove:
+            return
 
-			if askYn('Do you want to set items under\n   "%s" (%d sub-items)'
-					% ( key, len(trove[key]) ), 'n',
-					helpText['trove_generic']) == 'y':
-				self.walkTrove(classifierDict, trovePath + [trove[key]],
-						desc + ' :: ' + key)
+        for key in sorted(trove.keys()):
+            if len(trove[key]) == 0:
+                if askYn('Add "%s"' % desc[4:] + ' :: ' + key, 'n') == 'y':
+                    classifierDict[desc[4:] + ' :: ' + key] = 1
+                continue
 
+            if askYn('Do you want to set items under\n   "%s" (%d sub-items)'
+                    % ( key, len(trove[key]) ), 'n',
+                    helpText['trove_generic']) == 'y':
+                self.walkTrove(classifierDict, trovePath + [trove[key]],
+                        desc + ' :: ' + key)
 
-	def setTroveLicense(self, classifierDict):
-		while True:
-			license = ask('What license do you use',
-			      helptext = helpText['trove_license'], required = False)
-			if not license: return
 
-			licenseWords = license.lower().split(' ')
+    def setTroveLicense(self, classifierDict):
+        while True:
+            license = ask('What license do you use',
+                  helptext = helpText['trove_license'], required = False)
+            if not license: return
 
-			foundList = []
-			for index in range(len(troveList)):
-				troveItem = troveList[index]
-				if not troveItem.startswith('License :: '): continue
-				troveItem = troveItem[11:].lower()
+            licenseWords = license.lower().split(' ')
 
-				allMatch = True
-				for word in licenseWords:
-					if not word in troveItem:
-						allMatch = False
-						break
-				if allMatch: foundList.append(index)
+            foundList = []
+            for index in range(len(troveList)):
+                troveItem = troveList[index]
+                if not troveItem.startswith('License :: '): continue
+                troveItem = troveItem[11:].lower()
 
-			question = 'Matching licenses:\n\n'
-			for i in xrange(1, len(foundList) + 1):
-				question += '   %s) %s\n' % ( i, troveList[foundList[i - 1]] )
-			question += ('\nType the number of the license you wish to use or '
-			         '? to try again:')
-			troveLicense = ask(question, required = False)
+                allMatch = True
+                for word in licenseWords:
+                    if not word in troveItem:
+                        allMatch = False
+                        break
+                if allMatch: foundList.append(index)
 
-			if troveLicense == '?': continue
-			if troveLicense == '': return
-			foundIndex = foundList[int(troveLicense) - 1]
-			classifierDict[troveList[foundIndex]] = 1
-			try:
-				return
-			except IndexError:
-				print 'ERROR: Invalid selection, type a number from the list above.'
+            question = 'Matching licenses:\n\n'
+            for i in xrange(1, len(foundList) + 1):
+                question += '   %s) %s\n' % ( i, troveList[foundList[i - 1]] )
+            question += ('\nType the number of the license you wish to use or '
+                     '? to try again:')
+            troveLicense = ask(question, required = False)
 
+            if troveLicense == '?': continue
+            if troveLicense == '': return
+            foundIndex = foundList[int(troveLicense) - 1]
+            classifierDict[troveList[foundIndex]] = 1
+            try:
+                return
+            except IndexError:
+                print("ERROR: Invalid selection, type a number from the list "
+                    "above.")
 
-	def setTroveDevStatus(self, classifierDict):
-		while True:
-			devStatus = ask('''Please select the project status:
+
+    def setTroveDevStatus(self, classifierDict):
+        while True:
+            devStatus = ask('''Please select the project status:
 
 1 - Planning
 2 - Pre-Alpha
@@ -851,71 +853,80 @@
 7 - Inactive
 
 Status''', required = False)
-			if devStatus:
-				try:
-					key = {
-						   '1' : 'Development Status :: 1 - Planning',
-						   '2' : 'Development Status :: 2 - Pre-Alpha',
-						   '3' : 'Development Status :: 3 - Alpha',
-						   '4' : 'Development Status :: 4 - Beta',
-						   '5' : 'Development Status :: 5 - Production/Stable',
-						   '6' : 'Development Status :: 6 - Mature',
-						   '7' : 'Development Status :: 7 - Inactive',
-						   }[devStatus]
-					classifierDict[key] = 1
-					return
-				except KeyError:
-					print 'ERROR: Invalid selection, type a single digit number.'
+            if devStatus:
+                try:
+                    key = {
+                           '1' : 'Development Status :: 1 - Planning',
+                           '2' : 'Development Status :: 2 - Pre-Alpha',
+                           '3' : 'Development Status :: 3 - Alpha',
+                           '4' : 'Development Status :: 4 - Beta',
+                           '5' : 'Development Status :: 5 - Production/Stable',
+                           '6' : 'Development Status :: 6 - Mature',
+                           '7' : 'Development Status :: 7 - Inactive',
+                           }[devStatus]
+                    classifierDict[key] = 1
+                    return
+                except KeyError:
+                    print("ERROR: Invalid selection, type a single digit "
+                        "number.")
 
+    def _dotted_packages(self, data):
+        packages = sorted(data.keys())
+        modified_pkgs = []
+        for pkg in packages:
+            pkg = pkg.lstrip('./')
+            pkg = pkg.replace('/', '.')
+            modified_pkgs.append(pkg)
+        return modified_pkgs
 
-	def writeSetup(self):
-		if os.path.exists('setup.py'): shutil.move('setup.py', 'setup.py.old')
+    def writeSetup(self):
+        if os.path.exists('setup.py'): shutil.move('setup.py', 'setup.py.old')
 
-		fp = open('setup.py', 'w')
-		fp.write('#!/usr/bin/env python\n\n')
-		fp.write('from distutils2.core import setup\n\n')
+        fp = open('setup.py', 'w')
+        fp.write('#!/usr/bin/env python\n\n')
+        fp.write('from distutils2.core import setup\n\n')
 
-		fp.write('from sys import version\n')
-		fp.write('if version < \'2.2.3\':\n')
-		fp.write('    from distutils2.dist import DistributionMetadata\n')
-		fp.write('    DistributionMetadata.classifier = None\n')
-		fp.write('    DistributionMetadata.download_url = None\n')
+        fp.write('from sys import version\n')
+        fp.write('if version < \'2.2.3\':\n')
+        fp.write('    from distutils2.dist import DistributionMetadata\n')
+        fp.write('    DistributionMetadata.classifier = None\n')
+        fp.write('    DistributionMetadata.download_url = None\n')
 
-		fp.write('setup(name = %s,\n' % repr(self.setupData['name']))
-		fp.write('        version = %s,\n' % repr(self.setupData['version']))
-		fp.write('        description = %s,\n'
-				% repr(self.setupData['description']))
-		fp.write('        author = %s,\n' % repr(self.setupData['author']))
-		fp.write('        author_email = %s,\n'
-				% repr(self.setupData['author_email']))
-		if self.setupData['url']:
-			fp.write('        url = %s,\n' % repr(self.setupData['url']))
-		if self.setupData['classifier']:
-			fp.write('        classifier = [\n')
-			for classifier in sorted(self.setupData['classifier'].keys()):
-				fp.write('              %s,\n' % repr(classifier))
-			fp.write('           ],\n')
-		if self.setupData['packages']:
-			fp.write('        packages = %s,\n'
-					% repr(sorted(self.setupData['packages'].keys())))
-			fp.write('        package_dir = %s,\n'
-					% repr(self.setupData['packages']))
-		fp.write('        #scripts = [\'path/to/script\']\n')
+        fp.write('setup(name = %s,\n' % repr(self.setupData['name']))
+        fp.write('        version = %s,\n' % repr(self.setupData['version']))
+        fp.write('        description = %s,\n'
+                % repr(self.setupData['description']))
+        fp.write('        author = %s,\n' % repr(self.setupData['author']))
+        fp.write('        author_email = %s,\n'
+                % repr(self.setupData['author_email']))
+        if self.setupData['url']:
+            fp.write('        url = %s,\n' % repr(self.setupData['url']))
+        if self.setupData['classifier']:
+            fp.write('        classifier = [\n')
+            for classifier in sorted(self.setupData['classifier'].keys()):
+                fp.write('              %s,\n' % repr(classifier))
+            fp.write('           ],\n')
+        if self.setupData['packages']:
+            fp.write('        packages = %s,\n'
+                    % repr(self._dotted_packages(self.setupData['packages'])))
+            fp.write('        package_dir = %s,\n'
+                    % repr(self.setupData['packages']))
+        fp.write('        #scripts = [\'path/to/script\']\n')
 
-		fp.write('        )\n')
-		fp.close()
-		os.chmod('setup.py', 0755)
+        fp.write('        )\n')
+        fp.close()
+        os.chmod('setup.py', 0755)
 
-		print 'Wrote "setup.py".'
+        print 'Wrote "setup.py".'
 
 
 def main():
-	setup = SetupClass()
-	setup.inspectDirectory()
-	setup.queryUser()
-	setup.updateConfigFile()
-	setup.writeSetup()
+    setup = SetupClass()
+    setup.inspectDirectory()
+    setup.queryUser()
+    setup.updateConfigFile()
+    setup.writeSetup()
 
 
 if __name__ == '__main__':
-	main()
+    main()
diff --git a/src/distutils2/tests/test_check.py b/src/distutils2/tests/test_check.py
--- a/src/distutils2/tests/test_check.py
+++ b/src/distutils2/tests/test_check.py
@@ -27,7 +27,7 @@
         # by default, check is checking the metadata
         # should have some warnings
         cmd = self._run()
-        self.assert_(cmd._warnings > 0)
+        self.assert_(len(cmd._warnings) > 0)
 
         # now let's add the required fields
         # and run it again, to make sure we don't get
@@ -37,7 +37,7 @@
                     'name': 'xxx', 'version': 'xxx'
                     }
         cmd = self._run(metadata)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEquals(len(cmd._warnings), 0)
 
         # now with the strict mode, we should
         # get an error if there are missing metadata
@@ -45,34 +45,35 @@
 
         # and of course, no error when all metadata are present
         cmd = self._run(metadata, strict=1)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEquals(len(cmd._warnings), 0)
 
     def test_check_restructuredtext(self):
         if not _HAS_DOCUTILS: # won't test without docutils
             return
         # let's see if it detects broken rest in long_description
         broken_rest = 'title\n===\n\ntest'
-        pkg_info, dist = self.create_dist(long_description=broken_rest)
+        pkg_info, dist = self.create_dist(description=broken_rest)
         cmd = check(dist)
         cmd.check_restructuredtext()
-        self.assertEquals(cmd._warnings, 1)
+        self.assertEquals(len(cmd._warnings), 1)
 
         # let's see if we have an error with strict=1
-        metadata = {'url': 'xxx', 'author': 'xxx',
+        metadata = {'home_page': 'xxx', 'author': 'xxx',
                     'author_email': 'xxx',
                     'name': 'xxx', 'version': 'xxx',
-                    'long_description': broken_rest}
+                    'description': broken_rest}
+
         self.assertRaises(DistutilsSetupError, self._run, metadata,
                           **{'strict': 1, 'restructuredtext': 1})
 
         # and non-broken rest
-        metadata['long_description'] = 'title\n=====\n\ntest'
+        metadata['description'] = 'title\n=====\n\ntest'
         cmd = self._run(metadata, strict=1, restructuredtext=1)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEquals(len(cmd._warnings), 0)
 
     def test_check_all(self):
 
-        metadata = {'url': 'xxx', 'author': 'xxx'}
+        metadata = {'home_page': 'xxx', 'author': 'xxx'}
         self.assertRaises(DistutilsSetupError, self._run,
                           {}, **{'strict': 1,
                                  'restructuredtext': 1})
diff --git a/src/distutils2/tests/test_metadata.py b/src/distutils2/tests/test_metadata.py
--- a/src/distutils2/tests/test_metadata.py
+++ b/src/distutils2/tests/test_metadata.py
@@ -185,6 +185,22 @@
 
         self.assertEquals(res, 0)
 
+    def test_project_url(self):
+        metadata = DistributionMetadata()
+        metadata['Project-URL'] = [('one', 'http://ok')]
+        self.assertEquals(metadata['Project-URL'],
+                          [('one', 'http://ok')])
+        self.assertEquals(metadata.version, '1.2')
+
+    def test_check(self):
+        metadata = DistributionMetadata()
+        metadata['Version'] = 'rr'
+        metadata['Requires-dist'] = ['Foo (a)']
+        missing, warnings = metadata.check()
+        self.assertEquals(missing, ['Name', 'Home-page'])
+        self.assertEquals(len(warnings), 2)
+
+
 def test_suite():
     return unittest2.makeSuite(DistributionMetadataTestCase)
 
diff --git a/src/distutils2/tests/test_register.py b/src/distutils2/tests/test_register.py
--- a/src/distutils2/tests/test_register.py
+++ b/src/distutils2/tests/test_register.py
@@ -7,6 +7,12 @@
 import urllib2
 import warnings
 
+try:
+    import docutils
+    DOCUTILS_SUPPORT = True
+except ImportError:
+    DOCUTILS_SUPPORT = False
+
 from distutils2.command import register as register_module
 from distutils2.command.register import register
 from distutils2.core import Distribution
@@ -186,6 +192,7 @@
         self.assertEquals(headers['Content-length'], '290')
         self.assertTrue('tarek' in req.data)
 
+    @unittest2.skipUnless(DOCUTILS_SUPPORT, 'needs docutils')
     def test_strict(self):
         # testing the script option
         # when on, the register command stops if
@@ -198,26 +205,20 @@
         cmd.strict = 1
         self.assertRaises(DistutilsSetupError, cmd.run)
 
-        # we don't test the reSt feature if docutils
-        # is not installed
-        try:
-            import docutils
-        except ImportError:
-            return
-
         # metadata are OK but long_description is broken
-        metadata = {'url': 'xxx', 'author': 'xxx',
+        metadata = {'home_page': 'xxx', 'author': 'xxx',
                     'author_email': u'??x??x??',
                     'name': 'xxx', 'version': 'xxx',
-                    'long_description': 'title\n==\n\ntext'}
+                    'description': 'title\n==\n\ntext'}
 
         cmd = self._get_cmd(metadata)
         cmd.ensure_finalized()
         cmd.strict = 1
+
         self.assertRaises(DistutilsSetupError, cmd.run)
 
         # now something that works
-        metadata['long_description'] = 'title\n=====\n\ntext'
+        metadata['description'] = 'title\n=====\n\ntext'
         cmd = self._get_cmd(metadata)
         cmd.ensure_finalized()
         cmd.strict = 1
diff --git a/src/distutils2/tests/test_util.py b/src/distutils2/tests/test_util.py
--- a/src/distutils2/tests/test_util.py
+++ b/src/distutils2/tests/test_util.py
@@ -6,7 +6,10 @@
 from StringIO import StringIO
 import subprocess
 
-from distutils2.errors import DistutilsPlatformError, DistutilsByteCompileError
+from distutils2.errors import (DistutilsPlatformError,
+                               DistutilsByteCompileError,
+                               DistutilsFileError)
+
 from distutils2.util import (convert_path, change_root,
                             check_environ, split_quoted, strtobool,
                             rfc822_escape, get_compiler_versions,
@@ -250,6 +253,10 @@
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
+    def test_newer(self):
+        self.assertRaises(DistutilsFileError, util.newer, 'xxx', 'xxx')
+
+
 def test_suite():
     return unittest2.makeSuite(UtilTestCase)
 
diff --git a/src/distutils2/util.py b/src/distutils2/util.py
--- a/src/distutils2/util.py
+++ b/src/distutils2/util.py
@@ -8,11 +8,10 @@
 
 import sys, os, string, re
 
-from distutils2.errors import DistutilsPlatformError
+from distutils2.errors import (DistutilsPlatformError, DistutilsFileError,
+                               DistutilsByteCompileError)
 from distutils2.spawn import spawn, find_executable
 from distutils2 import log
-from distutils2.errors import DistutilsByteCompileError
-
 from distutils2._backport import sysconfig as _sysconfig
 
 _PLATFORM = None
diff --git a/src/setup.py b/src/setup.py
--- a/src/setup.py
+++ b/src/setup.py
@@ -65,7 +65,7 @@
 
 setup_kwargs = {}
 if sys.version < '2.6':
-    kwargs['scripts'] = 'distutils2/mkpkg.py'
+    setup_kwargs['scripts'] = ['distutils2/mkpkg.py']
 
 setup (name="Distutils2",
        version=VERSION,

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: updated docs
Message-ID: <E1OVLoU-0000gh-RV@dinsdale.python.org>

tarek.ziade pushed d7dc7573e8ef to distutils2:

http://hg.python.org/distutils2/rev/d7dc7573e8ef
changeset:   267:d7dc7573e8ef
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 20:06:08 2010 +0200
summary:     updated docs
files:       docs/source/new_commands.rst

diff --git a/docs/source/new_commands.rst b/docs/source/new_commands.rst
--- a/docs/source/new_commands.rst
+++ b/docs/source/new_commands.rst
@@ -51,7 +51,8 @@
 The ``upload_docs`` command has the following options:
 
 ``--upload-dir``
-    The directory to be uploaded to the repository.
+    The directory to be uploaded to the repository. The default value is
+    ``docs`` in project root.
 
 ``--show-response``
     Display the full response text from server; this is useful for debugging

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: fixed imports
Message-ID: <E1OVLoU-0000gV-Px@dinsdale.python.org>

tarek.ziade pushed 642169797dfc to distutils2:

http://hg.python.org/distutils2/rev/642169797dfc
changeset:   264:642169797dfc
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 14:10:25 2010 +0200
summary:     fixed imports
files:       src/distutils2/tests/pypi_server.py, src/distutils2/tests/test_upload.py

diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
--- a/src/distutils2/tests/pypi_server.py
+++ b/src/distutils2/tests/pypi_server.py
@@ -1,13 +1,5 @@
-import threading
-import copy
-import Queue
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
-
-import time
-from wsgiref.simple_server import make_server, demo_app
+import Queue, threading, time
+from wsgiref.simple_server import make_server
 
 class PyPIServer(threading.Thread):
     """Thread that wraps a wsgi app"""
diff --git a/src/distutils2/tests/test_upload.py b/src/distutils2/tests/test_upload.py
--- a/src/distutils2/tests/test_upload.py
+++ b/src/distutils2/tests/test_upload.py
@@ -1,16 +1,12 @@
 """Tests for distutils.command.upload."""
 # -*- encoding: utf8 -*-
-import sys
-import os
-import unittest2
+import os, unittest2
 
-from distutils2.command import upload as upload_mod
 from distutils2.command.upload import upload
 from distutils2.core import Distribution
 
-from distutils2.tests import support
+from distutils2.tests.pypi_server import PyPIServer
 from distutils2.tests.test_config import PYPIRC, PyPIRCCommandTestCase
-from distutils2.tests.pypi_server import PyPIServer
 
 
 PYPIRC_NOPASSWORD = """\

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: moved the upload_docs command
Message-ID: <E1OVLoU-0000gD-Nv@dinsdale.python.org>

tarek.ziade pushed fa9aa6f78f8f to distutils2:

http://hg.python.org/distutils2/rev/fa9aa6f78f8f
changeset:   260:fa9aa6f78f8f
user:        Konrad Delong <konryd at gmail.com>
date:        Sun May 09 13:37:11 2010 -0400
summary:     moved the upload_docs command
files:       src/distutils2/command/upload_docs.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/command/upload_docs.py
@@ -0,0 +1,174 @@
+# -*- coding: utf-8 -*-
+"""upload_docs
+
+Implements a Distutils2 'upload_docs' subcommand (upload documentation to
+PyPI's packages.python.org).
+"""
+
+import os
+import socket
+import zipfile
+import httplib
+import base64
+import urlparse
+import tempfile
+import sys
+
+from distutils2 import log
+from distutils2.errors import DistutilsOptionError
+from distutils2.command.upload import upload
+
+_IS_PYTHON3 = sys.version > '3'
+
+try:
+    bytes
+except NameError:
+    bytes = str
+
+def b(str_or_bytes):
+    """Return bytes by either encoding the argument as ASCII or simply return
+    the argument as-is."""
+    if not isinstance(str_or_bytes, bytes):
+        return str_or_bytes.encode('ascii')
+    else:
+        return str_or_bytes
+
+
+class upload_docs(upload):
+
+    description = 'Upload documentation to PyPI'
+
+    user_options = [
+        ('repository=', 'r',
+         "url of repository [default: %s]" % upload.DEFAULT_REPOSITORY),
+        ('show-response', None,
+         'display full response text from server'),
+        ('upload-dir=', None, 'directory to upload'),
+        ]
+    boolean_options = upload.boolean_options
+
+    def initialize_options(self):
+        upload.initialize_options(self)
+        self.upload_dir = None
+
+    def finalize_options(self):
+        upload.finalize_options(self)
+        if self.upload_dir is None:
+            build = self.get_finalized_command('build')
+            self.upload_dir = os.path.join(build.build_base, 'docs')
+            self.mkpath(self.upload_dir)
+        self.ensure_dirname('upload_dir')
+        self.announce('Using upload directory %s' % self.upload_dir)
+
+    def create_zipfile(self):
+        name = self.distribution.metadata['Name']
+        tmp_dir = tempfile.mkdtemp()
+        tmp_file = os.path.join(tmp_dir, "%s.zip" % name)
+        zip_file = zipfile.ZipFile(tmp_file, "w")
+        for root, dirs, files in os.walk(self.upload_dir):
+            if root == self.upload_dir and not files:
+                raise DistutilsOptionError(
+                    "no files found in upload directory '%s'"
+                    % self.upload_dir)
+            for name in files:
+                full = os.path.join(root, name)
+                relative = root[len(self.upload_dir):].lstrip(os.path.sep)
+                dest = os.path.join(relative, name)
+                zip_file.write(full, dest)
+        zip_file.close()
+        return tmp_file
+
+    def run(self):
+        zip_file = self.create_zipfile()
+        self.upload_file(zip_file)
+
+    def upload_file(self, filename):
+        content = open(filename, 'rb').read()
+        meta = self.distribution.metadata
+        data = {
+            ':action': 'doc_upload',
+            'name': meta['Name'],
+            'content': (os.path.basename(filename), content),
+        }
+        # set up the authentication
+        credentials = self.username + ':' + self.password
+        if _IS_PYTHON3:  # base64 only works with bytes in Python 3.
+            encoded_creds = base64.encodebytes(credentials.encode('utf8'))
+            auth = bytes("Basic ")
+        else:
+            encoded_creds = base64.encodestring(credentials)
+            auth = "Basic "
+        auth += encoded_creds.strip()
+
+        # Build up the MIME payload for the POST data
+        boundary = b('--------------GHSKFJDLGDS7543FJKLFHRE75642756743254')
+        sep_boundary = b('\n--') + boundary
+        end_boundary = sep_boundary + b('--')
+        body = []
+        for key, values in data.items():
+            # handle multiple entries for the same name
+            if type(values) != type([]):
+                values = [values]
+            for value in values:
+                if type(value) is tuple:
+                    fn = b(';filename="%s"' % value[0])
+                    value = value[1]
+                else:
+                    fn = b("")
+                body.append(sep_boundary)
+                body.append(b('\nContent-Disposition: form-data; name="%s"'%key))
+                body.append(fn)
+                body.append(b("\n\n"))
+                body.append(b(value))
+                if value and value[-1] == b('\r'):
+                    body.append(b('\n'))  # write an extra newline (lurve Macs)
+        body.append(end_boundary)
+        body.append(b("\n"))
+        body = b('').join(body)
+
+        self.announce("Submitting documentation to %s" % (self.repository),
+                      log.INFO)
+
+        # build the Request
+        # We can't use urllib2 since we need to send the Basic
+        # auth right with the first request
+        schema, netloc, url, params, query, fragments = \
+            urlparse.urlparse(self.repository)
+        assert not params and not query and not fragments
+        if schema == 'http':
+            conn = httplib.HTTPConnection(netloc)
+        elif schema == 'https':
+            conn = httplib.HTTPSConnection(netloc)
+        else:
+            raise AssertionError("unsupported schema "+schema)
+
+        data = ''
+        loglevel = log.INFO
+        try:
+            conn.connect()
+            conn.putrequest("POST", url)
+            conn.putheader('Content-type',
+                           'multipart/form-data; boundary=%s'%boundary)
+            conn.putheader('Content-length', str(len(body)))
+            conn.putheader('Authorization', auth)
+            conn.endheaders()
+            conn.send(body)
+        except socket.error, e:
+            self.announce(str(e), log.ERROR)
+            return
+
+        r = conn.getresponse()
+        if r.status == 200:
+            self.announce('Server response (%s): %s' % (r.status, r.reason),
+                          log.INFO)
+        elif r.status == 301:
+            location = r.getheader('Location')
+            if location is None:
+                location = 'http://packages.python.org/%s/' % meta['Name']
+            self.announce('Upload successful. Visit %s' % location,
+                          log.INFO)
+        else:
+            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
+                          log.ERROR)
+        if self.show_response:
+            print '-'*75, r.read(), '-'*75
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -0,0 +1,69 @@
+"""build_ext tests
+"""
+import sys, os, shutil, tempfile, unittest2, site, zipfile
+from distutils2.command.upload_docs import upload_docs
+from distutils2.dist import Distribution
+
+SETUP_PY = """\
+from distutils2.core import setup
+
+setup(name='foo')
+"""
+
+class TestUploadDocsTest(unittest2.TestCase):
+    def setUp(self):
+        self.dir = tempfile.mkdtemp()
+        setup = os.path.join(self.dir, 'setup.py')
+        f = open(setup, 'w')
+        f.write(SETUP_PY)
+        f.close()
+        self.old_cwd = os.getcwd()
+        os.chdir(self.dir)
+        
+        self.upload_dir = os.path.join(self.dir, 'build')
+        os.mkdir(self.upload_dir)
+        
+        # A test document.
+        f = open(os.path.join(self.upload_dir, 'index.html'), 'w')
+        f.write("Hello world.")
+        f.close()
+        
+        # An empty folder.
+        os.mkdir(os.path.join(self.upload_dir, 'empty'))
+        
+        if sys.version >= "2.6":
+            self.old_base = site.USER_BASE
+            site.USER_BASE = upload_docs.USER_BASE = tempfile.mkdtemp()
+            self.old_site = site.USER_SITE
+            site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp()
+    
+    def tearDown(self):
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.dir)
+        if sys.version >= "2.6":
+            shutil.rmtree(site.USER_BASE)
+            shutil.rmtree(site.USER_SITE)
+            site.USER_BASE = self.old_base
+            site.USER_SITE = self.old_site
+
+    def test_create_zipfile(self):
+        # Test to make sure zipfile creation handles common cases.
+        # This explicitly includes a folder containing an empty folder.
+        
+        dist = Distribution()
+        
+        cmd = upload_docs(dist)
+        cmd.upload_dir = self.upload_dir
+        zip_file = cmd.create_zipfile()
+        
+        assert zipfile.is_zipfile(zip_file)
+        
+        zip_f = zipfile.ZipFile(zip_file) # woh...
+        
+        assert zip_f.namelist() == ['index.html']
+
+def test_suite():
+    return unittest2.makeSuite(TestUploadDocsTest)
+
+if __name__ == "__main__":
+    unittest2.main(defaultTest="test_suite")

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: refactored out PyPIServerTestCase and
	renamed	assertEquals to assertEqual
Message-ID: <E1OVLoU-0000gd-R1@dinsdale.python.org>

tarek.ziade pushed 4a0c2ff468c6 to distutils2:

http://hg.python.org/distutils2/rev/4a0c2ff468c6
changeset:   266:4a0c2ff468c6
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 20:02:35 2010 +0200
summary:     refactored out PyPIServerTestCase and renamed assertEquals to assertEqual
files:       src/distutils2/tests/test_upload.py

diff --git a/src/distutils2/tests/test_upload.py b/src/distutils2/tests/test_upload.py
--- a/src/distutils2/tests/test_upload.py
+++ b/src/distutils2/tests/test_upload.py
@@ -19,17 +19,18 @@
 username:me
 """
 
-class UploadTestCase(PyPIRCCommandTestCase):
+class PyPIServerTestCase(unittest2.TestCase):
 
     def setUp(self):
-        super(UploadTestCase, self).setUp()
-        assert not hasattr(self, "pypi")
+        super(PyPIServerTestCase, self).setUp()
         self.pypi = PyPIServer()
         self.pypi.start()
 
     def tearDown(self):
         self.pypi.stop()
 
+class UploadTestCase(PyPIServerTestCase, PyPIRCCommandTestCase):
+
     def test_finalize_options(self):
         # new format
         self.write_file(self.rc, PYPIRC)
@@ -39,7 +40,7 @@
         for attr, waited in (('username', 'me'), ('password', 'secret'),
                              ('realm', 'pypi'),
                              ('repository', 'http://pypi.python.org/pypi')):
-            self.assertEquals(getattr(cmd, attr), waited)
+            self.assertEqual(getattr(cmd, attr), waited)
 
     def test_saved_password(self):
         # file with no password
@@ -49,14 +50,14 @@
         dist = Distribution()
         cmd = upload(dist)
         cmd.ensure_finalized()
-        self.assertEquals(cmd.password, None)
+        self.assertEqual(cmd.password, None)
 
         # make sure we get it as well, if another command
         # initialized it at the dist level
         dist.password = 'xxx'
         cmd = upload(dist)
         cmd.finalize_options()
-        self.assertEquals(cmd.password, 'xxx')
+        self.assertEqual(cmd.password, 'xxx')
 
     def test_upload(self):
         path = os.path.join(self.tmp_dir, 'xxx')
@@ -77,7 +78,7 @@
         self.assertIn('xxx', request_data)
         self.assert_(environ['CONTENT_LENGTH'] > 2000)
         self.assertTrue(environ['CONTENT_TYPE'].startswith('multipart/form-data'))
-        self.assertEquals(environ['REQUEST_METHOD'], 'POST')
+        self.assertEqual(environ['REQUEST_METHOD'], 'POST')
         self.assertNotIn('\n', environ['HTTP_AUTHORIZATION'])
 
 def test_suite():

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: removed upload_docs shot
Message-ID: <E1OVLoU-0000gM-P2@dinsdale.python.org>

tarek.ziade pushed ed6149b35a96 to distutils2:

http://hg.python.org/distutils2/rev/ed6149b35a96
changeset:   262:ed6149b35a96
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 08:04:08 2010 -0400
summary:     removed upload_docs shot
files:       src/distutils2/command/upload_docs.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
deleted file mode 100644
--- a/src/distutils2/command/upload_docs.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# -*- coding: utf-8 -*-
-"""upload_docs
-
-Implements a Distutils2 'upload_docs' subcommand (upload documentation to
-PyPI's packages.python.org).
-"""
-
-import os
-import socket
-import zipfile
-import httplib
-import base64
-import urlparse
-import tempfile
-import sys
-
-from distutils2 import log
-from distutils2.errors import DistutilsOptionError
-from distutils2.command.upload import upload
-
-_IS_PYTHON3 = sys.version > '3'
-
-try:
-    bytes
-except NameError:
-    bytes = str
-
-def b(str_or_bytes):
-    """Return bytes by either encoding the argument as ASCII or simply return
-    the argument as-is."""
-    if not isinstance(str_or_bytes, bytes):
-        return str_or_bytes.encode('ascii')
-    else:
-        return str_or_bytes
-
-
-class upload_docs(upload):
-
-    description = 'Upload documentation to PyPI'
-
-    user_options = [
-        ('repository=', 'r',
-         "url of repository [default: %s]" % upload.DEFAULT_REPOSITORY),
-        ('show-response', None,
-         'display full response text from server'),
-        ('upload-dir=', None, 'directory to upload'),
-        ]
-    boolean_options = upload.boolean_options
-
-    def initialize_options(self):
-        upload.initialize_options(self)
-        self.upload_dir = None
-
-    def finalize_options(self):
-        upload.finalize_options(self)
-        if self.upload_dir is None:
-            build = self.get_finalized_command('build')
-            self.upload_dir = os.path.join(build.build_base, 'docs')
-            self.mkpath(self.upload_dir)
-        self.ensure_dirname('upload_dir')
-        self.announce('Using upload directory %s' % self.upload_dir)
-
-    def create_zipfile(self):
-        name = self.distribution.metadata['Name']
-        tmp_dir = tempfile.mkdtemp()
-        tmp_file = os.path.join(tmp_dir, "%s.zip" % name)
-        zip_file = zipfile.ZipFile(tmp_file, "w")
-        for root, dirs, files in os.walk(self.upload_dir):
-            if root == self.upload_dir and not files:
-                raise DistutilsOptionError(
-                    "no files found in upload directory '%s'"
-                    % self.upload_dir)
-            for name in files:
-                full = os.path.join(root, name)
-                relative = root[len(self.upload_dir):].lstrip(os.path.sep)
-                dest = os.path.join(relative, name)
-                zip_file.write(full, dest)
-        zip_file.close()
-        return tmp_file
-
-    def run(self):
-        zip_file = self.create_zipfile()
-        self.upload_file(zip_file)
-
-    def upload_file(self, filename):
-        content = open(filename, 'rb').read()
-        meta = self.distribution.metadata
-        data = {
-            ':action': 'doc_upload',
-            'name': meta['Name'],
-            'content': (os.path.basename(filename), content),
-        }
-        # set up the authentication
-        credentials = self.username + ':' + self.password
-        if _IS_PYTHON3:  # base64 only works with bytes in Python 3.
-            encoded_creds = base64.encodebytes(credentials.encode('utf8'))
-            auth = bytes("Basic ")
-        else:
-            encoded_creds = base64.encodestring(credentials)
-            auth = "Basic "
-        auth += encoded_creds.strip()
-
-        # Build up the MIME payload for the POST data
-        boundary = b('--------------GHSKFJDLGDS7543FJKLFHRE75642756743254')
-        sep_boundary = b('\n--') + boundary
-        end_boundary = sep_boundary + b('--')
-        body = []
-        for key, values in data.items():
-            # handle multiple entries for the same name
-            if type(values) != type([]):
-                values = [values]
-            for value in values:
-                if type(value) is tuple:
-                    fn = b(';filename="%s"' % value[0])
-                    value = value[1]
-                else:
-                    fn = b("")
-                body.append(sep_boundary)
-                body.append(b('\nContent-Disposition: form-data; name="%s"'%key))
-                body.append(fn)
-                body.append(b("\n\n"))
-                body.append(b(value))
-                if value and value[-1] == b('\r'):
-                    body.append(b('\n'))  # write an extra newline (lurve Macs)
-        body.append(end_boundary)
-        body.append(b("\n"))
-        body = b('').join(body)
-
-        self.announce("Submitting documentation to %s" % (self.repository),
-                      log.INFO)
-
-        # build the Request
-        # We can't use urllib2 since we need to send the Basic
-        # auth right with the first request
-        schema, netloc, url, params, query, fragments = \
-            urlparse.urlparse(self.repository)
-        assert not params and not query and not fragments
-        if schema == 'http':
-            conn = httplib.HTTPConnection(netloc)
-        elif schema == 'https':
-            conn = httplib.HTTPSConnection(netloc)
-        else:
-            raise AssertionError("unsupported schema "+schema)
-
-        data = ''
-        loglevel = log.INFO
-        try:
-            conn.connect()
-            conn.putrequest("POST", url)
-            conn.putheader('Content-type',
-                           'multipart/form-data; boundary=%s'%boundary)
-            conn.putheader('Content-length', str(len(body)))
-            conn.putheader('Authorization', auth)
-            conn.endheaders()
-            conn.send(body)
-        except socket.error, e:
-            self.announce(str(e), log.ERROR)
-            return
-
-        r = conn.getresponse()
-        if r.status == 200:
-            self.announce('Server response (%s): %s' % (r.status, r.reason),
-                          log.INFO)
-        elif r.status == 301:
-            location = r.getheader('Location')
-            if location is None:
-                location = 'http://packages.python.org/%s/' % meta['Name']
-            self.announce('Upload successful. Visit %s' % location,
-                          log.INFO)
-        else:
-            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
-                          log.ERROR)
-        if self.show_response:
-            print '-'*75, r.read(), '-'*75
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
deleted file mode 100644
--- a/src/distutils2/tests/test_upload_docs.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""build_ext tests
-"""
-import sys, os, shutil, tempfile, unittest2, site, zipfile
-from distutils2.command.upload_docs import upload_docs
-from distutils2.dist import Distribution
-
-SETUP_PY = """\
-from distutils2.core import setup
-
-setup(name='foo')
-"""
-
-class TestUploadDocsTest(unittest2.TestCase):
-    def setUp(self):
-        self.dir = tempfile.mkdtemp()
-        setup = os.path.join(self.dir, 'setup.py')
-        f = open(setup, 'w')
-        f.write(SETUP_PY)
-        f.close()
-        self.old_cwd = os.getcwd()
-        os.chdir(self.dir)
-        
-        self.upload_dir = os.path.join(self.dir, 'build')
-        os.mkdir(self.upload_dir)
-        
-        # A test document.
-        f = open(os.path.join(self.upload_dir, 'index.html'), 'w')
-        f.write("Hello world.")
-        f.close()
-        
-        # An empty folder.
-        os.mkdir(os.path.join(self.upload_dir, 'empty'))
-        
-        if sys.version >= "2.6":
-            self.old_base = site.USER_BASE
-            site.USER_BASE = upload_docs.USER_BASE = tempfile.mkdtemp()
-            self.old_site = site.USER_SITE
-            site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp()
-    
-    def tearDown(self):
-        os.chdir(self.old_cwd)
-        shutil.rmtree(self.dir)
-        if sys.version >= "2.6":
-            shutil.rmtree(site.USER_BASE)
-            shutil.rmtree(site.USER_SITE)
-            site.USER_BASE = self.old_base
-            site.USER_SITE = self.old_site
-
-    def test_create_zipfile(self):
-        # Test to make sure zipfile creation handles common cases.
-        # This explicitly includes a folder containing an empty folder.
-        
-        dist = Distribution()
-        
-        cmd = upload_docs(dist)
-        cmd.upload_dir = self.upload_dir
-        zip_file = cmd.create_zipfile()
-        
-        assert zipfile.is_zipfile(zip_file)
-        
-        zip_f = zipfile.ZipFile(zip_file) # woh...
-        
-        assert zip_f.namelist() == ['index.html']
-
-def test_suite():
-    return unittest2.makeSuite(TestUploadDocsTest)
-
-if __name__ == "__main__":
-    unittest2.main(defaultTest="test_suite")

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: merged upstream
Message-ID: <E1OVLoU-0000gA-NN@dinsdale.python.org>

tarek.ziade pushed be8f96b7c538 to distutils2:

http://hg.python.org/distutils2/rev/be8f96b7c538
changeset:   259:be8f96b7c538
parent:      258:0b00b7e6e0b8
parent:      133:d519643faee6
user:        Konrad Delong <konryd at gmail.com>
date:        Sun May 09 13:02:57 2010 -0400
summary:     merged upstream
files:       

diff --git a/.hgtags b/.hgtags
new file mode 100644
--- /dev/null
+++ b/.hgtags
@@ -0,0 +1,1 @@
+5847fb2b7549fb301882c1054eb8b3d0893e3570 1.0a1
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -2,9 +2,16 @@
 CHANGES
 =======
 
-1.0a1
------
+1.0a2 - ?
+--------
 
-- Initial import from the stdlib
+-
 
+1.0a1 - 2010-05-06
+------------------
 
+- Initial import from the stdlib [tarek]
+- Added support for PEP 376 in distutils2.version [tarek]
+- Added support for PEP 345 in distutils2.metadata [tarek]
+- Added distutils2.util.find_package [tarek]
+
diff --git a/src/README.txt b/src/README.txt
--- a/src/README.txt
+++ b/src/README.txt
@@ -1,5 +1,15 @@
-======
-README
-======
+==========
+Distutils2
+==========
 
+Welcome to Distutils2 !
 
+Distutils2 is the new version of Distutils. It's not backward compatible with
+Distutils but provides more features, and implement most new packaging
+standards.
+
+See the documentation at http://packages.python.org/Distutils2 for more info.
+
+**Beware that Distutils2 is its in early stage and should not be used in
+production. Its API is subject to changes**
+
diff --git a/src/distutils2/__init__.py b/src/distutils2/__init__.py
--- a/src/distutils2/__init__.py
+++ b/src/distutils2/__init__.py
@@ -10,7 +10,7 @@
 __all__ = ['__version__', 'setup']
 
 __revision__ = "$Id: __init__.py 78020 2010-02-06 16:37:32Z benjamin.peterson $"
-__version__ = "1.0a1"
+__version__ = "1.0a2"
 
 from distutils2.core import setup
 
diff --git a/src/distutils2/metadata.py b/src/distutils2/metadata.py
--- a/src/distutils2/metadata.py
+++ b/src/distutils2/metadata.py
@@ -103,20 +103,44 @@
             if marker in keys:
                 return True
         return False
+
     keys = fields.keys()
-    is_1_1 = _has_marker(keys, _314_MARKERS)
-    is_1_2 = _has_marker(keys, _345_MARKERS)
+    possible_versions = ['1.0', '1.1', '1.2']
+
+
+    # first let's try to see if a field is not part of one of the version
+    for key in keys:
+        if key not in _241_FIELDS and '1.0' in possible_versions:
+            possible_versions.remove('1.0')
+        if key not in _314_FIELDS and '1.1' in possible_versions:
+            possible_versions.remove('1.1')
+        if key not in _345_FIELDS and '1.2' in possible_versions:
+            possible_versions.remove('1.2')
+
+    # possible_version contains qualified versions
+    if len(possible_versions) == 1:
+        return possible_versions[0]   # found !
+    elif len(possible_versions) == 0:
+        raise MetadataConflictError('Unknown metadata set')
+
+    # let's see if one unique marker is found
+    is_1_1 = '1.1' in possible_versions and _has_marker(keys, _314_MARKERS)
+    is_1_2 = '1.2' in possible_versions and _has_marker(keys, _345_MARKERS)
     if is_1_1 and is_1_2:
-        raise MetadataConflictError('You used both 1.1 and 1.2 fields')
+        raise MetadataConflictError('You used incompatible 1.1 and 1.2 fields')
 
     # we have the choice, either 1.0, or 1.2
     #   - 1.0 has a broken Summary field but work with all tools
     #   - 1.1 is to avoid
     #   - 1.2 fixes Summary but is not spreaded yet
     if not is_1_1 and not is_1_2:
-        return PKG_INFO_PREFERRED_VERSION
+        # we couldn't find any specific marker
+        if PKG_INFO_PREFERRED_VERSION in possible_versions:
+            return PKG_INFO_PREFERRED_VERSION
     if is_1_1:
         return '1.1'
+
+    # default marker when 1.0 is disqualified
     return '1.2'
 
 _ATTR2FIELD = {'metadata_version': 'Metadata-Version',
@@ -269,6 +293,8 @@
             if field in _LISTFIELDS:
                 # we can have multiple lines
                 values = msg.get_all(field)
+                if field in _LISTTUPLEFIELDS and values is not None:
+                    values = [tuple(value.split(',')) for value in values]
                 self.set(field, values)
             else:
                 # single line
@@ -299,6 +325,9 @@
                     values = values.replace('\n', '\n       |')
                 values = [values]
 
+            if field in _LISTTUPLEFIELDS:
+                values = [','.join(value) for value in values]
+
             for value in values:
                 self._write_field(fileobject, field, value)
 
diff --git a/src/distutils2/tests/test_metadata.py b/src/distutils2/tests/test_metadata.py
--- a/src/distutils2/tests/test_metadata.py
+++ b/src/distutils2/tests/test_metadata.py
@@ -4,7 +4,8 @@
 import sys
 from StringIO import StringIO
 
-from distutils2.metadata import DistributionMetadata, _interpret
+from distutils2.metadata import (DistributionMetadata, _interpret,
+                                 PKG_INFO_PREFERRED_VERSION)
 
 class DistributionMetadataTestCase(unittest2.TestCase):
 
@@ -200,6 +201,31 @@
         self.assertEquals(missing, ['Name', 'Home-page'])
         self.assertEquals(len(warnings), 2)
 
+    def test_best_choice(self):
+        metadata = DistributionMetadata()
+        metadata['Version'] = '1.0'
+        self.assertEquals(metadata.version, PKG_INFO_PREFERRED_VERSION)
+        metadata['Classifier'] = ['ok']
+        self.assertEquals(metadata.version, '1.2')
+
+    def test_project_urls(self):
+        # project-url is a bit specific, make sure we write it
+        # properly in PKG-INFO
+        metadata = DistributionMetadata()
+        metadata['Version'] = '1.0'
+        metadata['Project-Url'] = [('one', 'http://ok')]
+        self.assertEquals(metadata['Project-Url'], [('one', 'http://ok')])
+        file_ = StringIO()
+        metadata.write_file(file_)
+        file_.seek(0)
+        res = file_.read().split('\n')
+        self.assertIn('Project-URL: one,http://ok', res)
+
+        file_.seek(0)
+        metadata = DistributionMetadata()
+        metadata.read_file(file_)
+        self.assertEquals(metadata['Project-Url'], [('one', 'http://ok')])
+
 
 def test_suite():
     return unittest2.makeSuite(DistributionMetadataTestCase)
diff --git a/src/distutils2/tests/test_util.py b/src/distutils2/tests/test_util.py
--- a/src/distutils2/tests/test_util.py
+++ b/src/distutils2/tests/test_util.py
@@ -14,7 +14,7 @@
                             check_environ, split_quoted, strtobool,
                             rfc822_escape, get_compiler_versions,
                             _find_exe_version, _MAC_OS_X_LD_VERSION,
-                            byte_compile)
+                            byte_compile, find_packages)
 from distutils2 import util
 from distutils2.tests import support
 
@@ -32,7 +32,9 @@
             self.stdout = StringIO(exes[self.cmd])
             self.stderr = StringIO()
 
-class UtilTestCase(support.EnvironGuard, unittest2.TestCase):
+class UtilTestCase(support.EnvironGuard,
+                   support.TempdirManager,
+                   unittest2.TestCase):
 
     def setUp(self):
         super(UtilTestCase, self).setUp()
@@ -257,6 +259,44 @@
         self.assertRaises(DistutilsFileError, util.newer, 'xxx', 'xxx')
 
 
+    def test_find_packages(self):
+        # let's create a structure we want to scan:
+        #
+        #   pkg1
+        #     __init__
+        #     pkg2
+        #       __init__
+        #     pkg3
+        #       __init__
+        #       pkg6
+        #           __init__
+        #     pkg4    <--- not a pkg
+        #       pkg8
+        #          __init__
+        #   pkg5
+        #     __init__
+        #
+        root = self.mkdtemp()
+        pkg1 = os.path.join(root, 'pkg1')
+        os.mkdir(pkg1)
+        self.write_file(os.path.join(pkg1, '__init__.py'))
+        os.mkdir(os.path.join(pkg1, 'pkg2'))
+        self.write_file(os.path.join(pkg1, 'pkg2', '__init__.py'))
+        os.mkdir(os.path.join(pkg1, 'pkg3'))
+        self.write_file(os.path.join(pkg1, 'pkg3', '__init__.py'))
+        os.mkdir(os.path.join(pkg1, 'pkg3', 'pkg6'))
+        self.write_file(os.path.join(pkg1, 'pkg3', 'pkg6', '__init__.py'))
+        os.mkdir(os.path.join(pkg1, 'pkg4'))
+        os.mkdir(os.path.join(pkg1, 'pkg4', 'pkg8'))
+        self.write_file(os.path.join(pkg1, 'pkg4', 'pkg8', '__init__.py'))
+        pkg5 = os.path.join(root, 'pkg5')
+        os.mkdir(pkg5)
+        self.write_file(os.path.join(pkg5, '__init__.py'))
+
+        res = find_packages([root], ['pkg1.pkg2'])
+        self.assertEquals(res, ['pkg1', 'pkg5', 'pkg1.pkg3', 'pkg1.pkg3.pkg6'])
+
+
 def test_suite():
     return unittest2.makeSuite(UtilTestCase)
 
diff --git a/src/distutils2/util.py b/src/distutils2/util.py
--- a/src/distutils2/util.py
+++ b/src/distutils2/util.py
@@ -7,6 +7,7 @@
 __revision__ = "$Id: util.py 77761 2010-01-26 22:46:15Z tarek.ziade $"
 
 import sys, os, string, re
+from fnmatch import fnmatchcase
 
 from distutils2.errors import (DistutilsPlatformError, DistutilsFileError,
                                DistutilsByteCompileError)
@@ -543,3 +544,70 @@
         f.write(line + "\n")
     f.close()
 
+def _is_package(path):
+    """Returns True if path is a package (a dir with an __init__ file."""
+    if not os.path.isdir(path):
+        return False
+    return os.path.isfile(os.path.join(path, '__init__.py'))
+
+def _under(path, root):
+    path = path.split(os.sep)
+    root = root.split(os.sep)
+    if len(root) > len(path):
+        return False
+    for pos, part in enumerate(root):
+        if path[pos] != part:
+            return False
+    return True
+
+def _package_name(root_path, path):
+    """Returns a dotted package name, given a subpath."""
+    if not _under(path, root_path):
+        raise ValueError('"%s" is not a subpath of "%s"' % (path, root_path))
+    return path[len(root_path) + 1:].replace(os.sep, '.')
+
+def find_packages(paths=('.',), exclude=()):
+    """Return a list all Python packages found recursively within
+    directories 'paths'
+
+    'paths' should be supplied as a sequence of "cross-platform"
+    (i.e. URL-style) path; it will be converted to the appropriate local
+    path syntax.
+
+    'exclude' is a sequence of package names to exclude; '*' can be used as
+    a wildcard in the names, such that 'foo.*' will exclude all subpackages
+    of 'foo' (but not 'foo' itself).
+    """
+    packages = []
+    discarded = []
+    def _discarded(path):
+        for discard in discarded:
+            if _under(path, discard):
+                return True
+        return False
+
+    for path in paths:
+        path = convert_path(path)
+        for root, dirs, files in os.walk(path):
+            for dir_ in dirs:
+                fullpath = os.path.join(root, dir_)
+                if _discarded(fullpath):
+                    continue
+                # we work only with Python packages
+                if not _is_package(fullpath):
+                    discarded.append(fullpath)
+                    continue
+                # see if it's excluded
+                excluded = False
+                package_name = _package_name(path, fullpath)
+                for pattern in exclude:
+                    if fnmatchcase(package_name, pattern):
+                        excluded = True
+                        break
+                if excluded:
+                    continue
+
+                # adding it to the list
+                packages.append(package_name)
+    return packages
+
diff --git a/src/setup.py b/src/setup.py
--- a/src/setup.py
+++ b/src/setup.py
@@ -8,6 +8,7 @@
 from distutils2.command.sdist import sdist
 from distutils2.command.install import install
 from distutils2 import __version__ as VERSION
+from distutils2.util import find_packages
 
 f = open('README.txt')
 try:
@@ -67,20 +68,36 @@
 if sys.version < '2.6':
     setup_kwargs['scripts'] = ['distutils2/mkpkg.py']
 
+_CLASSIFIERS = """\
+Development Status :: 3 - Alpha
+Intended Audience :: Developers
+License :: OSI Approved :: Python Software Foundation License
+Operating System :: OS Independent
+Programming Language :: Python
+Topic :: Software Development :: Libraries :: Python Modules
+Topic :: System :: Archiving :: Packaging
+Topic :: System :: Systems Administration
+Topic :: Utilities"""
+
 setup (name="Distutils2",
        version=VERSION,
-       description="Python Distribution Utilities",
+       summary="Python Distribution Utilities",
+       keywords=['packaging', 'distutils'],
        author="Tarek Ziade",
        author_email="tarek at ziade.org",
-       url="http://www.python.org/sigs/distutils-sig",
+       home_page="http://bitbucket.org/tarek/distutils2/wiki/Home",
        license="PSF",
-       long_description=README,
-       packages=['distutils2',
-                 'distutils2.command',
-                 'distutils2.tests',
-                 'distutils2._backport'],
+       description=README,
+       classifier=_CLASSIFIERS.split('\n'),
+       packages=find_packages(),
        cmdclass={'sdist': sdist_hg, 'install': install_hg},
        package_data={'distutils2._backport': ['sysconfig.cfg']},
+       project_url=[('Mailing-list',
+                    'http://mail.python.org/mailman/listinfo/distutils-sig/'),
+                    ('Documentation',
+                     'http://packages.python.org/Distutils2'),
+                    ('Repository', 'http://hg.python.org/distutils2'),
+                    ('Bug tracker', 'http://bugs.python.org')],
        **setup_kwargs
        )
 

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: added PYPiServer and refactored
	upload test to make use	of it
Message-ID: <E1OVLoU-0000gQ-PX@dinsdale.python.org>

tarek.ziade pushed 00f3215f67f9 to distutils2:

http://hg.python.org/distutils2/rev/00f3215f67f9
changeset:   263:00f3215f67f9
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 14:06:00 2010 +0200
summary:     added PYPiServer and refactored upload test to make use of it
files:       src/distutils2/tests/pypi_server.py, src/distutils2/tests/test_upload.py

diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/tests/pypi_server.py
@@ -0,0 +1,49 @@
+import threading
+import copy
+import Queue
+try:
+    from urllib.request import urlopen
+except ImportError:
+    from urllib2 import urlopen
+
+import time
+from wsgiref.simple_server import make_server, demo_app
+
+class PyPIServer(threading.Thread):
+    """Thread that wraps a wsgi app"""
+    def __init__(self):
+        threading.Thread.__init__(self)
+        self.httpd = make_server('', 0, self.pypi_app)
+        self.httpd.RequestHandlerClass.log_request = lambda *_: None
+        self.address = self.httpd.server_address
+        self.request_queue = Queue.Queue()
+        self._requests = []
+
+    def run(self):
+        self.httpd.serve_forever()
+
+    def stop(self):
+        self.httpd.shutdown()
+        self.join()
+        time.sleep(0.2)
+
+    def pypi_app(self, environ, start_response):
+        status = '200 OK' # HTTP Status
+        headers = [('Content-type', 'text/plain')] # HTTP Headers
+        start_response(status, headers)
+        request_data = environ.pop('wsgi.input').read(int(environ['CONTENT_LENGTH']))
+        self.request_queue.put((environ, request_data))
+        return ["hello"]
+
+    @property
+    def requests(self):
+        while True:
+            try:
+                self._requests.append(self.request_queue.get_nowait())
+            except Queue.Empty:
+                break
+        return self._requests
+
+    @property
+    def full_address(self):
+        return "http://%s:%s" % self.address
diff --git a/src/distutils2/tests/test_upload.py b/src/distutils2/tests/test_upload.py
--- a/src/distutils2/tests/test_upload.py
+++ b/src/distutils2/tests/test_upload.py
@@ -10,24 +10,7 @@
 
 from distutils2.tests import support
 from distutils2.tests.test_config import PYPIRC, PyPIRCCommandTestCase
-
-PYPIRC_LONG_PASSWORD = """\
-[distutils]
-
-index-servers =
-    server1
-    server2
-
-[server1]
-username:me
-password:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-
-[server2]
-username:meagain
-password: secret
-realm:acme
-repository:http://another.pypi/
-"""
+from distutils2.tests.pypi_server import PyPIServer
 
 
 PYPIRC_NOPASSWORD = """\
@@ -40,38 +23,15 @@
 username:me
 """
 
-class FakeOpen(object):
-
-    def __init__(self, url):
-        self.url = url
-        if not isinstance(url, str):
-            self.req = url
-        else:
-            self.req = None
-        self.msg = 'OK'
-
-    def getcode(self):
-        return 200
-
-
-class uploadTestCase(PyPIRCCommandTestCase):
+class UploadTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
-        super(uploadTestCase, self).setUp()
-        self.old_open = upload_mod.urlopen
-        upload_mod.urlopen = self._urlopen
-        self.last_open = None
-
-    def tearDown(self):
-        upload_mod.urlopen = self.old_open
-        super(uploadTestCase, self).tearDown()
-
-    def _urlopen(self, url):
-        self.last_open = FakeOpen(url)
-        return self.last_open
+        super(UploadTestCase, self).setUp()
+        assert not hasattr(self, "pypi")
+        self.pypi = PyPIServer()
+        self.pypi.start()
 
     def test_finalize_options(self):
-
         # new format
         self.write_file(self.rc, PYPIRC)
         dist = Distribution()
@@ -89,7 +49,7 @@
         # make sure it passes
         dist = Distribution()
         cmd = upload(dist)
-        cmd.finalize_options()
+        cmd.ensure_finalized()
         self.assertEquals(cmd.password, None)
 
         # make sure we get it as well, if another command
@@ -100,33 +60,29 @@
         self.assertEquals(cmd.password, 'xxx')
 
     def test_upload(self):
-        tmp = self.mkdtemp()
-        path = os.path.join(tmp, 'xxx')
+        path = os.path.join(self.tmp_dir, 'xxx')
         self.write_file(path)
         command, pyversion, filename = 'xxx', '2.6', path
         dist_files = [(command, pyversion, filename)]
-        self.write_file(self.rc, PYPIRC_LONG_PASSWORD)
 
         # lets run it
         pkg_dir, dist = self.create_dist(dist_files=dist_files, author=u'd??d??')
         cmd = upload(dist)
         cmd.ensure_finalized()
+        cmd.repository = self.pypi.full_address
         cmd.run()
 
         # what did we send ?
-        self.assertIn('d??d??', self.last_open.req.data)
-        headers = dict(self.last_open.req.headers)
-        self.assert_(headers['Content-length'] > 2000)
-        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.assertTrue('xxx' in self.last_open.req.data)
-        auth = self.last_open.req.headers['Authorization']
-        self.assertFalse('\n' in auth)
+        environ, request_data = self.pypi.requests[-1]
+        self.assertIn('d??d??', request_data)
+        self.assertIn('xxx', request_data)
+        self.assert_(environ['CONTENT_LENGTH'] > 2000)
+        self.assertTrue(environ['CONTENT_TYPE'].startswith('multipart/form-data'))
+        self.assertEquals(environ['REQUEST_METHOD'], 'POST')
+        self.assertNotIn('\n', environ['HTTP_AUTHORIZATION'])
 
 def test_suite():
-    return unittest2.makeSuite(uploadTestCase)
+    return unittest2.makeSuite(UploadTestCase)
 
 if __name__ == "__main__":
     unittest2.main(defaultTest="test_suite")

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: started work on upload_docs
Message-ID: <E1OVLoU-0000gl-Rv@dinsdale.python.org>

tarek.ziade pushed adec99dc940d to distutils2:

http://hg.python.org/distutils2/rev/adec99dc940d
changeset:   268:adec99dc940d
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 20:26:12 2010 +0200
summary:     started work on upload_docs
files:       src/distutils2/command/upload_docs.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/command/upload_docs.py
@@ -0,0 +1,19 @@
+import os.path
+from distutils2.core import Command
+
+class upload_docs(Command):
+
+    user_options = [
+        ('upload-dir=', None, 'directory to upload'),
+        ]
+
+    def initialize_options(self):
+        self.upload_dir = None
+
+    def finalize_options(self):
+        if self.upload_dir == None:
+            build = self.get_finalized_command('build')
+            self.upload_dir = os.path.join(build.build_base, "docs")
+
+    def run(self):
+        pass
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -0,0 +1,34 @@
+"""Tests for distutils.command.upload_docs."""
+# -*- encoding: utf8 -*-
+import os, os.path, unittest2
+
+from distutils2.command.upload_docs import upload_docs
+from distutils2.core import Distribution
+
+from distutils2.tests.pypi_server import PyPIServer
+from distutils2.tests.test_upload import PyPIServerTestCase
+from distutils2.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+
+
+class UploadDocsTestCase(PyPIServerTestCase, PyPIRCCommandTestCase):
+
+    def setUp(self):
+        super(UploadDocsTestCase, self).setUp()
+        self.dist = Distribution()
+        self.cmd = upload_docs(self.dist)
+
+    def test_generates_uploaddir_if_none(self):
+        self.cmd.ensure_finalized()
+        self.assertEqual(self.cmd.upload_dir, os.path.join("build", "docs"))
+
+    def test_zip_dir(self):
+        pass
+
+    def test_upload(self):
+        pass
+
+def test_suite():
+    return unittest2.makeSuite(UploadDocsTestCase)
+
+if __name__ == "__main__":
+    unittest2.main(defaultTest="test_suite")

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: stopping pypi_server in teardown &
	tested pypi_server	separately
Message-ID: <E1OVLoU-0000gZ-QY@dinsdale.python.org>

tarek.ziade pushed 169e3d4e7247 to distutils2:

http://hg.python.org/distutils2/rev/169e3d4e7247
changeset:   265:169e3d4e7247
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 14:43:38 2010 +0200
summary:     stopping pypi_server in teardown & tested pypi_server separately
files:       src/distutils2/tests/pypi_server.py, src/distutils2/tests/test_pypi_server.py, src/distutils2/tests/test_upload.py

diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
--- a/src/distutils2/tests/pypi_server.py
+++ b/src/distutils2/tests/pypi_server.py
@@ -23,7 +23,10 @@
         status = '200 OK' # HTTP Status
         headers = [('Content-type', 'text/plain')] # HTTP Headers
         start_response(status, headers)
-        request_data = environ.pop('wsgi.input').read(int(environ['CONTENT_LENGTH']))
+        if environ.get("CONTENT_LENGTH"):
+            request_data = environ.pop('wsgi.input').read(int(environ['CONTENT_LENGTH']))
+        else:
+            request_data = environ.pop('wsgi.input').read()
         self.request_queue.put((environ, request_data))
         return ["hello"]
 
diff --git a/src/distutils2/tests/test_pypi_server.py b/src/distutils2/tests/test_pypi_server.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/tests/test_pypi_server.py
@@ -0,0 +1,27 @@
+"""Tests for distutils.command.bdist."""
+import unittest2, urllib, urllib2
+from distutils2.tests.pypi_server import PyPIServer
+
+class PyPIServerTest(unittest2.TestCase):
+
+    def test_records_requests(self):
+        server = PyPIServer()
+        server.start()
+        self.assertEqual(len(server.requests), 0)
+
+        data = "Rock Around The Bunker"
+        headers = {"X-test-header": "Mister Iceberg"}
+
+        request = urllib2.Request(server.full_address, data, headers)
+        urllib2.urlopen(request)
+        self.assertEqual(len(server.requests), 1)
+        environ, request_data = server.requests[-1]
+        self.assertIn("Rock Around The Bunker", request_data)
+        self.assertEqual(environ["HTTP_X_TEST_HEADER"], "Mister Iceberg")
+        server.stop()
+
+def test_suite():
+    return unittest2.makeSuite(PyPIServerTest)
+
+if __name__ == '__main__':
+    unittest2.main(defaultTest="test_suite")
diff --git a/src/distutils2/tests/test_upload.py b/src/distutils2/tests/test_upload.py
--- a/src/distutils2/tests/test_upload.py
+++ b/src/distutils2/tests/test_upload.py
@@ -27,6 +27,9 @@
         self.pypi = PyPIServer()
         self.pypi.start()
 
+    def tearDown(self):
+        self.pypi.stop()
+
     def test_finalize_options(self):
         # new format
         self.write_file(self.rc, PYPIRC)

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: refactored the pypi server a little
	bit (also, moved the PyPIServerTestCase to
Message-ID: <E1OVLoU-0000h6-UM@dinsdale.python.org>

tarek.ziade pushed ed1fc0d836b6 to distutils2:

http://hg.python.org/distutils2/rev/ed1fc0d836b6
changeset:   273:ed1fc0d836b6
user:        Konrad Delong <konryd at gmail.com>
date:        Mon May 17 01:08:19 2010 +0200
summary:     refactored the pypi server a little bit (also, moved the PyPIServerTestCase to that file)
files:       src/distutils2/tests/pypi_server.py, src/distutils2/tests/test_upload.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
--- a/src/distutils2/tests/pypi_server.py
+++ b/src/distutils2/tests/pypi_server.py
@@ -1,6 +1,17 @@
-import Queue, threading, time
+import Queue, threading, time, unittest2
 from wsgiref.simple_server import make_server
 
+class PyPIServerTestCase(unittest2.TestCase):
+
+    def setUp(self):
+        super(PyPIServerTestCase, self).setUp()
+        self.pypi = PyPIServer()
+        self.pypi.start()
+
+    def tearDown(self):
+        super(PyPIServerTestCase, self).tearDown()
+        self.pypi.stop()
+
 class PyPIServer(threading.Thread):
     """Thread that wraps a wsgi app"""
     def __init__(self):
@@ -10,6 +21,9 @@
         self.address = self.httpd.server_address
         self.request_queue = Queue.Queue()
         self._requests = []
+        self._default_response_status = "200 OK"
+        self._default_response_headers = [('Content-type', 'text/plain')]
+        self._default_response_data = ["hello"]
 
     def run(self):
         self.httpd.serve_forever()
@@ -19,15 +33,21 @@
         self.join()
 
     def pypi_app(self, environ, start_response):
-        status = '200 OK' # HTTP Status
-        headers = [('Content-type', 'text/plain')] # HTTP Headers
-        start_response(status, headers)
+        # record the request
         if environ.get("CONTENT_LENGTH"):
             request_data = environ.pop('wsgi.input').read(int(environ['CONTENT_LENGTH']))
         else:
             request_data = environ.pop('wsgi.input').read()
         self.request_queue.put((environ, request_data))
-        return ["hello"]
+        # send back a response
+        status, headers, data = self.get_next_response()
+        start_response(status, headers)
+        return data
+
+    def get_next_response(self):
+        return (self._default_response_status,
+                self._default_response_headers,
+                self._default_response_data)
 
     @property
     def requests(self):
diff --git a/src/distutils2/tests/test_upload.py b/src/distutils2/tests/test_upload.py
--- a/src/distutils2/tests/test_upload.py
+++ b/src/distutils2/tests/test_upload.py
@@ -5,7 +5,7 @@
 from distutils2.command.upload import upload
 from distutils2.core import Distribution
 
-from distutils2.tests.pypi_server import PyPIServer
+from distutils2.tests.pypi_server import PyPIServer, PyPIServerTestCase
 from distutils2.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
 
@@ -19,16 +19,6 @@
 username:me
 """
 
-class PyPIServerTestCase(unittest2.TestCase):
-
-    def setUp(self):
-        super(PyPIServerTestCase, self).setUp()
-        self.pypi = PyPIServer()
-        self.pypi.start()
-
-    def tearDown(self):
-        self.pypi.stop()
-
 class UploadTestCase(PyPIServerTestCase, PyPIRCCommandTestCase):
 
     def test_finalize_options(self):
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
--- a/src/distutils2/tests/test_upload_docs.py
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -8,8 +8,7 @@
 from distutils2.core import Distribution
 
 from distutils2.tests import support
-from distutils2.tests.pypi_server import PyPIServer
-from distutils2.tests.test_upload import PyPIServerTestCase
+from distutils2.tests.pypi_server import PyPIServer, PyPIServerTestCase
 from distutils2.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
 
@@ -108,6 +107,9 @@
     def test_honours_dry_run(self):
         pass
 
+    def test_reads_pypirc_data(self):
+        pass
+
 def test_suite():
     return unittest2.makeSuite(UploadDocsTestCase)
 

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: implemented run for the simplest case
Message-ID: <E1OVLoU-0000h2-Tv@dinsdale.python.org>

tarek.ziade pushed 4c79b30a4bc4 to distutils2:

http://hg.python.org/distutils2/rev/4c79b30a4bc4
changeset:   272:4c79b30a4bc4
user:        Konrad Delong <konryd at gmail.com>
date:        Fri May 14 00:42:49 2010 +0200
summary:     implemented run for the simplest case
files:       src/distutils2/command/upload_docs.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
--- a/src/distutils2/command/upload_docs.py
+++ b/src/distutils2/command/upload_docs.py
@@ -1,10 +1,11 @@
-import os.path, tempfile, zipfile
+import base64, httplib, os.path, tempfile, urlparse, zipfile
+from cStringIO import StringIO
+from distutils2 import log
 from distutils2.core import Command
 
-def zip_dir_into(directory, destination):
-    """Compresses recursively contents of directory into a zipfile located
-    under given destination.
-    """
+def zip_dir(directory):
+    """Compresses recursively contents of directory into a StringIO object"""
+    destination = StringIO()
     zip_file = zipfile.ZipFile(destination, "w")
     for root, dirs, files in os.walk(directory):
         for name in files:
@@ -13,14 +14,14 @@
             dest = os.path.join(relative, name)
             zip_file.write(full, dest)
     zip_file.close()
+    return destination
 
 # grabbed from
 #    http://code.activestate.com/recipes/146306-http-client-to-post-using-multipartform-data/
 def encode_multipart(fields, files, boundary=None):
     """
     fields is a sequence of (name, value) elements for regular form fields.
-    files is a sequence of (name, filename, content_type, value)
-                            elements for data to be uploaded as files
+    files is a sequence of (name, filename, value) elements for data to be uploaded as files
     Return (content_type, body) ready for httplib.HTTP instance
     """
     if boundary is None:
@@ -33,11 +34,10 @@
             'Content-Disposition: form-data; name="%s"' % key,
             '',
             value])
-    for (key, filename, content_type, value) in files:
+    for (key, filename, value) in files:
         l.extend([
             '--' + boundary,
             'Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename),
-            'Content-Type: %s' % content_type,
             '',
             value])
     l.append('--' + boundary + '--')
@@ -61,4 +61,34 @@
             self.upload_dir = os.path.join(build.build_base, "docs")
 
     def run(self):
-        pass
+        tmp_dir = tempfile.mkdtemp()
+        name = self.distribution.metadata['Name']
+        zip_file = zip_dir(self.upload_dir)
+
+        fields = {':action': 'doc_upload', 'name': name}.items()
+        files = [('content', name, zip_file.getvalue())]
+        content_type, body = encode_multipart(fields, files)
+
+        credentials = self.username + ':' + self.password
+        auth = "Basic " + base64.encodestring(credentials).strip()
+
+        self.announce("Submitting documentation to %s" % (self.repository),
+                      log.INFO)
+
+        schema, netloc, url, params, query, fragments = \
+            urlparse.urlparse(self.repository)
+        conn = httplib.HTTPConnection(netloc)
+
+        try:
+            conn.connect()
+            conn.putrequest("POST", url)
+            conn.putheader('Content-type', content_type)
+            conn.putheader('Content-length', str(len(body)))
+            conn.putheader('Authorization', auth)
+            conn.endheaders()
+            conn.send(body)
+        except socket.error, e:
+            self.announce(str(e), log.ERROR)
+            return
+
+        r = conn.getresponse()
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
--- a/src/distutils2/tests/test_upload_docs.py
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -1,8 +1,9 @@
 """Tests for distutils.command.upload_docs."""
 # -*- encoding: utf8 -*-
 import os, os.path, tempfile, unittest2, zipfile
+from cStringIO import StringIO
 
-from distutils2.command.upload_docs import (upload_docs, zip_dir_into,
+from distutils2.command.upload_docs import (upload_docs, zip_dir,
                                     encode_multipart)
 from distutils2.core import Distribution
 
@@ -23,14 +24,12 @@
 'd',
 '---x',
 'Content-Disposition: form-data; name="e"; filename="f"',
-'Content-Type: g',
 '',
-'h',
+'g',
 '---x',
-'Content-Disposition: form-data; name="i"; filename="j"',
-'Content-Type: k',
+'Content-Disposition: form-data; name="h"; filename="i"',
 '',
-'l',
+'j',
 '---x--',
 '',
 ])
@@ -42,33 +41,68 @@
     def setUp(self):
         super(UploadDocsTestCase, self).setUp()
         self.dist = Distribution()
+        self.dist.metadata['Name'] = "distr-name"
         self.cmd = upload_docs(self.dist)
 
     def test_generates_uploaddir_name_not_given(self):
         self.cmd.ensure_finalized()
         self.assertEqual(self.cmd.upload_dir, os.path.join("build", "docs"))
 
-    def test_zip_dir_into(self):
-        source_dir = tempfile.mkdtemp()
-        os.mkdir(os.path.join(source_dir, "some_dir"))
-        some_file = open(os.path.join(source_dir, "some_dir", "some_file"), "w")
+    def prepare_sample_dir(self):
+        sample_dir = tempfile.mkdtemp()
+        os.mkdir(os.path.join(sample_dir, "some_dir"))
+        some_file = open(os.path.join(sample_dir, "some_dir", "some_file"), "w")
         some_file.write("Ce mortel ennui")
         some_file.close()
-        dest_dir = tempfile.mkdtemp()
-        destination = os.path.join(dest_dir, "archive.zip")
-        zip_dir_into(source_dir, destination)
+        return sample_dir
 
-        self.assertTrue(zipfile.is_zipfile(destination))
-        zip_f = zipfile.ZipFile(destination)
+    def test_zip_dir(self):
+        source_dir = self.prepare_sample_dir()
+        compressed = zip_dir(source_dir)
+
+        zip_f = zipfile.ZipFile(compressed)
         self.assertEqual(zip_f.namelist(), ['some_dir/some_file'])
 
     def test_encode_multipart(self):
         fields = [("a", "b"), ("c", "d")]
-        files = [("e", "f", "g", "h"), ("i", "j", "k", "l")]
-        self.assertEqual(encode_multipart(fields, files, "-x")[0], "multipart/form-data; boundary=-x")
-        self.assertEqual(encode_multipart(fields, files, "-x")[1], EXPECTED_MULTIPART_OUTPUT)
+        files = [("e", "f", "g"), ("h", "i", "j")]
+        content_type, body = encode_multipart(fields, files, "-x")
+        self.assertEqual(content_type, "multipart/form-data; boundary=-x")
+        self.assertEqual(body, EXPECTED_MULTIPART_OUTPUT)
 
     def test_upload(self):
+        self.cmd.ensure_finalized()
+        self.cmd.repository = self.pypi.full_address
+        self.cmd.upload_dir = self.prepare_sample_dir()
+        self.cmd.username = "username"
+        self.cmd.password = "password"
+        self.cmd.run()
+
+        self.assertEqual(len(self.pypi.requests), 1)
+        environ, request_data = self.pypi.requests[-1]
+
+        self.assertIn("content", request_data)
+        self.assertIn("Basic", environ['HTTP_AUTHORIZATION'])
+        self.assertTrue(environ['CONTENT_TYPE'].startswith('multipart/form-data;'))
+
+        action, name, content =\
+            request_data.split("----------------GHSKFJDLGDS7543FJKLFHRE75642756743254")[1:4]
+
+        # check that we picked the right chunks
+        self.assertIn('name=":action"', action)
+        self.assertIn('name="name"', name)
+        self.assertIn('name="content"', content)
+
+        # check their contents
+        self.assertIn("doc_upload", action)
+        self.assertIn("distr-name", name)
+        self.assertIn("some_dir/some_file", content)
+        self.assertIn("Ce mortel ennui", content)
+
+    def test_https_connection(self):
+        pass
+
+    def test_handling_response(self):
         pass
 
     def test_honours_dry_run(self):

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: added zip_dir_into
Message-ID: <E1OVLoU-0000gp-SS@dinsdale.python.org>

tarek.ziade pushed 3804252d385c to distutils2:

http://hg.python.org/distutils2/rev/3804252d385c
changeset:   269:3804252d385c
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 22:02:57 2010 +0200
summary:     added zip_dir_into
files:       src/distutils2/command/upload_docs.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
--- a/src/distutils2/command/upload_docs.py
+++ b/src/distutils2/command/upload_docs.py
@@ -1,6 +1,19 @@
-import os.path
+import os.path, tempfile, zipfile
 from distutils2.core import Command
 
+def zip_dir_into(directory, destination):
+    """Compresses recursively contents of directory into a zipfile located
+    under given destination.
+    """
+    zip_file = zipfile.ZipFile(destination, "w")
+    for root, dirs, files in os.walk(directory):
+        for name in files:
+            full = os.path.join(root, name)
+            relative = root[len(directory):].lstrip(os.path.sep)
+            dest = os.path.join(relative, name)
+            zip_file.write(full, dest)
+    zip_file.close()
+
 class upload_docs(Command):
 
     user_options = [
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
--- a/src/distutils2/tests/test_upload_docs.py
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -1,32 +1,52 @@
 """Tests for distutils.command.upload_docs."""
 # -*- encoding: utf8 -*-
-import os, os.path, unittest2
+import os, os.path, tempfile, unittest2, zipfile
 
-from distutils2.command.upload_docs import upload_docs
+from distutils2.command.upload_docs import upload_docs, zip_dir_into
 from distutils2.core import Distribution
 
+from distutils2.tests import support
 from distutils2.tests.pypi_server import PyPIServer
 from distutils2.tests.test_upload import PyPIServerTestCase
 from distutils2.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
 
-class UploadDocsTestCase(PyPIServerTestCase, PyPIRCCommandTestCase):
+class UploadDocsTestCase(PyPIServerTestCase,
+                         support.TempdirManager,
+                         unittest2.TestCase):
 
     def setUp(self):
         super(UploadDocsTestCase, self).setUp()
         self.dist = Distribution()
         self.cmd = upload_docs(self.dist)
 
-    def test_generates_uploaddir_if_none(self):
+    def test_generates_uploaddir_name_not_given(self):
         self.cmd.ensure_finalized()
         self.assertEqual(self.cmd.upload_dir, os.path.join("build", "docs"))
 
+    def test_zip_dir_into(self):
+        source_dir = tempfile.mkdtemp()
+        os.mkdir(os.path.join(source_dir, "some_dir"))
+        some_file = open(os.path.join(source_dir, "some_dir", "some_file"), "w")
+        some_file.write("Ce mortel ennui")
+        some_file.close()
+        dest_dir = tempfile.mkdtemp()
+        destination = os.path.join(dest_dir, "archive.zip")
+        zip_dir_into(source_dir, destination)
+
+        self.assertTrue(zipfile.is_zipfile(destination))
+        zip_f = zipfile.ZipFile(destination)
+        self.assertEqual(zip_f.namelist(), ['some_dir/some_file'])
+
     def test_zip_dir(self):
         pass
 
     def test_upload(self):
         pass
 
+    def test_honours_dry_run(self):
+        pass
+
 def test_suite():
     return unittest2.makeSuite(UploadDocsTestCase)
 

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:39 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:39 +0200
Subject: [Python-checkins] distutils2: show_response option enabled
Message-ID: <E1OVLoV-0000hP-0Z@dinsdale.python.org>

tarek.ziade pushed 03bc7496c3b2 to distutils2:

http://hg.python.org/distutils2/rev/03bc7496c3b2
changeset:   278:03bc7496c3b2
user:        Konrad Delong <konryd at gmail.com>
date:        Tue Jun 01 17:09:32 2010 +0200
summary:     show_response option enabled
files:       src/distutils2/command/upload_docs.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
--- a/src/distutils2/command/upload_docs.py
+++ b/src/distutils2/command/upload_docs.py
@@ -50,10 +50,8 @@
 class upload_docs(PyPIRCCommand):
 
     user_options = [
-        #('repository=', 'r',
-         #"url of repository [default: %s]" % upload.DEFAULT_REPOSITORY),
-        #('show-response', None,
-         #'display full response text from server'),
+        ('repository=', 'r', "url of repository [default: %s]" % upload.DEFAULT_REPOSITORY),
+        ('show-response', None, 'display full response text from server'),
         ('upload-dir=', None, 'directory to upload'),
         ]
 
@@ -132,3 +130,6 @@
         else:
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
+
+        if self.show_response:
+            print "\n".join(['-'*75, r.read(), '-'*75])
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
--- a/src/distutils2/tests/test_upload_docs.py
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -1,6 +1,6 @@
 """Tests for distutils.command.upload_docs."""
 # -*- encoding: utf8 -*-
-import httplib, os, os.path, shutil, tempfile, unittest2, zipfile
+import httplib, os, os.path, shutil, sys, tempfile, unittest2, zipfile
 from cStringIO import StringIO
 
 from distutils2.command import upload_docs as upload_docs_mod
@@ -174,6 +174,22 @@
         shutil.rmtree(os.path.join(self.cmd.upload_dir))
         self.assertRaises(DistutilsOptionError, self.cmd.ensure_finalized)
 
+    def test_show_response(self):
+        orig_stdout = sys.stdout
+        write_args = []
+        class MockStdIn(object):
+            def write(self, arg):
+                write_args.append(arg)
+        sys.stdout = MockStdIn()
+        try:
+            self.prepare_command()
+            self.cmd.show_response = True
+            self.cmd.run()
+        finally:
+            sys.stdout = orig_stdout
+        self.assertTrue(write_args[0], "should report the response")
+        self.assertIn("\n".join(self.pypi.default_response_data), write_args[0])
+
 def test_suite():
     return unittest2.makeSuite(UploadDocsTestCase)
 

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: removed voodoo sleep
Message-ID: <E1OVLoU-0000gt-Su@dinsdale.python.org>

tarek.ziade pushed 5948b354eed6 to distutils2:

http://hg.python.org/distutils2/rev/5948b354eed6
changeset:   270:5948b354eed6
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 22:22:13 2010 +0200
summary:     removed voodoo sleep
files:       src/distutils2/tests/pypi_server.py

diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
--- a/src/distutils2/tests/pypi_server.py
+++ b/src/distutils2/tests/pypi_server.py
@@ -17,7 +17,6 @@
     def stop(self):
         self.httpd.shutdown()
         self.join()
-        time.sleep(0.2)
 
     def pypi_app(self, environ, start_response):
         status = '200 OK' # HTTP Status

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: added pypi server documentation
Message-ID: <E1OVLoU-0000h9-Ul@dinsdale.python.org>

tarek.ziade pushed 3c1b00037fb0 to distutils2:

http://hg.python.org/distutils2/rev/3c1b00037fb0
changeset:   274:3c1b00037fb0
user:        Konrad Delong <konryd at gmail.com>
date:        Mon May 17 01:55:02 2010 +0200
summary:     added pypi server documentation
files:       docs/source/index.rst, docs/source/test_framework.rst, src/distutils2/tests/pypi_server.py

diff --git a/docs/source/index.rst b/docs/source/index.rst
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -13,6 +13,7 @@
 
    metadata
    new_commands
+   test_framework
 
 Indices and tables
 ==================
diff --git a/docs/source/test_framework.rst b/docs/source/test_framework.rst
new file mode 100644
--- /dev/null
+++ b/docs/source/test_framework.rst
@@ -0,0 +1,34 @@
+==============
+Test Framework
+==============
+
+When you are testing code that works with distutils, you might find these tools
+useful.
+
+
+``PyPIServer``
+==============
+
+PyPIServer is a class that implements an HTTP server running in a separate
+thread. All it does is record the requests for further inspection. The recorded
+data is available under ``requests`` attribute. The default
+HTTP response can be overriden with the ``default_response_status``,
+``default_response_headers`` and ``default_response_data`` attributes.
+
+
+``PyPIServerTestCase``
+======================
+
+``PyPIServerTestCase`` is a test case class with setUp and tearDown methods that
+take care of a single PyPIServer instance attached as a ``pypi`` attribute on
+the test class. Use it as one of the base classes in you test case::
+
+  class UploadTestCase(PyPIServerTestCase):
+      def test_something(self):
+          cmd = self.prepare_command()
+          cmd.ensure_finalized()
+          cmd.repository = self.pypi.full_address
+          cmd.run()
+
+          environ, request_data = self.pypi.requests[-1]
+          self.assertEqual(request_data, EXPECTED_REQUEST_DATA)
diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
--- a/src/distutils2/tests/pypi_server.py
+++ b/src/distutils2/tests/pypi_server.py
@@ -21,9 +21,9 @@
         self.address = self.httpd.server_address
         self.request_queue = Queue.Queue()
         self._requests = []
-        self._default_response_status = "200 OK"
-        self._default_response_headers = [('Content-type', 'text/plain')]
-        self._default_response_data = ["hello"]
+        self.default_response_status = "200 OK"
+        self.default_response_headers = [('Content-type', 'text/plain')]
+        self.default_response_data = ["hello"]
 
     def run(self):
         self.httpd.serve_forever()
@@ -45,9 +45,9 @@
         return data
 
     def get_next_response(self):
-        return (self._default_response_status,
-                self._default_response_headers,
-                self._default_response_data)
+        return (self.default_response_status,
+                self.default_response_headers,
+                self.default_response_data)
 
     @property
     def requests(self):

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: added encode_multipart
Message-ID: <E1OVLoU-0000gx-TN@dinsdale.python.org>

tarek.ziade pushed bffc38f3b3ad to distutils2:

http://hg.python.org/distutils2/rev/bffc38f3b3ad
changeset:   271:bffc38f3b3ad
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 23:20:53 2010 +0200
summary:     added encode_multipart
files:       src/distutils2/command/upload_docs.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
--- a/src/distutils2/command/upload_docs.py
+++ b/src/distutils2/command/upload_docs.py
@@ -14,6 +14,38 @@
             zip_file.write(full, dest)
     zip_file.close()
 
+# grabbed from
+#    http://code.activestate.com/recipes/146306-http-client-to-post-using-multipartform-data/
+def encode_multipart(fields, files, boundary=None):
+    """
+    fields is a sequence of (name, value) elements for regular form fields.
+    files is a sequence of (name, filename, content_type, value)
+                            elements for data to be uploaded as files
+    Return (content_type, body) ready for httplib.HTTP instance
+    """
+    if boundary is None:
+        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+    CRLF = '\r\n'
+    l = []
+    for (key, value) in fields:
+        l.extend([
+            '--' + boundary,
+            'Content-Disposition: form-data; name="%s"' % key,
+            '',
+            value])
+    for (key, filename, content_type, value) in files:
+        l.extend([
+            '--' + boundary,
+            'Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename),
+            'Content-Type: %s' % content_type,
+            '',
+            value])
+    l.append('--' + boundary + '--')
+    l.append('')
+    body = CRLF.join(l)
+    content_type = 'multipart/form-data; boundary=%s' % boundary
+    return content_type, body
+
 class upload_docs(Command):
 
     user_options = [
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
--- a/src/distutils2/tests/test_upload_docs.py
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -2,7 +2,8 @@
 # -*- encoding: utf8 -*-
 import os, os.path, tempfile, unittest2, zipfile
 
-from distutils2.command.upload_docs import upload_docs, zip_dir_into
+from distutils2.command.upload_docs import (upload_docs, zip_dir_into,
+                                    encode_multipart)
 from distutils2.core import Distribution
 
 from distutils2.tests import support
@@ -11,6 +12,29 @@
 from distutils2.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
 
+EXPECTED_MULTIPART_OUTPUT = "\r\n".join([
+'---x',
+'Content-Disposition: form-data; name="a"',
+'',
+'b',
+'---x',
+'Content-Disposition: form-data; name="c"',
+'',
+'d',
+'---x',
+'Content-Disposition: form-data; name="e"; filename="f"',
+'Content-Type: g',
+'',
+'h',
+'---x',
+'Content-Disposition: form-data; name="i"; filename="j"',
+'Content-Type: k',
+'',
+'l',
+'---x--',
+'',
+])
+
 class UploadDocsTestCase(PyPIServerTestCase,
                          support.TempdirManager,
                          unittest2.TestCase):
@@ -38,8 +62,11 @@
         zip_f = zipfile.ZipFile(destination)
         self.assertEqual(zip_f.namelist(), ['some_dir/some_file'])
 
-    def test_zip_dir(self):
-        pass
+    def test_encode_multipart(self):
+        fields = [("a", "b"), ("c", "d")]
+        files = [("e", "f", "g", "h"), ("i", "j", "k", "l")]
+        self.assertEqual(encode_multipart(fields, files, "-x")[0], "multipart/form-data; boundary=-x")
+        self.assertEqual(encode_multipart(fields, files, "-x")[1], EXPECTED_MULTIPART_OUTPUT)
 
     def test_upload(self):
         pass

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: removed overengineered constant :)
Message-ID: <E1OVLoV-0000hM-03@dinsdale.python.org>

tarek.ziade pushed b2983b08480f to distutils2:

http://hg.python.org/distutils2/rev/b2983b08480f
changeset:   277:b2983b08480f
user:        Konrad Delong <konryd at gmail.com>
date:        Tue Jun 01 15:31:37 2010 +0200
summary:     removed overengineered constant :)
files:       src/distutils2/command/upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
--- a/src/distutils2/command/upload_docs.py
+++ b/src/distutils2/command/upload_docs.py
@@ -28,7 +28,6 @@
     """
     if boundary is None:
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-    CRLF = '\r\n'
     l = []
     for (key, value) in fields:
         l.extend([
@@ -44,7 +43,7 @@
             value])
     l.append('--' + boundary + '--')
     l.append('')
-    body = CRLF.join(l)
+    body =  '\r\n'.join(l)
     content_type = 'multipart/form-data; boundary=%s' % boundary
     return content_type, body
 

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: added verification to finalize_options
Message-ID: <E1OVLoU-0000hI-Vq@dinsdale.python.org>

tarek.ziade pushed 4d2e03cda556 to distutils2:

http://hg.python.org/distutils2/rev/4d2e03cda556
changeset:   276:4d2e03cda556
user:        Konrad Delong <konryd at gmail.com>
date:        Tue Jun 01 15:28:49 2010 +0200
summary:     added verification to finalize_options
files:       src/distutils2/command/upload_docs.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
--- a/src/distutils2/command/upload_docs.py
+++ b/src/distutils2/command/upload_docs.py
@@ -1,6 +1,7 @@
 import base64, httplib, os.path, socket, tempfile, urlparse, zipfile
 from cStringIO import StringIO
 from distutils2 import log
+from distutils2.command.upload import upload
 from distutils2.core import PyPIRCCommand
 from distutils2.errors import DistutilsFileError
 
@@ -50,17 +51,24 @@
 class upload_docs(PyPIRCCommand):
 
     user_options = [
+        #('repository=', 'r',
+         #"url of repository [default: %s]" % upload.DEFAULT_REPOSITORY),
+        #('show-response', None,
+         #'display full response text from server'),
         ('upload-dir=', None, 'directory to upload'),
         ]
 
     def initialize_options(self):
-        self.upload_dir = None
+        PyPIRCCommand.initialize_options(self)
+        self.upload_dir = "build/docs"
 
     def finalize_options(self):
         PyPIRCCommand.finalize_options(self)
         if self.upload_dir == None:
             build = self.get_finalized_command('build')
             self.upload_dir = os.path.join(build.build_base, "docs")
+        self.announce('Using upload directory %s' % self.upload_dir)
+        self.verify_upload_dir(self.upload_dir)
         config = self._read_pypirc()
         if config != {}:
             self.username = config['username']
@@ -69,16 +77,15 @@
             self.realm = config['realm']
 
     def verify_upload_dir(self, upload_dir):
+        self.ensure_dirname('upload_dir')
         index_location = os.path.join(upload_dir, "index.html")
         if not os.path.exists(index_location):
             mesg = "No 'index.html found in docs directory (%s)"
             raise DistutilsFileError(mesg % upload_dir)
 
-
     def run(self):
         tmp_dir = tempfile.mkdtemp()
         name = self.distribution.metadata['Name']
-        self.verify_upload_dir(self.upload_dir)
         zip_file = zip_dir(self.upload_dir)
 
         fields = {':action': 'doc_upload', 'name': name}.items()
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
--- a/src/distutils2/tests/test_upload_docs.py
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -1,6 +1,6 @@
 """Tests for distutils.command.upload_docs."""
 # -*- encoding: utf8 -*-
-import httplib, os, os.path, tempfile, unittest2, zipfile
+import httplib, os, os.path, shutil, tempfile, unittest2, zipfile
 from cStringIO import StringIO
 
 from distutils2.command import upload_docs as upload_docs_mod
@@ -8,7 +8,7 @@
                                     encode_multipart)
 from distutils2.core import Distribution
 
-from distutils2.errors import DistutilsFileError
+from distutils2.errors import DistutilsFileError, DistutilsOptionError
 
 from distutils2.tests import support
 from distutils2.tests.pypi_server import PyPIServer, PyPIServerTestCase
@@ -54,15 +54,23 @@
         self.dist.metadata['Name'] = "distr-name"
         self.cmd = upload_docs(self.dist)
 
-    def test_generates_uploaddir_if_not_given(self):
-        self.assertEqual(self.cmd.upload_dir, None)
-        self.cmd.ensure_finalized()
-        self.assertEqual(self.cmd.upload_dir, os.path.join("build", "docs"))
+    def test_default_uploaddir(self):
+        sandbox = tempfile.mkdtemp()
+        previous = os.getcwd()
+        os.chdir(sandbox)
+        try:
+            os.mkdir("build")
+            self.prepare_sample_dir("build")
+            self.cmd.ensure_finalized()
+            self.assertEqual(self.cmd.upload_dir, os.path.join("build", "docs"))
+        finally:
+            os.chdir(previous)
 
-    def prepare_sample_dir(self):
-        sample_dir = tempfile.mkdtemp()
-        os.mkdir(os.path.join(sample_dir, "some_dir"))
-        self.write_file(os.path.join(sample_dir, "some_dir", "index.html"), "Ce mortel ennui")
+    def prepare_sample_dir(self, sample_dir=None):
+        if sample_dir is None:
+            sample_dir = tempfile.mkdtemp()
+        os.mkdir(os.path.join(sample_dir, "docs"))
+        self.write_file(os.path.join(sample_dir, "docs", "index.html"), "Ce mortel ennui")
         self.write_file(os.path.join(sample_dir, "index.html"), "Oh la la")
         return sample_dir
 
@@ -71,7 +79,7 @@
         compressed = zip_dir(source_dir)
 
         zip_f = zipfile.ZipFile(compressed)
-        self.assertEqual(zip_f.namelist(), ['index.html', 'some_dir/index.html'])
+        self.assertEqual(zip_f.namelist(), ['index.html', 'docs/index.html'])
 
     def test_encode_multipart(self):
         fields = [("a", "b"), ("c", "d")]
@@ -81,9 +89,9 @@
         self.assertEqual(body, EXPECTED_MULTIPART_OUTPUT)
 
     def prepare_command(self):
+        self.cmd.upload_dir = self.prepare_sample_dir()
         self.cmd.ensure_finalized()
         self.cmd.repository = self.pypi.full_address
-        self.cmd.upload_dir = self.prepare_sample_dir()
         self.cmd.username = "username"
         self.cmd.password = "password"
 
@@ -109,7 +117,7 @@
         # check their contents
         self.assertIn("doc_upload", action)
         self.assertIn("distr-name", name)
-        self.assertIn("some_dir/index.html", content)
+        self.assertIn("docs/index.html", content)
         self.assertIn("Ce mortel ennui", content)
 
     def test_https_connection(self):
@@ -151,14 +159,20 @@
     def test_reads_pypirc_data(self):
         self.write_file(self.rc, PYPIRC % self.pypi.full_address)
         self.cmd.repository = self.pypi.full_address
+        self.cmd.upload_dir = self.prepare_sample_dir()
         self.cmd.ensure_finalized()
         self.assertEqual(self.cmd.username, "real_slim_shady")
         self.assertEqual(self.cmd.password, "long_island")
 
     def test_checks_index_html_presence(self):
-        self.prepare_command()
+        self.cmd.upload_dir = self.prepare_sample_dir()
         os.remove(os.path.join(self.cmd.upload_dir, "index.html"))
-        self.assertRaises(DistutilsFileError, self.cmd.run)
+        self.assertRaises(DistutilsFileError, self.cmd.ensure_finalized)
+
+    def test_checks_upload_dir(self):
+        self.cmd.upload_dir = self.prepare_sample_dir()
+        shutil.rmtree(os.path.join(self.cmd.upload_dir))
+        self.assertRaises(DistutilsOptionError, self.cmd.ensure_finalized)
 
 def test_suite():
     return unittest2.makeSuite(UploadDocsTestCase)

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:38 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:38 +0200
Subject: [Python-checkins] distutils2: other schemas support and informing
	about errors
Message-ID: <E1OVLoU-0000hE-VH@dinsdale.python.org>

tarek.ziade pushed 944a00b90bde to distutils2:

http://hg.python.org/distutils2/rev/944a00b90bde
changeset:   275:944a00b90bde
user:        Konrad Delong <konryd at gmail.com>
date:        Mon May 17 16:58:40 2010 +0200
summary:     other schemas support and informing about errors
files:       src/distutils2/command/upload_docs.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
--- a/src/distutils2/command/upload_docs.py
+++ b/src/distutils2/command/upload_docs.py
@@ -1,7 +1,8 @@
-import base64, httplib, os.path, tempfile, urlparse, zipfile
+import base64, httplib, os.path, socket, tempfile, urlparse, zipfile
 from cStringIO import StringIO
 from distutils2 import log
-from distutils2.core import Command
+from distutils2.core import PyPIRCCommand
+from distutils2.errors import DistutilsFileError
 
 def zip_dir(directory):
     """Compresses recursively contents of directory into a StringIO object"""
@@ -46,7 +47,7 @@
     content_type = 'multipart/form-data; boundary=%s' % boundary
     return content_type, body
 
-class upload_docs(Command):
+class upload_docs(PyPIRCCommand):
 
     user_options = [
         ('upload-dir=', None, 'directory to upload'),
@@ -56,13 +57,28 @@
         self.upload_dir = None
 
     def finalize_options(self):
+        PyPIRCCommand.finalize_options(self)
         if self.upload_dir == None:
             build = self.get_finalized_command('build')
             self.upload_dir = os.path.join(build.build_base, "docs")
+        config = self._read_pypirc()
+        if config != {}:
+            self.username = config['username']
+            self.password = config['password']
+            self.repository = config['repository']
+            self.realm = config['realm']
+
+    def verify_upload_dir(self, upload_dir):
+        index_location = os.path.join(upload_dir, "index.html")
+        if not os.path.exists(index_location):
+            mesg = "No 'index.html found in docs directory (%s)"
+            raise DistutilsFileError(mesg % upload_dir)
+
 
     def run(self):
         tmp_dir = tempfile.mkdtemp()
         name = self.distribution.metadata['Name']
+        self.verify_upload_dir(self.upload_dir)
         zip_file = zip_dir(self.upload_dir)
 
         fields = {':action': 'doc_upload', 'name': name}.items()
@@ -77,7 +93,12 @@
 
         schema, netloc, url, params, query, fragments = \
             urlparse.urlparse(self.repository)
-        conn = httplib.HTTPConnection(netloc)
+        if schema == "http":
+            conn = httplib.HTTPConnection(netloc)
+        elif schema == "https":
+            conn = httplib.HTTPSConnection(netloc)
+        else:
+            raise AssertionError("unsupported schema "+schema)
 
         try:
             conn.connect()
@@ -92,3 +113,16 @@
             return
 
         r = conn.getresponse()
+
+        if r.status == 200:
+            self.announce('Server response (%s): %s' % (r.status, r.reason),
+                          log.INFO)
+        elif r.status == 301:
+            location = r.getheader('Location')
+            if location is None:
+                location = 'http://packages.python.org/%s/' % meta.get_name()
+            self.announce('Upload successful. Visit %s' % location,
+                          log.INFO)
+        else:
+            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
+                          log.ERROR)
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
--- a/src/distutils2/tests/test_upload_docs.py
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -1,15 +1,18 @@
 """Tests for distutils.command.upload_docs."""
 # -*- encoding: utf8 -*-
-import os, os.path, tempfile, unittest2, zipfile
+import httplib, os, os.path, tempfile, unittest2, zipfile
 from cStringIO import StringIO
 
+from distutils2.command import upload_docs as upload_docs_mod
 from distutils2.command.upload_docs import (upload_docs, zip_dir,
                                     encode_multipart)
 from distutils2.core import Distribution
 
+from distutils2.errors import DistutilsFileError
+
 from distutils2.tests import support
 from distutils2.tests.pypi_server import PyPIServer, PyPIServerTestCase
-from distutils2.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+from distutils2.tests.test_config import PyPIRCCommandTestCase
 
 
 EXPECTED_MULTIPART_OUTPUT = "\r\n".join([
@@ -33,9 +36,17 @@
 '',
 ])
 
-class UploadDocsTestCase(PyPIServerTestCase,
-                         support.TempdirManager,
-                         unittest2.TestCase):
+PYPIRC = """\
+[distutils]
+index-servers = server1
+
+[server1]
+repository = %s
+username = real_slim_shady
+password = long_island
+"""
+
+class UploadDocsTestCase(PyPIServerTestCase, PyPIRCCommandTestCase):
 
     def setUp(self):
         super(UploadDocsTestCase, self).setUp()
@@ -43,16 +54,16 @@
         self.dist.metadata['Name'] = "distr-name"
         self.cmd = upload_docs(self.dist)
 
-    def test_generates_uploaddir_name_not_given(self):
+    def test_generates_uploaddir_if_not_given(self):
+        self.assertEqual(self.cmd.upload_dir, None)
         self.cmd.ensure_finalized()
         self.assertEqual(self.cmd.upload_dir, os.path.join("build", "docs"))
 
     def prepare_sample_dir(self):
         sample_dir = tempfile.mkdtemp()
         os.mkdir(os.path.join(sample_dir, "some_dir"))
-        some_file = open(os.path.join(sample_dir, "some_dir", "some_file"), "w")
-        some_file.write("Ce mortel ennui")
-        some_file.close()
+        self.write_file(os.path.join(sample_dir, "some_dir", "index.html"), "Ce mortel ennui")
+        self.write_file(os.path.join(sample_dir, "index.html"), "Oh la la")
         return sample_dir
 
     def test_zip_dir(self):
@@ -60,7 +71,7 @@
         compressed = zip_dir(source_dir)
 
         zip_f = zipfile.ZipFile(compressed)
-        self.assertEqual(zip_f.namelist(), ['some_dir/some_file'])
+        self.assertEqual(zip_f.namelist(), ['index.html', 'some_dir/index.html'])
 
     def test_encode_multipart(self):
         fields = [("a", "b"), ("c", "d")]
@@ -69,12 +80,15 @@
         self.assertEqual(content_type, "multipart/form-data; boundary=-x")
         self.assertEqual(body, EXPECTED_MULTIPART_OUTPUT)
 
-    def test_upload(self):
+    def prepare_command(self):
         self.cmd.ensure_finalized()
         self.cmd.repository = self.pypi.full_address
         self.cmd.upload_dir = self.prepare_sample_dir()
         self.cmd.username = "username"
         self.cmd.password = "password"
+
+    def test_upload(self):
+        self.prepare_command()
         self.cmd.run()
 
         self.assertEqual(len(self.pypi.requests), 1)
@@ -95,20 +109,56 @@
         # check their contents
         self.assertIn("doc_upload", action)
         self.assertIn("distr-name", name)
-        self.assertIn("some_dir/some_file", content)
+        self.assertIn("some_dir/index.html", content)
         self.assertIn("Ce mortel ennui", content)
 
     def test_https_connection(self):
-        pass
+        https_called = False
+        orig_https = upload_docs_mod.httplib.HTTPSConnection
+        def https_conn_wrapper(*args):
+            https_called = True
+            return upload_docs_mod.httplib.HTTPConnection(*args) # the testing server is http
+        upload_docs_mod.httplib.HTTPSConnection = https_conn_wrapper
+        try:
+            self.prepare_command()
+            self.cmd.run()
+            self.assertFalse(https_called)
+
+            self.cmd.repository = self.cmd.repository.replace("http", "https")
+            self.cmd.run()
+            self.assertFalse(https_called)
+        finally:
+            upload_docs_mod.httplib.HTTPSConnection = orig_https
 
     def test_handling_response(self):
-        pass
+        calls = []
+        def aggr(*args):
+            calls.append(args)
+        self.pypi.default_response_status = '403 Forbidden'
+        self.prepare_command()
+        self.cmd.announce = aggr
+        self.cmd.run()
+        message, _ = calls[-1]
+        self.assertIn('Upload failed (403): Forbidden', message)
 
-    def test_honours_dry_run(self):
-        pass
+        calls = []
+        self.pypi.default_response_status = '301 Moved Permanently'
+        self.pypi.default_response_headers.append(("Location", "brand_new_location"))
+        self.cmd.run()
+        message, _ = calls[-1]
+        self.assertIn('brand_new_location', message)
 
     def test_reads_pypirc_data(self):
-        pass
+        self.write_file(self.rc, PYPIRC % self.pypi.full_address)
+        self.cmd.repository = self.pypi.full_address
+        self.cmd.ensure_finalized()
+        self.assertEqual(self.cmd.username, "real_slim_shady")
+        self.assertEqual(self.cmd.password, "long_island")
+
+    def test_checks_index_html_presence(self):
+        self.prepare_command()
+        os.remove(os.path.join(self.cmd.upload_dir, "index.html"))
+        self.assertRaises(DistutilsFileError, self.cmd.run)
 
 def test_suite():
     return unittest2.makeSuite(UploadDocsTestCase)

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:39 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:39 +0200
Subject: [Python-checkins] distutils2: typo fix in Metadata documentation
Message-ID: <E1OVLoV-0000hX-5Z@dinsdale.python.org>

tarek.ziade pushed 53f360a56b5a to distutils2:

http://hg.python.org/distutils2/rev/53f360a56b5a
changeset:   280:53f360a56b5a
parent:      160:30ad3af43b5f
user:        Alexis Metaireau <ametaireau at gmail.com>
date:        Mon May 24 10:00:10 2010 +0200
summary:     typo fix in Metadata documentation
files:       docs/source/metadata.rst

diff --git a/docs/source/metadata.rst b/docs/source/metadata.rst
--- a/docs/source/metadata.rst
+++ b/docs/source/metadata.rst
@@ -71,8 +71,8 @@
     >>> metadata.write('/to/my/PKG-INFO')
 
 The class will pick the best version for the metadata, depending on the values
-provided. If all the values provided exists in all versions, teh class will
-used :attr:`metadata.PKG_INFO_PREFERRED_VERSION`. It is set by default to 1.0.
+provided. If all the values provided exists in all versions, the class will
+use :attr:`metadata.PKG_INFO_PREFERRED_VERSION`. It is set by default to 1.0.
 
 
 Conflict checking and best version

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:39 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:39 +0200
Subject: [Python-checkins] distutils2: Add build path to hgignore
Message-ID: <E1OVLoV-0000hb-64@dinsdale.python.org>

tarek.ziade pushed fdac92d97dcc to distutils2:

http://hg.python.org/distutils2/rev/fdac92d97dcc
changeset:   281:fdac92d97dcc
user:        Alexis Metaireau <ametaireau at gmail.com>
date:        Thu May 27 12:28:09 2010 +0200
summary:     Add build path to hgignore
files:       .hgignore

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -2,4 +2,5 @@
 .*\.pyo$
 ^docs/build
 .*\.swp$
+src/build/*
 

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:39 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:39 +0200
Subject: [Python-checkins] distutils2: fixing typos while reading
Message-ID: <E1OVLoV-0000hg-6j@dinsdale.python.org>

tarek.ziade pushed e34cd12c1cef to distutils2:

http://hg.python.org/distutils2/rev/e34cd12c1cef
changeset:   282:e34cd12c1cef
user:        Alexis Metaireau <ametaireau at gmail.com>
date:        Thu May 27 12:29:02 2010 +0200
summary:     fixing typos while reading
files:       src/distutils2/cmd.py, src/distutils2/dist.py

diff --git a/src/distutils2/cmd.py b/src/distutils2/cmd.py
--- a/src/distutils2/cmd.py
+++ b/src/distutils2/cmd.py
@@ -57,8 +57,7 @@
     def __init__(self, dist):
         """Create and initialize a new Command object.  Most importantly,
         invokes the 'initialize_options()' method, which is the real
-        initializer and depends on the actual command being
-        instantiated.
+        initializer and depends on the actual command being instantiated.
         """
         # late import because of mutual dependence between these classes
         from distutils2.dist import Distribution
diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -144,8 +144,8 @@
         # information here (and enough command-line options) that it's
         # worth it.  Also delegate 'get_XXX()' methods to the 'metadata'
         # object in a sneaky and underhanded (but efficient!) way.
+        self.metadata = DistributionMetadata()
 
-        self.metadata = DistributionMetadata()
         #for basename in self.metadata._METHOD_BASENAMES:
         #    method_name = "get_" + basename
         #    setattr(self, method_name, getattr(self.metadata, method_name))

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:39 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:39 +0200
Subject: [Python-checkins] distutils2: Don't forget to commit the files
	related to PyPIServer	tests.
Message-ID: <E1OVLoV-0000hv-9X@dinsdale.python.org>

tarek.ziade pushed 119680b67694 to distutils2:

http://hg.python.org/distutils2/rev/119680b67694
changeset:   286:119680b67694
user:        Alexis Metaireau <ametaireau at gmail.com>
date:        Tue Jun 01 09:21:53 2010 +0200
summary:     Don't forget to commit the files related to PyPIServer tests.
files:       src/distutils2/tests/pypiserver/index.html

diff --git a/src/distutils2/tests/pypiserver/index.html b/src/distutils2/tests/pypiserver/index.html
new file mode 100644
--- /dev/null
+++ b/src/distutils2/tests/pypiserver/index.html
@@ -0,0 +1,1 @@
+Yeah

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:39 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:39 +0200
Subject: [Python-checkins] distutils2: Update .hgignore
Message-ID: <E1OVLoV-0000hz-A3@dinsdale.python.org>

tarek.ziade pushed 6577b806d932 to distutils2:

http://hg.python.org/distutils2/rev/6577b806d932
changeset:   287:6577b806d932
user:        Alexis Metaireau <ametaireau at gmail.com>
date:        Tue Jun 01 09:26:22 2010 +0200
summary:     Update .hgignore
files:       .hgignore

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -3,4 +3,5 @@
 ^docs/build
 .*\.swp$
 src/build/*
+.*\.pida-metadata
 

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:39 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:39 +0200
Subject: [Python-checkins] distutils2: create pypi submodule and import
	package_index.py from	distribute to it
Message-ID: <E1OVLoV-0000hj-7i@dinsdale.python.org>

tarek.ziade pushed d6099bdc57cd to distutils2:

http://hg.python.org/distutils2/rev/d6099bdc57cd
changeset:   283:d6099bdc57cd
user:        Alexis Metaireau <ametaireau at gmail.com>
date:        Thu May 27 12:30:12 2010 +0200
summary:     create pypi submodule and import package_index.py from distribute to it
files:       src/distutils2/pypi/__init__.py, src/distutils2/pypi/package_index.py

diff --git a/src/distutils2/pypi/__init__.py b/src/distutils2/pypi/__init__.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/pypi/__init__.py
@@ -0,0 +1,7 @@
+"""distutils2.pypi
+
+Package containing ways to interact with the PyPI APIs.
+""" 
+
+__all__ = ['package_index',
+}
diff --git a/src/distutils2/pypi/package_index.py b/src/distutils2/pypi/package_index.py
new file mode 100644
--- /dev/null
+++ b/src/distutils2/pypi/package_index.py
@@ -0,0 +1,823 @@
+"""PyPI and direct package downloading"""
+import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO
+import httplib
+from pkg_resources import *
+from distutils import log
+from distutils.errors import DistutilsError
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
+from fnmatch import translate
+
+EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')
+HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
+# this is here to fix emacs' cruddy broken syntax highlighting
+PYPI_MD5 = re.compile(
+    '<a href="([^"#]+)">([^<]+)</a>\n\s+\\(<a (?:title="MD5 hash"\n\s+)'
+    'href="[^?]+\?:action=show_md5&amp;digest=([0-9a-f]{32})">md5</a>\\)'
+)
+URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):',re.I).match
+EXTENSIONS = ".tar.gz .tar.bz2 .tar .zip .tgz".split()
+
+__all__ = [
+    'PackageIndex', 'distros_for_url', 'parse_bdist_wininst',
+    'interpret_distro_name',
+]
+
+_SOCKET_TIMEOUT = 15
+
+def parse_bdist_wininst(name):
+    """Return (base,pyversion) or (None,None) for possible .exe name"""
+
+    lower = name.lower()
+    base, py_ver = None, None
+
+    if lower.endswith('.exe'):
+        if lower.endswith('.win32.exe'):
+            base = name[:-10]
+        elif lower.startswith('.win32-py',-16):
+            py_ver = name[-7:-4]
+            base = name[:-16]
+
+    return base,py_ver
+
+def egg_info_for_url(url):
+    scheme, server, path, parameters, query, fragment = urlparse.urlparse(url)
+    base = urllib2.unquote(path.split('/')[-1])
+    if '#' in base: base, fragment = base.split('#',1)
+    return base,fragment
+
+def distros_for_url(url, metadata=None):
+    """Yield egg or source distribution objects that might be found at a URL"""
+    base, fragment = egg_info_for_url(url)
+    for dist in distros_for_location(url, base, metadata): yield dist
+    if fragment:
+        match = EGG_FRAGMENT.match(fragment)
+        if match:
+            for dist in interpret_distro_name(
+                url, match.group(1), metadata, precedence = CHECKOUT_DIST
+            ):
+                yield dist
+
+def distros_for_location(location, basename, metadata=None):
+    """Yield egg or source distribution objects based on basename"""
+    if basename.endswith('.egg.zip'):
+        basename = basename[:-4]    # strip the .zip
+    if basename.endswith('.egg') and '-' in basename:
+        # only one, unambiguous interpretation
+        return [Distribution.from_location(location, basename, metadata)]
+
+    if basename.endswith('.exe'):
+        win_base, py_ver = parse_bdist_wininst(basename)
+        if win_base is not None:
+            return interpret_distro_name(
+                location, win_base, metadata, py_ver, BINARY_DIST, "win32"
+            )
+
+    # Try source distro extensions (.zip, .tgz, etc.)
+    #
+    for ext in EXTENSIONS:
+        if basename.endswith(ext):
+            basename = basename[:-len(ext)]
+            return interpret_distro_name(location, basename, metadata)
+    return []  # no extension matched
+
+def distros_for_filename(filename, metadata=None):
+    """Yield possible egg or source distribution objects based on a filename"""
+    return distros_for_location(
+        normalize_path(filename), os.path.basename(filename), metadata
+    )
+
+
+def interpret_distro_name(location, basename, metadata,
+    py_version=None, precedence=SOURCE_DIST, platform=None
+):
+    """Generate alternative interpretations of a source distro name
+
+    Note: if `location` is a filesystem filename, you should call
+    ``pkg_resources.normalize_path()`` on it before passing it to this
+    routine!
+    """
+    # Generate alternative interpretations of a source distro name
+    # Because some packages are ambiguous as to name/versions split
+    # e.g. "adns-python-1.1.0", "egenix-mx-commercial", etc.
+    # So, we generate each possible interepretation (e.g. "adns, python-1.1.0"
+    # "adns-python, 1.1.0", and "adns-python-1.1.0, no version").  In practice,
+    # the spurious interpretations should be ignored, because in the event
+    # there's also an "adns" package, the spurious "python-1.1.0" version will
+    # compare lower than any numeric version number, and is therefore unlikely
+    # to match a request for it.  It's still a potential problem, though, and
+    # in the long run PyPI and the distutils should go for "safe" names and
+    # versions in distribution archive names (sdist and bdist).
+
+    parts = basename.split('-')
+    if not py_version:
+        for i,p in enumerate(parts[2:]):
+            if len(p)==5 and p.startswith('py2.'):
+                return # It's a bdist_dumb, not an sdist -- bail out
+
+    for p in range(1,len(parts)+1):
+        yield Distribution(
+            location, metadata, '-'.join(parts[:p]), '-'.join(parts[p:]),
+            py_version=py_version, precedence = precedence,
+            platform = platform
+        )
+
+REL = re.compile("""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
+# this line is here to fix emacs' cruddy broken syntax highlighting
+
+def find_external_links(url, page):
+    """Find rel="homepage" and rel="download" links in `page`, yielding URLs"""
+
+    for match in REL.finditer(page):
+        tag, rel = match.groups()
+        rels = map(str.strip, rel.lower().split(','))
+        if 'homepage' in rels or 'download' in rels:
+            for match in HREF.finditer(tag):
+                yield urlparse.urljoin(url, htmldecode(match.group(1)))
+
+    for tag in ("<th>Home Page", "<th>Download URL"):
+        pos = page.find(tag)
+        if pos!=-1:
+            match = HREF.search(page,pos)
+            if match:
+                yield urlparse.urljoin(url, htmldecode(match.group(1)))
+
+user_agent = "Python-urllib/%s distribute/%s" % (
+    sys.version[:3], require('distribute')[0].version
+)
+
+
+class PackageIndex(Environment):
+    """A distribution index that scans web pages for download URLs"""
+
+    def __init__(self, index_url="http://pypi.python.org/simple", hosts=('*',),
+        *args, **kw
+    ):
+        Environment.__init__(self,*args,**kw)
+        self.index_url = index_url + "/"[:not index_url.endswith('/')]
+        self.scanned_urls = {}
+        self.fetched_urls = {}
+        self.package_pages = {}
+        self.allows = re.compile('|'.join(map(translate,hosts))).match
+        self.to_scan = []
+
+
+
+    def process_url(self, url, retrieve=False):
+        """Evaluate a URL as a possible download, and maybe retrieve it"""
+        if url in self.scanned_urls and not retrieve:
+            return
+        self.scanned_urls[url] = True
+        if not URL_SCHEME(url):
+            self.process_filename(url)
+            return
+        else:
+            dists = list(distros_for_url(url))
+            if dists:
+                if not self.url_ok(url):
+                    return
+                self.debug("Found link: %s", url)
+
+        if dists or not retrieve or url in self.fetched_urls:
+            map(self.add, dists)
+            return  # don't need the actual page
+
+        if not self.url_ok(url):
+            self.fetched_urls[url] = True
+            return
+
+        self.info("Reading %s", url)
+        f = self.open_url(url, "Download error: %s -- Some packages may not be found!")
+        if f is None: return
+        self.fetched_urls[url] = self.fetched_urls[f.url] = True
+
+        if 'html' not in f.headers.get('content-type', '').lower():
+            f.close()   # not html, we can't process it
+            return
+
+        base = f.url     # handle redirects
+        page = f.read()
+        if sys.version_info >= (3,):
+            charset = f.headers.get_param('charset') or 'latin-1'
+            page = page.decode(charset, "ignore")
+        f.close()
+        for match in HREF.finditer(page):
+            link = urlparse.urljoin(base, htmldecode(match.group(1)))
+            self.process_url(link)
+        if url.startswith(self.index_url) and getattr(f,'code',None)!=404:
+            page = self.process_index(url, page)
+
+    def process_filename(self, fn, nested=False):
+        # process filenames or directories
+        if not os.path.exists(fn):
+            self.warn("Not found: %s", fn)
+            return
+
+        if os.path.isdir(fn) and not nested:
+            path = os.path.realpath(fn)
+            for item in os.listdir(path):
+                self.process_filename(os.path.join(path,item), True)
+
+        dists = distros_for_filename(fn)
+        if dists:
+            self.debug("Found: %s", fn)
+            map(self.add, dists)
+
+    def url_ok(self, url, fatal=False):
+        s = URL_SCHEME(url)
+        if (s and s.group(1).lower()=='file') or self.allows(urlparse.urlparse(url)[1]):
+            return True
+        msg = "\nLink to % s ***BLOCKED*** by --allow-hosts\n"
+        if fatal:
+            raise DistutilsError(msg % url)
+        else:
+            self.warn(msg, url)
+
+    def scan_egg_links(self, search_path):
+        for item in search_path:
+            if os.path.isdir(item):
+                for entry in os.listdir(item):
+                    if entry.endswith('.egg-link'):
+                        self.scan_egg_link(item, entry)
+
+    def scan_egg_link(self, path, entry):
+        lines = filter(None, map(str.strip, open(os.path.join(path, entry))))
+        if len(lines)==2:
+            for dist in find_distributions(os.path.join(path, lines[0])):
+                dist.location = os.path.join(path, *lines)
+                dist.precedence = SOURCE_DIST
+                self.add(dist)
+
+    def process_index(self,url,page):
+        """Process the contents of a PyPI page"""
+        def scan(link):
+            # Process a URL to see if it's for a package page
+            if link.startswith(self.index_url):
+                parts = map(
+                    urllib2.unquote, link[len(self.index_url):].split('/')
+                )
+                if len(parts)==2 and '#' not in parts[1]:
+                    # it's a package page, sanitize and index it
+                    pkg = safe_name(parts[0])
+                    ver = safe_version(parts[1])
+                    self.package_pages.setdefault(pkg.lower(),{})[link] = True
+                    return to_filename(pkg), to_filename(ver)
+            return None, None
+
+        # process an index page into the package-page index
+        for match in HREF.finditer(page):
+            try:
+                scan( urlparse.urljoin(url, htmldecode(match.group(1))) )
+            except ValueError:
+                pass
+
+        pkg, ver = scan(url)   # ensure this page is in the page index
+        if pkg:
+            # process individual package page
+            for new_url in find_external_links(url, page):
+                # Process the found URL
+                base, frag = egg_info_for_url(new_url)
+                if base.endswith('.py') and not frag:
+                    if ver:
+                        new_url+='#egg=%s-%s' % (pkg,ver)
+                    else:
+                        self.need_version_info(url)
+                self.scan_url(new_url)
+
+            return PYPI_MD5.sub(
+                lambda m: '<a href="%s#md5=%s">%s</a>' % m.group(1,3,2), page
+            )
+        else:
+            return ""   # no sense double-scanning non-package pages
+
+
+
+    def need_version_info(self, url):
+        self.scan_all(
+            "Page at %s links to .py file(s) without version info; an index "
+            "scan is required.", url
+        )
+
+    def scan_all(self, msg=None, *args):
+        if self.index_url not in self.fetched_urls:
+            if msg: self.warn(msg,*args)
+            self.info(
+                "Scanning index of all packages (this may take a while)"
+            )
+        self.scan_url(self.index_url)
+
+    def find_packages(self, requirement):
+        self.scan_url(self.index_url + requirement.unsafe_name+'/')
+
+        if not self.package_pages.get(requirement.key):
+            # Fall back to safe version of the name
+            self.scan_url(self.index_url + requirement.project_name+'/')
+
+        if not self.package_pages.get(requirement.key):
+            # We couldn't find the target package, so search the index page too
+            self.not_found_in_index(requirement)
+
+        for url in list(self.package_pages.get(requirement.key,())):
+            # scan each page that might be related to the desired package
+            self.scan_url(url)
+
+    def obtain(self, requirement, installer=None):
+        self.prescan(); self.find_packages(requirement)
+        for dist in self[requirement.key]:
+            if dist in requirement:
+                return dist
+            self.debug("%s does not match %s", requirement, dist)
+        return super(PackageIndex, self).obtain(requirement,installer)
+
+
+
+
+
+    def check_md5(self, cs, info, filename, tfp):
+        if re.match('md5=[0-9a-f]{32}$', info):
+            self.debug("Validating md5 checksum for %s", filename)
+            if cs.hexdigest()<>info[4:]:
+                tfp.close()
+                os.unlink(filename)
+                raise DistutilsError(
+                    "MD5 validation failed for "+os.path.basename(filename)+
+                    "; possible download problem?"
+                )
+
+    def add_find_links(self, urls):
+        """Add `urls` to the list that will be prescanned for searches"""
+        for url in urls:
+            if (
+                self.to_scan is None        # if we have already "gone online"
+                or not URL_SCHEME(url)      # or it's a local file/directory
+                or url.startswith('file:')
+                or list(distros_for_url(url))   # or a direct package link
+            ):
+                # then go ahead and process it now
+                self.scan_url(url)
+            else:
+                # otherwise, defer retrieval till later
+                self.to_scan.append(url)
+
+    def prescan(self):
+        """Scan urls scheduled for prescanning (e.g. --find-links)"""
+        if self.to_scan:
+            map(self.scan_url, self.to_scan)
+        self.to_scan = None     # from now on, go ahead and process immediately
+
+    def not_found_in_index(self, requirement):
+        if self[requirement.key]:   # we've seen at least one distro
+            meth, msg = self.info, "Couldn't retrieve index page for %r"
+        else:   # no distros seen for this name, might be misspelled
+            meth, msg = (self.warn,
+                "Couldn't find index page for %r (maybe misspelled?)")
+        meth(msg, requirement.unsafe_name)
+        self.scan_all()
+
+    def download(self, spec, tmpdir):
+        """Locate and/or download `spec` to `tmpdir`, returning a local path
+
+        `spec` may be a ``Requirement`` object, or a string containing a URL,
+        an existing local filename, or a project/version requirement spec
+        (i.e. the string form of a ``Requirement`` object).  If it is the URL
+        of a .py file with an unambiguous ``#egg=name-version`` tag (i.e., one
+        that escapes ``-`` as ``_`` throughout), a trivial ``setup.py`` is
+        automatically created alongside the downloaded file.
+
+        If `spec` is a ``Requirement`` object or a string containing a
+        project/version requirement spec, this method returns the location of
+        a matching distribution (possibly after downloading it to `tmpdir`).
+        If `spec` is a locally existing file or directory name, it is simply
+        returned unchanged.  If `spec` is a URL, it is downloaded to a subpath
+        of `tmpdir`, and the local filename is returned.  Various errors may be
+        raised if a problem occurs during downloading.
+        """
+        if not isinstance(spec,Requirement):
+            scheme = URL_SCHEME(spec)
+            if scheme:
+                # It's a url, download it to tmpdir
+                found = self._download_url(scheme.group(1), spec, tmpdir)
+                base, fragment = egg_info_for_url(spec)
+                if base.endswith('.py'):
+                    found = self.gen_setup(found,fragment,tmpdir)
+                return found
+            elif os.path.exists(spec):
+                # Existing file or directory, just return it
+                return spec
+            else:
+                try:
+                    spec = Requirement.parse(spec)
+                except ValueError:
+                    raise DistutilsError(
+                        "Not a URL, existing file, or requirement spec: %r" %
+                        (spec,)
+                    )
+        return getattr(self.fetch_distribution(spec, tmpdir),'location',None)
+
+
+    def fetch_distribution(self,
+        requirement, tmpdir, force_scan=False, source=False, develop_ok=False
+    ):
+        """Obtain a distribution suitable for fulfilling `requirement`
+
+        `requirement` must be a ``pkg_resources.Requirement`` instance.
+        If necessary, or if the `force_scan` flag is set, the requirement is
+        searched for in the (online) package index as well as the locally
+        installed packages.  If a distribution matching `requirement` is found,
+        the returned distribution's ``location`` is the value you would have
+        gotten from calling the ``download()`` method with the matching
+        distribution's URL or filename.  If no matching distribution is found,
+        ``None`` is returned.
+
+        If the `source` flag is set, only source distributions and source
+        checkout links will be considered.  Unless the `develop_ok` flag is
+        set, development and system eggs (i.e., those using the ``.egg-info``
+        format) will be ignored.
+        """
+
+        # process a Requirement
+        self.info("Searching for %s", requirement)
+        skipped = {}
+
+        def find(req):
+            # Find a matching distribution; may be called more than once
+
+            for dist in self[req.key]:
+
+                if dist.precedence==DEVELOP_DIST and not develop_ok:
+                    if dist not in skipped:
+                        self.warn("Skipping development or system egg: %s",dist)
+                        skipped[dist] = 1
+                    continue
+
+                if dist in req and (dist.precedence<=SOURCE_DIST or not source):
+                    self.info("Best match: %s", dist)
+                    return dist.clone(
+                        location=self.download(dist.location, tmpdir)
+                    )
+
+        if force_scan:
+            self.prescan()
+            self.find_packages(requirement)
+
+        dist = find(requirement)
+        if dist is None and self.to_scan is not None:
+            self.prescan()
+            dist = find(requirement)
+
+        if dist is None and not force_scan:
+            self.find_packages(requirement)
+            dist = find(requirement)
+
+        if dist is None:
+            self.warn(
+                "No local packages or download links found for %s%s",
+                (source and "a source distribution of " or ""),
+                requirement,
+            )
+        return dist
+
+    def fetch(self, requirement, tmpdir, force_scan=False, source=False):
+        """Obtain a file suitable for fulfilling `requirement`
+
+        DEPRECATED; use the ``fetch_distribution()`` method now instead.  For
+        backward compatibility, this routine is identical but returns the
+        ``location`` of the downloaded distribution instead of a distribution
+        object.
+        """
+        dist = self.fetch_distribution(requirement,tmpdir,force_scan,source)
+        if dist is not None:
+            return dist.location
+        return None
+
+
+
+
+
+
+
+
+    def gen_setup(self, filename, fragment, tmpdir):
+        match = EGG_FRAGMENT.match(fragment)
+        dists = match and [d for d in
+            interpret_distro_name(filename, match.group(1), None) if d.version
+        ] or []
+
+        if len(dists)==1:   # unambiguous ``#egg`` fragment
+            basename = os.path.basename(filename)
+
+            # Make sure the file has been downloaded to the temp dir.
+            if os.path.dirname(filename) != tmpdir:
+                dst = os.path.join(tmpdir, basename)
+                from setuptools.command.easy_install import samefile
+                if not samefile(filename, dst):
+                    shutil.copy2(filename, dst)
+                    filename=dst
+
+            file = open(os.path.join(tmpdir, 'setup.py'), 'w')
+            file.write(
+                "from setuptools import setup\n"
+                "setup(name=%r, version=%r, py_modules=[%r])\n"
+                % (
+                    dists[0].project_name, dists[0].version,
+                    os.path.splitext(basename)[0]
+                )
+            )
+            file.close()
+            return filename
+
+        elif match:
+            raise DistutilsError(
+                "Can't unambiguously interpret project/version identifier %r; "
+                "any dashes in the name or version should be escaped using "
+                "underscores. %r" % (fragment,dists)
+            )
+        else:
+            raise DistutilsError(
+                "Can't process plain .py files without an '#egg=name-version'"
+                " suffix to enable automatic setup script generation."
+            )
+
+    dl_blocksize = 8192
+    def _download_to(self, url, filename):
+        self.info("Downloading %s", url)
+        # Download the file
+        fp, tfp, info = None, None, None
+        try:
+            if '#' in url:
+                url, info = url.split('#', 1)
+            fp = self.open_url(url)
+            if isinstance(fp, urllib2.HTTPError):
+                raise DistutilsError(
+                    "Can't download %s: %s %s" % (url, fp.code,fp.msg)
+                )
+            cs = md5()
+            headers = fp.info()
+            blocknum = 0
+            bs = self.dl_blocksize
+            size = -1
+            if "content-length" in headers:
+                size = int(headers["Content-Length"])
+                self.reporthook(url, filename, blocknum, bs, size)
+            tfp = open(filename,'wb')
+            while True:
+                block = fp.read(bs)
+                if block:
+                    cs.update(block)
+                    tfp.write(block)
+                    blocknum += 1
+                    self.reporthook(url, filename, blocknum, bs, size)
+                else:
+                    break
+            if info: self.check_md5(cs, info, filename, tfp)
+            return headers
+        finally:
+            if fp: fp.close()
+            if tfp: tfp.close()
+
+    def reporthook(self, url, filename, blocknum, blksize, size):
+        pass    # no-op
+
+
+    def open_url(self, url, warning=None):
+        if url.startswith('file:'):
+            return local_open(url)
+        try:
+            return open_with_auth(url)
+        except (ValueError, httplib.InvalidURL), v:
+            msg = ' '.join([str(arg) for arg in v.args])
+            if warning:
+                self.warn(warning, msg)
+            else:
+                raise DistutilsError('%s %s' % (url, msg))
+        except urllib2.HTTPError, v:
+            return v
+        except urllib2.URLError, v:
+            if warning:
+                self.warn(warning, v.reason)
+            else:
+                raise DistutilsError("Download error for %s: %s"
+                                     % (url, v.reason))
+        except httplib.BadStatusLine, v:
+            if warning:
+                self.warn(warning, v.line)
+            else:
+                raise DistutilsError('%s returned a bad status line. '
+                                     'The server might be down, %s' % \
+                                             (url, v.line))
+        except httplib.HTTPException, v:
+            if warning:
+                self.warn(warning, v)
+            else:
+                raise DistutilsError("Download error for %s: %s"
+                                     % (url, v))
+
+    def _download_url(self, scheme, url, tmpdir):
+        # Determine download filename
+        #
+        name = filter(None,urlparse.urlparse(url)[2].split('/'))
+        if name:
+            name = name[-1]
+            while '..' in name:
+                name = name.replace('..','.').replace('\\','_')
+        else:
+            name = "__downloaded__"    # default if URL has no path contents
+
+        if name.endswith('.egg.zip'):
+            name = name[:-4]    # strip the extra .zip before download
+
+        filename = os.path.join(tmpdir,name)
+
+        # Download the file
+        #
+        if scheme=='svn' or scheme.startswith('svn+'):
+            return self._download_svn(url, filename)
+        elif scheme=='file':
+            return urllib2.url2pathname(urlparse.urlparse(url)[2])
+        else:
+            self.url_ok(url, True)   # raises error if not allowed
+            return self._attempt_download(url, filename)
+
+
+
+    def scan_url(self, url):
+        self.process_url(url, True)
+
+
+    def _attempt_download(self, url, filename):
+        headers = self._download_to(url, filename)
+        if 'html' in headers.get('content-type','').lower():
+            return self._download_html(url, headers, filename)
+        else:
+            return filename
+
+    def _download_html(self, url, headers, filename):
+        file = open(filename)
+        for line in file:
+            if line.strip():
+                # Check for a subversion index page
+                if re.search(r'<title>([^- ]+ - )?Revision \d+:', line):
+                    # it's a subversion index page:
+                    file.close()
+                    os.unlink(filename)
+                    return self._download_svn(url, filename)
+                break   # not an index page
+        file.close()
+        os.unlink(filename)
+        raise DistutilsError("Unexpected HTML page found at "+url)
+
+    def _download_svn(self, url, filename):
+        url = url.split('#',1)[0]   # remove any fragment for svn's sake
+        self.info("Doing subversion checkout from %s to %s", url, filename)
+        os.system("svn checkout -q %s %s" % (url, filename))
+        return filename
+
+    def debug(self, msg, *args):
+        log.debug(msg, *args)
+
+    def info(self, msg, *args):
+        log.info(msg, *args)
+
+    def warn(self, msg, *args):
+        log.warn(msg, *args)
+
+# This pattern matches a character entity reference (a decimal numeric
+# references, a hexadecimal numeric reference, or a named reference).
+entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub
+
+def uchr(c):
+    if not isinstance(c, int):
+        return c
+    if c>255: return unichr(c)
+    return chr(c)
+
+def decode_entity(match):
+    what = match.group(1)
+    if what.startswith('#x'):
+        what = int(what[2:], 16)
+    elif what.startswith('#'):
+        what = int(what[1:])
+    else:
+        from htmlentitydefs import name2codepoint
+        what = name2codepoint.get(what, match.group(0))
+    return uchr(what)
+
+def htmldecode(text):
+    """Decode HTML entities in the given text."""
+    return entity_sub(decode_entity, text)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+def socket_timeout(timeout=15):
+    def _socket_timeout(func):
+        def _socket_timeout(*args, **kwargs):
+            old_timeout = socket.getdefaulttimeout()
+            socket.setdefaulttimeout(timeout)
+            try:
+                return func(*args, **kwargs)
+            finally:
+                socket.setdefaulttimeout(old_timeout)
+        return _socket_timeout
+    return _socket_timeout
+
+
+def open_with_auth(url):
+    """Open a urllib2 request, handling HTTP authentication"""
+
+    scheme, netloc, path, params, query, frag = urlparse.urlparse(url)
+
+    if scheme in ('http', 'https'):
+        auth, host = urllib2.splituser(netloc)
+    else:
+        auth = None
+
+    if auth:
+        auth = "Basic " + urllib2.unquote(auth).encode('base64').strip()
+        new_url = urlparse.urlunparse((scheme,host,path,params,query,frag))
+        request = urllib2.Request(new_url)
+        request.add_header("Authorization", auth)
+    else:
+        request = urllib2.Request(url)
+
+    request.add_header('User-Agent', user_agent)
+    fp = urllib2.urlopen(request)
+
+    if auth:
+        # Put authentication info back into request URL if same host,
+        # so that links found on the page will work
+        s2, h2, path2, param2, query2, frag2 = urlparse.urlparse(fp.url)
+        if s2==scheme and h2==host:
+            fp.url = urlparse.urlunparse((s2,netloc,path2,param2,query2,frag2))
+
+    return fp
+
+# adding a timeout to avoid freezing package_index
+open_with_auth = socket_timeout(_SOCKET_TIMEOUT)(open_with_auth)
+
+
+
+
+
+
+
+
+
+
+
+def fix_sf_url(url):
+    return url      # backward compatibility
+
+def local_open(url):
+    """Read a local path, with special support for directories"""
+    scheme, server, path, param, query, frag = urlparse.urlparse(url)
+    filename = urllib2.url2pathname(path)
+    if os.path.isfile(filename):
+        return urllib2.urlopen(url)
+    elif path.endswith('/') and os.path.isdir(filename):
+        files = []
+        for f in os.listdir(filename):
+            if f=='index.html':
+                fp = open(os.path.join(filename,f),'rb')
+                body = fp.read()
+                fp.close()
+                break
+            elif os.path.isdir(os.path.join(filename,f)):
+                f+='/'
+            files.append("<a href=%r>%s</a>" % (f,f))
+        else:
+            body = ("<html><head><title>%s</title>" % url) + \
+                "</head><body>%s</body></html>" % '\n'.join(files)
+        status, message = 200, "OK"
+    else:
+        status, message, body = 404, "Path not found", "Not found"
+
+    return urllib2.HTTPError(url, status, message,
+            {'content-type':'text/html'}, cStringIO.StringIO(body))
+
+
+
+
+
+
+
+
+
+
+
+
+
+# this line is a kludge to keep the trailing blank lines for pje's editor

--
Repository URL: http://hg.python.org/distutils2

From python-checkins at python.org  Sun Jul  4 11:48:39 2010
From: python-checkins at python.org (tarek.ziade)
Date: Sun, 04 Jul 2010 11:48:39 +0200
Subject: [Python-checkins] distutils2: merge konryd works about pypi test
	server
Message-ID: <E1OVLoV-0000ho-8W@dinsdale.python.org>

tarek.ziade pushed c217e36b984a to distutils2:

http://hg.python.org/distutils2/rev/c217e36b984a
changeset:   284:c217e36b984a
parent:      283:d6099bdc57cd
parent:      275:944a00b90bde
user:        Alexis Metaireau <ametaireau at gmail.com>
date:        Fri May 28 11:24:53 2010 +0200
summary:     merge konryd works about pypi test server
files:       

diff --git a/docs/design/pep-0376.txt b/docs/design/pep-0376.txt
--- a/docs/design/pep-0376.txt
+++ b/docs/design/pep-0376.txt
@@ -633,7 +633,7 @@
 
 Distributions installed using existing, pre-standardization formats do not have
 the necessary metadata available for the new API, and thus will be
-ignored. Third-party tools may of course to continue to support previous
+ignored. Third-party tools may of course continue to support previous
 formats in addition to the new format, in order to ease the transition.
 
 
diff --git a/docs/design/wiki.rst b/docs/design/wiki.rst
--- a/docs/design/wiki.rst
+++ b/docs/design/wiki.rst
@@ -282,7 +282,7 @@
   mailman/etc/*               = {config}                # 8
   mailman/foo/**/bar/*.cfg    = {config}/baz            # 9
   mailman/foo/**/*.cfg        = {config}/hmm            # 9, 10
-  some-new-semantic.txt       = {funky-crazy-category}  # 11
+  some-new-semantic.sns       = {funky-crazy-category}  # 11
 
 The glob definitions are relative paths that match files from the top
 of the source tree (the location of ``setup.cfg``). Forward slashes
diff --git a/docs/source/index.rst b/docs/source/index.rst
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -12,6 +12,8 @@
    :maxdepth: 2
 
    metadata
+   new_commands
+   test_framework
 
 Indices and tables
 =======