Mailman 3 January 2007 - Python-checkins

r53590 - python/trunk/Lib/_strptime.py
by brett.cannon 28 Jan '07

28 Jan '07

Author: brett.cannon Date: Sun Jan 28 21:58:00 2007 New Revision: 53590 Modified: python/trunk/Lib/_strptime.py Log: Use the thread lock's context manager instead of a try/finally statement. Modified: python/trunk/Lib/_strptime.py ============================================================================== --- python/trunk/Lib/_strptime.py (original) +++ python/trunk/Lib/_strptime.py Sun Jan 28 21:58:00 2007 @@ -294,8 +294,7 @@ def strptime(data_string, format="%a %b %d %H:%M:%S %Y"): """Return a time struct based on the input string and the format string.""" global _TimeRE_cache, _regex_cache - _cache_lock.acquire() - try: + with _cache_lock: time_re = _TimeRE_cache locale_time = time_re.locale_time if _getlang() != locale_time.lang: @@ -320,8 +319,6 @@ except IndexError: raise ValueError("stray %% in format '%s'" % format) _regex_cache[format] = format_regex - finally: - _cache_lock.release() found = format_regex.match(data_string) if not found: raise ValueError("time data %r does not match format %r" %

1 0

r53589 - tracker/roundup-src/roundup tracker/roundup-src/roundup/mailgw.py
by erik.forsberg 28 Jan '07

28 Jan '07

Author: erik.forsberg Date: Sun Jan 28 16:51:50 2007 New Revision: 53589 Modified: tracker/roundup-src/roundup/ (props changed) tracker/roundup-src/roundup/mailgw.py Log: Use mailgw.py from roundup-HEAD as it has a rewritten subject parser that should cope better with mailing list subject lines. Ignore *.pyc on roundup-src. Modified: tracker/roundup-src/roundup/mailgw.py ============================================================================== --- tracker/roundup-src/roundup/mailgw.py (original) +++ tracker/roundup-src/roundup/mailgw.py Sun Jan 28 16:51:50 2007 @@ -72,7 +72,7 @@ an exception, the original message is bounced back to the sender with the explanatory message given in the exception. -$Id: mailgw.py,v 1.180 2006/12/19 01:13:31 richard Exp $ +$Id: mailgw.py,v 1.183 2007/01/28 13:49:13 forsberg Exp $ """ __docformat__ = 'restructuredtext' @@ -619,57 +619,89 @@ # Matches subjects like: # Re: "[issue1234] title of issue [status=resolved]" - open, close = config['MAILGW_SUBJECT_SUFFIX_DELIMITERS'] - delim_open = re.escape(open) + + tmpsubject = subject # We need subject untouched for later use + # in error messages + + sd_open, sd_close = config['MAILGW_SUBJECT_SUFFIX_DELIMITERS'] + delim_open = re.escape(sd_open) if delim_open in '[(': delim_open = '\\' + delim_open - delim_close = re.escape(close) + delim_close = re.escape(sd_close) if delim_close in '[(': delim_close = '\\' + delim_close - subject_re = r''' - (?P<refwd>\s*\W?\s*(fw|fwd|re|aw|sv|ang)\W\s*)*\s* # Re: - (?P<quote>")? # Leading " - (%s(?P<classname>[^\d\s]+) # [issue.. - (?P<nodeid>\d+)? # ..1234] - %s)?\s* - (?P<title>[^%s]+)? # issue title - "? # Trailing " - (?P<argswhole>%s(?P<args>.+?)%s)? # [prop=value] - '''%(delim_open, delim_close, delim_open, delim_open, delim_close) - subject_re = re.compile(subject_re, re.IGNORECASE|re.VERBOSE) + + matches = dict.fromkeys(['refwd', 'quote', 'classname', + 'nodeid', 'title', 'args', + 'argswhole']) + + + # Look for Re: et. al. Used later on for MAILGW_SUBJECT_CONTENT_MATCH + re_re = r'''(?P<refwd>(\s*\W?\s*(fw|fwd|re|aw|sv|ang)\W)+)\s*''' + m = re.match(re_re, tmpsubject, re.IGNORECASE|re.VERBOSE) + if m: + matches.update(m.groupdict()) + tmpsubject = tmpsubject[len(matches['refwd']):] # Consume Re: + + # Look for Leading " + m = re.match(r'''(?P<quote>\s*")''', tmpsubject, + re.IGNORECASE|re.VERBOSE) + if m: + matches.update(m.groupdict()) + tmpsubject = tmpsubject[len(matches['quote']):] # Consume quote + + class_re = r'''%s(?P<classname>(%s))+(?P<nodeid>\d+)?%s''' % \ + (delim_open, "|".join(self.db.getclasses()), delim_close) + # Note: re.search, not re.match as there might be garbage + # (mailing list prefix, etc.) before the class identifier + m = re.search(class_re, tmpsubject, re.IGNORECASE|re.VERBOSE) + if m: + matches.update(m.groupdict()) + # Skip to the end of the class identifier, including any + # garbage before it. + + tmpsubject = tmpsubject[m.end():] + + m = re.match(r'''(?P<title>[^%s]+)''' % delim_open, tmpsubject, + re.IGNORECASE|re.VERBOSE) + if m: + matches.update(m.groupdict()) + tmpsubject = tmpsubject[len(matches['title']):] # Consume title + + args_re = r'''(?P<argswhole>%s(?P<args>.+?)%s)?''' % (delim_open, delim_close) + m = re.search(args_re, tmpsubject, re.IGNORECASE|re.VERBOSE) + if m: + matches.update(m.groupdict()) # figure subject line parsing modes pfxmode = config['MAILGW_SUBJECT_PREFIX_PARSING'] sfxmode = config['MAILGW_SUBJECT_SUFFIX_PARSING'] - # check for well-formed subject line - m = subject_re.match(subject) - if m: - # check for registration OTK - # or fallback on the default class - if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']: - otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})') - otk = otk_re.search(m.group('title') or '') - if otk: - self.db.confirm_registration(otk.group('otk')) - subject = 'Your registration to %s is complete' % \ - config['TRACKER_NAME'] - sendto = [from_list[0][1]] - self.mailer.standard_message(sendto, subject, '') - return - # get the classname - if pfxmode == 'none': - classname = None + # check for registration OTK + # or fallback on the default class + if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']: + otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})') + otk = otk_re.search(matches['title'] or '') + if otk: + self.db.confirm_registration(otk.group('otk')) + subject = 'Your registration to %s is complete' % \ + config['TRACKER_NAME'] + sendto = [from_list[0][1]] + self.mailer.standard_message(sendto, subject, '') + return + # get the classname + if pfxmode == 'none': + classname = None + else: + classname = matches['classname'] + if classname is None: + if self.default_class: + classname = self.default_class else: - classname = m.group('classname') - if classname is None: - if self.default_class: - classname = self.default_class - else: - classname = config['MAILGW_DEFAULT_CLASS'] - if not classname: - # fail - m = None + classname = config['MAILGW_DEFAULT_CLASS'] + if not classname: + # fail + m = None - if not m and pfxmode == 'strict': + if not classname and pfxmode == 'strict': raise MailUsageError, _(""" The message you sent to roundup did not contain a properly formed subject line. The subject must contain a class name or designator to indicate the @@ -713,17 +745,17 @@ if pfxmode == 'none': nodeid = None else: - nodeid = m.group('nodeid') + nodeid = matches['nodeid'] # try in-reply-to to match the message if there's no nodeid inreplyto = message.getheader('in-reply-to') or '' if nodeid is None and inreplyto: - l = self.db.getclass('msg').stringFind(inreplyto=inreplyto) + l = self.db.getclass('msg').stringFind(messageid=inreplyto) if l: - nodeid = l[0] + nodeid = cl.filter(None, {'messages':l})[0] # title is optional too - title = m.group('title') + title = matches['title'] if title: title = title.strip() else: @@ -731,7 +763,7 @@ # strip off the quotes that dumb emailers put around the subject, like # Re: "[issue1] bla blah" - if m.group('quote') and title.endswith('"'): + if matches['quote'] and title.endswith('"'): title = title[:-1] # but we do need either a title or a nodeid... @@ -752,7 +784,7 @@ # additional restriction based on the matched node's creation or # activity. tmatch_mode = config['MAILGW_SUBJECT_CONTENT_MATCH'] - if tmatch_mode != 'never' and nodeid is None and m.group('refwd'): + if tmatch_mode != 'never' and nodeid is None and matches['refwd']: l = cl.stringFind(title=title) limit = None if (tmatch_mode.startswith('creation') or @@ -905,8 +937,8 @@ # figure what the properties of this Class are properties = cl.getprops() props = {} - args = m.group('args') - argswhole = m.group('argswhole') + args = matches['args'] + argswhole = matches['argswhole'] if args: if sfxmode == 'none': title += ' ' + argswhole

1 0

r53587 - tracker/instances/python-dev/html/page.html
by erik.forsberg 27 Jan '07

27 Jan '07

Author: erik.forsberg Date: Sat Jan 27 23:04:56 2007 New Revision: 53587 Modified: tracker/instances/python-dev/html/page.html Log: Use absolute URL for link to www.python.org. Modified: tracker/instances/python-dev/html/page.html ============================================================================== --- tracker/instances/python-dev/html/page.html (original) +++ tracker/instances/python-dev/html/page.html Sat Jan 27 23:04:56 2007 @@ -192,12 +192,12 @@ </div>  <div id="footer"> <div id="credits"> -<a href="about/website">Website maintained by the Python community</a><br /> +<a href="http://www.python.org/about/website">Website maintained by the Python community</a><br /> <a href="http://www.upfrontsystems.co.za/" title="issue tracker hosting provided by Upfront Systems, South Africa">hosting by Upfront Systems</a> / <a href="http://roundup.sf.net" title="Powered by the Roundup Issue Tracker">powered by Roundup</a> </div>  -Copyright © 1990-2006, <a href="psf">Python Software Foundation</a><br /> +Copyright © 1990-2006, <a href="psf">Python Software Foundation</a><br /> <a href="about/legal">Legal Statements</a> </div>  </div>

1 0

buildbot warnings in hppa Ubuntu dapper 2.5
by buildbot＠python.org 27 Jan '07

27 Jan '07

The Buildbot has detected a new failure of hppa Ubuntu dapper 2.5. Full details are available at: http://www.python.org/dev/buildbot/all/hppa%2520Ubuntu%2520dapper%25202.5/b… Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release25-maint] HEAD Blamelist: georg.brandl Build had warnings: warnings test Excerpt from the test logfile: make: *** [buildbottest] Killed sincerely, -The Buildbot

1 0

r53585 - tracker/instances/python-dev/html/user.forgotten.html
by erik.forsberg 27 Jan '07

27 Jan '07

Author: erik.forsberg Date: Sat Jan 27 22:43:48 2007 New Revision: 53585 Modified: tracker/instances/python-dev/html/user.forgotten.html Log: Tuned messages displayed when recovering password, which hopefully makes the procedure less confusing. Modified: tracker/instances/python-dev/html/user.forgotten.html ============================================================================== --- tracker/instances/python-dev/html/user.forgotten.html (original) +++ tracker/instances/python-dev/html/user.forgotten.html Sat Jan 27 22:43:48 2007 @@ -5,6 +5,8 @@ i18n:translate="">Password reset request</span> <td class="content" metal:fill-slot="content"> +<tal:askforinfo tal:condition="python:options['error_message'] or not request.form.has_key('@action')"> + <p i18n:translate="">You have two options if you have forgotten your password. If you know the email address you registered with, enter it below.</p> @@ -46,6 +48,9 @@ <p i18n:translate="">A confirmation email will be sent to you - please follow the instructions within it to complete the reset process.</p> -</td> +</tal:askforinfo> + +</td> +g </tal:block>

1 0

r53584 - tracker/instances/python-dev/schema.py
by erik.forsberg 27 Jan '07

27 Jan '07

Author: erik.forsberg Date: Sat Jan 27 22:20:11 2007 New Revision: 53584 Modified: tracker/instances/python-dev/schema.py Log: Removed debug printout. Modified: tracker/instances/python-dev/schema.py ============================================================================== --- tracker/instances/python-dev/schema.py (original) +++ tracker/instances/python-dev/schema.py Sat Jan 27 22:20:11 2007 @@ -203,7 +203,6 @@ # limited to only the situation where the Viewed or Edited item is their own. def own_record(db, userid, itemid): '''Determine whether the userid matches the item being accessed.''' - print 'own record', userid, itemid return userid == itemid p = db.security.addPermission(name='View', klass='user', check=own_record, description="User is allowed to view their own user details")

1 0

r53583 - tracker/instances/python-dev/html/style.css
by erik.forsberg 27 Jan '07

27 Jan '07

Author: erik.forsberg Date: Sat Jan 27 22:01:33 2007 New Revision: 53583 Modified: tracker/instances/python-dev/html/style.css Log: Adjusted vertical alignment of table cells to prevent it from looking slightly fishy. Modified: tracker/instances/python-dev/html/style.css ============================================================================== --- tracker/instances/python-dev/html/style.css (original) +++ tracker/instances/python-dev/html/style.css Sat Jan 27 22:01:33 2007 @@ -156,7 +156,6 @@ border-bottom: #ddd solid 1px; color: #338; text-align: right; - vertical-align: top; font-weight: normal; white-space: nowrap; } @@ -176,7 +175,6 @@ border-bottom: #ddd solid 1px; color: #333; empty-cells: show; - vertical-align: top; padding: 5px; }

1 0

r53582 - tracker/instances/python-dev/detectors/userauditor.py
by erik.forsberg 27 Jan '07

27 Jan '07

Author: erik.forsberg Date: Sat Jan 27 21:56:27 2007 New Revision: 53582 Modified: tracker/instances/python-dev/detectors/userauditor.py Log: Don't bail out when _creating_ users. Modified: tracker/instances/python-dev/detectors/userauditor.py ============================================================================== --- tracker/instances/python-dev/detectors/userauditor.py (original) +++ tracker/instances/python-dev/detectors/userauditor.py Sat Jan 27 21:56:27 2007 @@ -35,7 +35,7 @@ if not db.security.role.has_key(rolename): raise ValueError, 'Role "%s" does not exist'%rolename - if "admin" in roles: + if None != nodeid and "admin" in roles: if not "admin" in [x.lower().strip() for x in cl.get(nodeid, 'roles')]: raise ValueError, "Only Admins may assign the Admin role!"

1 0

buildbot warnings in alpha Tru64 5.1 trunk
by buildbot＠python.org 27 Jan '07

27 Jan '07

The Buildbot has detected a new failure of alpha Tru64 5.1 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/alpha%2520Tru64%25205.1%2520trunk/bu… Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl Build had warnings: warnings test Excerpt from the test logfile: 1 test failed: test_signal Traceback (most recent call last): File "./Lib/test/regrtest.py", line 546, in runtest_inner the_package = __import__(abstest, globals(), locals(), []) File "/net/ringneck/scratch1/nnorwitz/python/trunk.norwitz-tru64/build/Lib/test/test_signal.py", line 143, in <module> print "KeyboardInterrupt (the alarm() went off)" File "/net/ringneck/scratch1/nnorwitz/python/trunk.norwitz-tru64/build/Lib/test/test_signal.py", line 49, in handlerB raise HandlerBCalled, args HandlerBCalled: (30, <frame object at 0x144f2c530>) sincerely, -The Buildbot

1 0

Your message to Stackless-checkins awaits moderator approval
by stackless-checkins-bounces＠stackless.com 27 Jan '07

27 Jan '07

Your mail to 'Stackless-checkins' with the subject r53588 - in stackless/branches/release24-maint: Doc/ACKS Doc/api/abstract.tex Doc/api/concrete.tex Doc/api/intro.tex Doc/api/newtypes.tex Doc/api/refcounts.dat Doc/commontex/boilerplate.tex Doc/commontex/license.tex Doc/dist/dist.tex Doc/ext/extending.tex Doc/ext/windows.tex Doc/lib/asttable.tex Doc/lib/emailmimebase.tex Doc/lib/libbsddb.tex Doc/lib/libcodecs.tex Doc/lib/libcollections.tex Doc/lib/libcsv.tex Doc/lib/libcursespanel.tex Doc/lib/libdecimal.tex Doc/lib/libdoctest.tex Doc/lib/libfuncs.tex Doc/lib/libgettext.tex Doc/lib/liblinecache.tex Doc/lib/libnew.tex Doc/lib/libos.tex Doc/lib/libpdb.tex Doc/lib/libposixpath.tex Doc/lib/libsgmllib.tex Doc/lib/libsignal.tex Doc/lib/libsocket.tex Doc/lib/libsubprocess.tex Doc/lib/libtarfile.tex Doc/lib/libthread.tex Doc/lib/libtime.tex Doc/lib/libunicodedata.tex Doc/lib/libunittest.tex Doc/lib/liburllib2.tex Doc/lib/libxmlrpclib.tex Doc/lib/libzipfile.tex Doc/lib/libzipimport.tex Doc/lib/libzlib.tex Doc/mac/scripting.te! x Doc/python-docs.txt Doc/ref/ref2.tex Doc/ref/ref3.tex Doc/ref/ref4.tex Doc/ref/ref5.tex Doc/ref/ref6.tex Doc/ref/ref7.tex Doc/ref/ref8.tex Doc/texinputs/python.sty Doc/tut/tut.tex Doc/whatsnew/whatsnew24.tex Include/object.h Include/osdefs.h Include/patchlevel.h Include/pyport.h LICENSE Lib/SimpleHTTPServer.py Lib/_threading_local.py Lib/base64.py Lib/bdb.py Lib/bsddb/__init__.py Lib/bsddb/test/test_1413192.py Lib/bsddb/test/test_all.py Lib/bsddb/test/test_basics.py Lib/bsddb/test/test_pickle.py Lib/cgi.py Lib/copy_reg.py Lib/distutils/__init__.py Lib/distutils/command/bdist_rpm.py Lib/distutils/command/register.py Lib/distutils/log.py Lib/distutils/msvccompiler.py Lib/distutils/sysconfig.py Lib/distutils/unixccompiler.py Lib/distutils/util.py Lib/doctest.py Lib/email/Message.py Lib/email/Utils.py Lib/email/__init__.py Lib/email/_parseaddr.py Lib/email/test/data/msg_44.txt Lib/email/test/test_email.py Lib/gzip.py Lib/idlelib/EditorWindow.py Lib/idlelib/NEWS.txt Lib/idleli! b/configHelpSourceEdit.py Lib/idlelib/idlever.py Lib/imputil.py Lib/inspect.py Lib/lib-tk/tkFont.py Lib/logging/__init__.py Lib/logging/config.py Lib/logging/handlers.py Lib/mimetypes.py Lib/ntpath.py Lib/optparse.py Lib/pdb.py Lib/plat-mac/applesingle.py Lib/plat-mac/argvemulator.py Lib/plat-mac/buildtools.py Lib/platform.p Is being held until the list moderator can review it for approval. The reason it is being held: Message body is too big: 924921 bytes with a limit of 500 KB Either the message will get posted to the list, or you will receive notification of the moderator's decision. If you would like to cancel this posting, please visit the following URL: http://www.stackless.com/mailman/confirm/stackless-checkins/623c95545f8b8a6…

1 0