Mailman 3 June 2010 - Python-checkins

r81681 - python/trunk/Modules/datetimemodule.c
by sean.reifschneider 03 Jul '10

03 Jul '10

Author: sean.reifschneider Date: Fri Jun 4 03:51:26 2010 New Revision: 81681 Log: Issue8810: Clearing up docstring for tzinfo.utcoffset. Modified: python/trunk/Modules/datetimemodule.c Modified: python/trunk/Modules/datetimemodule.c ============================================================================== --- python/trunk/Modules/datetimemodule.c (original) +++ python/trunk/Modules/datetimemodule.c Fri Jun 4 03:51:26 2010 @@ -3026,7 +3026,8 @@ PyDoc_STR("datetime -> DST offset in minutes east of UTC.")}, {"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")}, {"__reduce__", (PyCFunction)tzinfo_reduce, METH_NOARGS, PyDoc_STR("-> (cls, state)")},

2 1

r82348 - in tracker/instances/python-dev/html: issue.item.html issue.item.js
by ezio.melotti 02 Jul '10

02 Jul '10

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. Added: tracker/instances/python-dev/html/issue.item.js 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 Mon Jun 28 23:29:16 2010 @@ -9,6 +9,11 @@ >New Issue - <span tal:replace="config/TRACKER_NAME" i18n:name="tracker" /></tal:block> </title> + +<metal:slot fill-slot="more-javascript"> +<script type="text/javascript" src="@@file/issue.item.js"></script> +</metal:slot> + <tal:block metal:fill-slot="body_title"> <span tal:condition="python: not (context.id or context.is_edit_ok())" tal:omit-tag="python:1" i18n:translate="">New Issue</span> @@ -130,13 +135,17 @@ <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>: + <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> <td> <span tal:replace="structure context/nosy/field" /> - <span tal:condition="context/nosy_count" tal:replace="python: '(%d)' % context.nosy_count" /> + <span id="add_me_to_nosy" style="display: none" + 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)" /> </td> </tr> <tr> Added: tracker/instances/python-dev/html/issue.item.js ============================================================================== --- (empty file) +++ tracker/instances/python-dev/html/issue.item.js Mon Jun 28 23:29:16 2010 @@ -0,0 +1,39 @@ +window.onload = function () { + // create the input button and use it to replace the span/placeholder -- + // users without javascript won't notice anything. + // This might eventually be replaced by jquery + var node_id = 'add_me_to_nosy'; + var add_me_span = document.getElementById(node_id); + var add_me_button = document.createElement('input'); + var add_me_parent = add_me_span.parentNode; + add_me_button.value = '+'; + add_me_button.type = 'button'; + add_me_button.title = 'Add me to the nosy list (remember to Submit Changes)'; + add_me_button.onclick = add_me_span.onclick; + add_me_button.style.display = 'inline'; + add_me_parent.replaceChild(add_me_button, add_me_span); + add_me_button.id = node_id; +} + + +function add_to_nosy(user) { + var add_me_button = document.getElementById('add_me_to_nosy'); + var nosy = document.getElementsByName('nosy')[0]; + var nosy_text = nosy.value.replace(/\s+/g, ''); + if (nosy_text == "") { + // nosy_list is empty, add the user + nosy.value = user; + } + else { + re = new RegExp("(^|,)" + user + "(,|$)"); + if (!re.test(nosy_text)) { + // make sure the user not in nosy and then add it at the beginning + nosy.value = user + ',' + nosy_text; + } + } + // 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.width = new_width + "px"; +}

2 1

r82412 - in tracker/instances/python-dev/html: issue.item.html issue.item.js
by ezio.melotti 30 Jun '10

30 Jun '10

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"; }

1 0

Daily py3k reference leaks (r82407): sum=0
by solipsis＠pitrou.net 30 Jun '10

30 Jun '10

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']

1 0

r82411 - tracker/instances/python-dev/html/style.css
by ezio.melotti 30 Jun '10

30 Jun '10

Author: ezio.melotti Date: Wed Jun 30 21:40:51 2010 New Revision: 82411 Log: Force the [+] button to stay on the same line of the input box. Modified: tracker/instances/python-dev/html/style.css Modified: tracker/instances/python-dev/html/style.css ============================================================================== --- tracker/instances/python-dev/html/style.css (original) +++ tracker/instances/python-dev/html/style.css Wed Jun 30 21:40:51 2010 @@ -176,6 +176,7 @@ color: #333; empty-cells: show; padding: 5px; + white-space: nowrap; } table.form td.optional {

1 0

r82410 - python/branches/py3k
by benjamin.peterson 30 Jun '10

30 Jun '10

Author: benjamin.peterson Date: Wed Jun 30 20:44:04 2010 New Revision: 82410 Log: Merged revisions 82409 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r82409 | benjamin.peterson | 2010-06-30 13:41:08 -0500 (Wed, 30 Jun 2010) | 1 line an AttributeError is perfectly acceptable here ........ Modified: python/branches/py3k/ (props changed)

1 0

r82409 - python/trunk/Lib/test/test_os.py
by benjamin.peterson 30 Jun '10

30 Jun '10

Author: benjamin.peterson Date: Wed Jun 30 20:41:08 2010 New Revision: 82409 Log: an AttributeError is perfectly acceptable here Modified: python/trunk/Lib/test/test_os.py Modified: python/trunk/Lib/test/test_os.py ============================================================================== --- python/trunk/Lib/test/test_os.py (original) +++ python/trunk/Lib/test/test_os.py Wed Jun 30 20:41:08 2010 @@ -211,7 +211,7 @@ try: result.st_mode = 1 self.fail("No exception thrown") - except TypeError: + except (AttributeError, TypeError): pass try:

1 0

r82408 - in python/branches/release31-maint: Lib/smtpd.py Misc/NEWS
by giampaolo.rodola 30 Jun '10

30 Jun '10

Author: giampaolo.rodola Date: Wed Jun 30 19:50:20 2010 New Revision: 82408 Log: Merged revisions 82407 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r82407 | giampaolo.rodola | 2010-06-30 19:47:39 +0200 (mer, 30 giu 2010) | 9 lines Merged revisions 82404 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r82404 | giampaolo.rodola | 2010-06-30 19:38:28 +0200 (mer, 30 giu 2010) | 1 line fix issue #6589: cleanup asyncore.socket_map if smtpd.SMTPServer constructor raises an exception ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/smtpd.py python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Lib/smtpd.py ============================================================================== --- python/branches/release31-maint/Lib/smtpd.py (original) +++ python/branches/release31-maint/Lib/smtpd.py Wed Jun 30 19:50:20 2010 @@ -274,14 +274,19 @@ self._localaddr = localaddr self._remoteaddr = remoteaddr asyncore.dispatcher.__init__(self) - self.create_socket(socket.AF_INET, socket.SOCK_STREAM) - # try to re-use a server port if possible - self.set_reuse_addr() - self.bind(localaddr) - self.listen(5) - print('%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s' % ( - self.__class__.__name__, time.ctime(time.time()), - localaddr, remoteaddr), file=DEBUGSTREAM) + try: + self.create_socket(socket.AF_INET, socket.SOCK_STREAM) + # try to re-use a server port if possible + self.set_reuse_addr() + self.bind(localaddr) + self.listen(5) + except: + self.close() + raise + else: + print('%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s' % ( + self.__class__.__name__, time.ctime(time.time()), + localaddr, remoteaddr), file=DEBUGSTREAM) def handle_accept(self): conn, addr = self.accept() Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Wed Jun 30 19:50:20 2010 @@ -67,6 +67,9 @@ Library ------- +- 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 on an OpenSSL structure.

1 0

r82407 - in python/branches/py3k: Lib/smtpd.py Misc/NEWS
by giampaolo.rodola 30 Jun '10

30 Jun '10

Author: giampaolo.rodola Date: Wed Jun 30 19:47:39 2010 New Revision: 82407 Log: Merged revisions 82404 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r82404 | giampaolo.rodola | 2010-06-30 19:38:28 +0200 (mer, 30 giu 2010) | 1 line fix issue #6589: cleanup asyncore.socket_map if smtpd.SMTPServer constructor raises an exception ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/smtpd.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/smtpd.py ============================================================================== --- python/branches/py3k/Lib/smtpd.py (original) +++ python/branches/py3k/Lib/smtpd.py Wed Jun 30 19:47:39 2010 @@ -274,14 +274,19 @@ self._localaddr = localaddr self._remoteaddr = remoteaddr asyncore.dispatcher.__init__(self) - self.create_socket(socket.AF_INET, socket.SOCK_STREAM) - # try to re-use a server port if possible - self.set_reuse_addr() - self.bind(localaddr) - self.listen(5) - print('%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s' % ( - self.__class__.__name__, time.ctime(time.time()), - localaddr, remoteaddr), file=DEBUGSTREAM) + try: + self.create_socket(socket.AF_INET, socket.SOCK_STREAM) + # try to re-use a server port if possible + self.set_reuse_addr() + self.bind(localaddr) + self.listen(5) + except: + self.close() + raise + else: + print('%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s' % ( + self.__class__.__name__, time.ctime(time.time()), + localaddr, remoteaddr), file=DEBUGSTREAM) def handle_accept(self): conn, addr = self.accept() Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Wed Jun 30 19:47:39 2010 @@ -460,6 +460,9 @@ Library ------- +- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor + raises an exception. + - Issue #9110: Addition of ContextDecorator to contextlib, for creating APIs that act as both context managers and decorators. contextmanager changes to use ContextDecorator.

1 0

r82406 - in python/branches/release26-maint: Lib/smtpd.py Misc/NEWS
by giampaolo.rodola 30 Jun '10

30 Jun '10

Author: giampaolo.rodola Date: Wed Jun 30 19:41:25 2010 New Revision: 82406 Log: Merged revisions 82404 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r82404 | giampaolo.rodola | 2010-06-30 19:38:28 +0200 (mer, 30 giu 2010) | 1 line fix issue #6589: cleanup asyncore.socket_map if smtpd.SMTPServer constructor raises an exception ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/smtpd.py python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Lib/smtpd.py ============================================================================== --- python/branches/release26-maint/Lib/smtpd.py (original) +++ python/branches/release26-maint/Lib/smtpd.py Wed Jun 30 19:41:25 2010 @@ -274,15 +274,21 @@ self._localaddr = localaddr self._remoteaddr = remoteaddr asyncore.dispatcher.__init__(self) - self.create_socket(socket.AF_INET, socket.SOCK_STREAM) - # try to re-use a server port if possible - self.set_reuse_addr() - self.bind(localaddr) - self.listen(5) - print >> DEBUGSTREAM, \ - '%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s' % ( - self.__class__.__name__, time.ctime(time.time()), - localaddr, remoteaddr) + try: + self.create_socket(socket.AF_INET, socket.SOCK_STREAM) + # try to re-use a server port if possible + self.set_reuse_addr() + self.bind(localaddr) + self.listen(5) + except: + # cleanup asyncore.socket_map before raising + self.close() + raise + else: + print >> DEBUGSTREAM, \ + '%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s' % ( + self.__class__.__name__, time.ctime(time.time()), + localaddr, remoteaddr) def handle_accept(self): conn, addr = self.accept() Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Wed Jun 30 19:41:25 2010 @@ -73,6 +73,9 @@ Library ------- +- 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. - Issue #9085: email package version number bumped to its correct

1 0