Mailman 3 August 2007 - Python-checkins

r57747 - python/trunk/Tools/msi/msilib.py
by martin.v.loewis Aug. 30, 2007

Aug. 30, 2007

Author: martin.v.loewis Date: Thu Aug 30 20:14:01 2007 New Revision: 57747 Modified: python/trunk/Tools/msi/msilib.py Log: Fix popen usage. Modified: python/trunk/Tools/msi/msilib.py ============================================================================== --- python/trunk/Tools/msi/msilib.py (original) +++ python/trunk/Tools/msi/msilib.py Thu Aug 30 20:14:01 2007 @@ -390,8 +390,8 @@ cabarc = "cabarc.exe" cmd = r'"%s" -m lzx:21 n %s.cab @%s.txt' % (cabarc, self.name, self.name) p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, - stdout=subprocess.PIPE, stderr=subprocess.STDOUT)[0] - for line in (p.stdout, p.stdin): + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + for line in p.stdout: if line.startswith(" -- adding "): sys.stdout.write(".") else:

1 0

r57746 - in sandbox/trunk/2to3: pgen2/tokenize.py tests/test_parser.py
by collin.winter Aug. 30, 2007

Aug. 30, 2007

Author: collin.winter Date: Thu Aug 30 20:12:11 2007 New Revision: 57746 Modified: sandbox/trunk/2to3/ (props changed) sandbox/trunk/2to3/pgen2/tokenize.py sandbox/trunk/2to3/tests/test_parser.py Log: Fix another parser problem with bytes literals. Modified: sandbox/trunk/2to3/pgen2/tokenize.py ============================================================================== --- sandbox/trunk/2to3/pgen2/tokenize.py (original) +++ sandbox/trunk/2to3/pgen2/tokenize.py Thu Aug 30 20:12:11 2007 @@ -66,7 +66,7 @@ Single3 = r"[^'\\]*(?:(?:\\.|'(?!''))[^'\\]*)*'''" # Tail end of """ string. Double3 = r'[^"\\]*(?:(?:\\.|"(?!""))[^"\\]*)*"""' -Triple = group("[uU]?[rR]?'''", '[uU]?[rR]?"""') +Triple = group("[ubUB]?[rR]?'''", '[ubUB]?[rR]?"""') # Single-line ' or " string. String = group(r"[uU]?[rR]?'[^\n'\\]*(?:\\.[^\n'\\]*)*'", r'[uU]?[rR]?"[^\n"\\]*(?:\\.[^\n"\\]*)*"') @@ -120,8 +120,11 @@ for t in ("'''", '"""', "r'''", 'r"""', "R'''", 'R"""', "u'''", 'u"""', "U'''", 'U"""', + "b'''", 'b"""', "B'''", 'B"""', "ur'''", 'ur"""', "Ur'''", 'Ur"""', - "uR'''", 'uR"""', "UR'''", 'UR"""'): + "uR'''", 'uR"""', "UR'''", 'UR"""', + "br'''", 'br"""', "Br'''", 'Br"""', + "bR'''", 'bR"""', "BR'''", 'BR"""',): triple_quoted[t] = t single_quoted = {} for t in ("'", '"', Modified: sandbox/trunk/2to3/tests/test_parser.py ============================================================================== --- sandbox/trunk/2to3/tests/test_parser.py (original) +++ sandbox/trunk/2to3/tests/test_parser.py Thu Aug 30 20:12:11 2007 @@ -166,6 +166,15 @@ """ self.validate(s) + def test_multiline_bytes_tripquote_literals(self): + s = ''' + b""" + <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"> + """ + ''' + self.validate(s) + def test_multiline_str_literals(self): s = """ md5test("\xaa" * 80,

1 0

buildbot warnings in x86 XP trunk
by buildbot＠python.org Aug. 30, 2007

Aug. 30, 2007

The Buildbot has detected a new failure of x86 XP trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP%20trunk/builds/610 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: bill.janssen Build had warnings: warnings failed slave lost sincerely, -The Buildbot

1 0

r57743 - python/trunk/Misc/NEWS
by bill.janssen Aug. 30, 2007

Aug. 30, 2007

Author: bill.janssen Date: Thu Aug 30 20:08:06 2007 New Revision: 57743 Modified: python/trunk/Misc/NEWS Log: added note on new ssl module and deprecation of socket.ssl Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu Aug 30 20:08:06 2007 @@ -251,6 +251,8 @@ - Server-side SSL support and cert verification added, by Bill Janssen. +- socket.ssl deprecated; use new ssl module instead. + - uuid creation is now threadsafe. - EUC-KR codec now handles the cheot-ga-keut composed make-up hangul

1 0

r57741 - sandbox/trunk/emailpkg/5_0-exp
by barry.warsaw Aug. 30, 2007

Aug. 30, 2007

Author: barry.warsaw Date: Thu Aug 30 19:56:46 2007 New Revision: 57741 Removed: sandbox/trunk/emailpkg/5_0-exp/ Log: kill the experimental sandbox branch; use the py3k branch version instead

1 0

r57740 - in sandbox/trunk/2to3: pgen2/tokenize.py tests/test_parser.py
by collin.winter Aug. 30, 2007

Aug. 30, 2007

Author: collin.winter Date: Thu Aug 30 19:53:12 2007 New Revision: 57740 Modified: sandbox/trunk/2to3/ (props changed) sandbox/trunk/2to3/pgen2/tokenize.py sandbox/trunk/2to3/tests/test_parser.py Log: Fix a bug in pgen2.tokenize related to multi-line bytes literals. Modified: sandbox/trunk/2to3/pgen2/tokenize.py ============================================================================== --- sandbox/trunk/2to3/pgen2/tokenize.py (original) +++ sandbox/trunk/2to3/pgen2/tokenize.py Thu Aug 30 19:53:12 2007 @@ -127,8 +127,11 @@ for t in ("'", '"', "r'", 'r"', "R'", 'R"', "u'", 'u"', "U'", 'U"', + "b'", 'b"', "B'", 'B"', "ur'", 'ur"', "Ur'", 'Ur"', - "uR'", 'uR"', "UR'", 'UR"' ): + "uR'", 'uR"', "UR'", 'UR"', + "br'", 'br"', "Br'", 'Br"', + "bR'", 'bR"', "BR'", 'BR"', ): single_quoted[t] = t tabsize = 8 Modified: sandbox/trunk/2to3/tests/test_parser.py ============================================================================== --- sandbox/trunk/2to3/tests/test_parser.py (original) +++ sandbox/trunk/2to3/tests/test_parser.py Thu Aug 30 19:53:12 2007 @@ -155,6 +155,27 @@ self.fail("Idempotency failed: %s" % filepath) +class TestLiterals(GrammarTest): + + def test_multiline_bytes_literals(self): + s = """ + md5test(b"\xaa" * 80, + (b"Test Using Larger Than Block-Size Key " + b"and Larger Than One Block-Size Data"), + "6f630fad67cda0ee1fb1f562db3aa53e") + """ + self.validate(s) + + def test_multiline_str_literals(self): + s = """ + md5test("\xaa" * 80, + ("Test Using Larger Than Block-Size Key " + "and Larger Than One Block-Size Data"), + "6f630fad67cda0ee1fb1f562db3aa53e") + """ + self.validate(s) + + def diff(fn, tree): f = open("@", "w") try:

1 0

r57737 - tracker/instances/python-dev/detectors/nosyreaction.py
by erik.forsberg Aug. 30, 2007

Aug. 30, 2007

Author: erik.forsberg Date: Thu Aug 30 19:42:38 2007 New Revision: 57737 Modified: tracker/instances/python-dev/detectors/nosyreaction.py Log: Fixed problem with assignee not being added to nosy list automatically. Part of solution for http://psf.upfronthosting.co.za/roundup/meta/issue141 Modified: tracker/instances/python-dev/detectors/nosyreaction.py ============================================================================== --- tracker/instances/python-dev/detectors/nosyreaction.py (original) +++ tracker/instances/python-dev/detectors/nosyreaction.py Thu Aug 30 19:42:38 2007 @@ -44,7 +44,7 @@ return messages def updatenosy(db, cl, nodeid, newvalues): - '''Update the nosy list for changes to the assignedto + '''Update the nosy list for changes to the assignee ''' # nodeid will be None if this is a new node current_nosy = sets.Set() @@ -69,15 +69,15 @@ new_nosy = sets.Set(current_nosy) - # add assignedto(s) to the nosy list - if newvalues.has_key('assignedto') and newvalues['assignedto'] is not None: + # add assignee(s) to the nosy list + if newvalues.has_key('assignee') and newvalues['assignee'] is not None: propdef = cl.getprops() - if isinstance(propdef['assignedto'], hyperdb.Link): - assignedto_ids = [newvalues['assignedto']] - elif isinstance(propdef['assignedto'], hyperdb.Multilink): - assignedto_ids = newvalues['assignedto'] - for assignedto_id in assignedto_ids: - new_nosy.add(assignedto_id) + if isinstance(propdef['assignee'], hyperdb.Link): + assignee_ids = [newvalues['assignee']] + elif isinstance(propdef['assignee'], hyperdb.Multilink): + assignee_ids = newvalues['assignee'] + for assignee_id in assignee_ids: + new_nosy.add(assignee_id) # see if there's any new messages - if so, possibly add the author and # recipient to the nosy

1 0

buildbot warnings in amd64 XP trunk
by buildbot＠python.org Aug. 30, 2007

Aug. 30, 2007

The Buildbot has detected a new failure of amd64 XP trunk. Full details are available at: http://www.python.org/dev/buildbot/all/amd64%20XP%20trunk/builds/153 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: bill.janssen Build had warnings: warnings test Excerpt from the test logfile: 2 tests failed: test_ctypes test_winsound ====================================================================== ERROR: test_alias_asterisk (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\trunk.heller-windows-amd64\build\lib\test\test_winsound.py", line 64, in test_alias_asterisk winsound.PlaySound('SystemAsterisk', winsound.SND_ALIAS) RuntimeError: Failed to play sound ====================================================================== ERROR: test_alias_exclamation (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\trunk.heller-windows-amd64\build\lib\test\test_winsound.py", line 74, in test_alias_exclamation winsound.PlaySound('SystemExclamation', winsound.SND_ALIAS) RuntimeError: Failed to play sound ====================================================================== ERROR: test_alias_exit (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\trunk.heller-windows-amd64\build\lib\test\test_winsound.py", line 84, in test_alias_exit winsound.PlaySound('SystemExit', winsound.SND_ALIAS) RuntimeError: Failed to play sound ====================================================================== ERROR: test_alias_hand (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\trunk.heller-windows-amd64\build\lib\test\test_winsound.py", line 94, in test_alias_hand winsound.PlaySound('SystemHand', winsound.SND_ALIAS) RuntimeError: Failed to play sound ====================================================================== ERROR: test_alias_question (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\trunk.heller-windows-amd64\build\lib\test\test_winsound.py", line 104, in test_alias_question winsound.PlaySound('SystemQuestion', winsound.SND_ALIAS) RuntimeError: Failed to play sound sincerely, -The Buildbot

1 0

r57730 - python/trunk/Lib/ssl.py
by bill.janssen Aug. 30, 2007

Aug. 30, 2007

Author: bill.janssen Date: Thu Aug 30 19:07:28 2007 New Revision: 57730 Modified: python/trunk/Lib/ssl.py Log: Added docstrings to methods and functions. Modified: python/trunk/Lib/ssl.py ============================================================================== --- python/trunk/Lib/ssl.py (original) +++ python/trunk/Lib/ssl.py Thu Aug 30 19:07:28 2007 @@ -106,12 +106,26 @@ self.ca_certs = ca_certs def read(self, len=1024): + + """Read up to LEN bytes and return them. + Return zero-length string on EOF.""" + return self._sslobj.read(len) def write(self, data): + + """Write DATA to the underlying SSL channel. Returns + number of bytes of DATA actually transmitted.""" + return self._sslobj.write(data) def getpeercert(self): + + """Returns a formatted version of the data in the + certificate provided by the other end of the SSL channel. + Return None if no certificate was provided, {} if a + certificate was provided, but not validated.""" + return self._sslobj.peer_certificate() def send (self, data, flags=0): @@ -159,6 +173,10 @@ return socket.recv_from(self, addr, buflen, flags) def ssl_shutdown(self): + + """Shuts down the SSL channel over this socket (if active), + without closing the socket connection.""" + if self._sslobj: self._sslobj.shutdown() self._sslobj = None @@ -172,6 +190,10 @@ socket.close(self) def connect(self, addr): + + """Connects to remote ADDR, and then wraps the connection in + an SSL channel.""" + # Here we assume that the socket is client-side, and not # connected at the time of the call. We connect it, then wrap it. if self._sslobj: @@ -182,6 +204,11 @@ self.ca_certs) def accept(self): + + """Accepts a new connection from a remote client, and returns + a tuple containing that new connection wrapped with a server-side + SSL channel, and the address of the remote client.""" + newsock, addr = socket.accept(self) return (sslsocket(newsock, True, self.keyfile, self.certfile, self.cert_reqs, self.ssl_version, @@ -191,6 +218,11 @@ # some utility functions def cert_time_to_seconds(cert_time): + + """Takes a date-time string in standard ASN1_print form + ("MON DAY 24HOUR:MINUTE:SEC YEAR TIMEZONE") and return + a Python time value in seconds past the epoch.""" + import time return time.mktime(time.strptime(cert_time, "%b %d %H:%M:%S %Y GMT")) @@ -198,5 +230,9 @@ def sslwrap_simple (sock, keyfile=None, certfile=None): + """A replacement for the old socket.ssl function. Designed + for compability with Python 2.5 and earlier. Will disappear in + Python 3.0.""" + return _ssl.sslwrap(sock._sock, 0, keyfile, certfile, CERT_NONE, PROTOCOL_SSLv23, None)

1 0

buildbot warnings in x86 XP 3.0
by buildbot＠python.org Aug. 30, 2007

Aug. 30, 2007

The Buildbot has detected a new failure of x86 XP 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP%203.0/builds/50 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: martin.v.loewis Build had warnings: warnings failed slave lost sincerely, -The Buildbot

1 0