Mailman 3 July 2007 - Python-checkins

buildbot warnings in x86 XP-3 trunk
by buildbot＠python.org July 28, 2007

July 28, 2007

The Buildbot has detected a new failure of x86 XP-3 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520XP-3%2520trunk/builds/107 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: facundo.batista Build had warnings: warnings test Excerpt from the test logfile: 1 test failed: test_mutants sincerely, -The Buildbot

1 0

r56604 - python/trunk/Lib/test/test_asyncore.py
by facundo.batista July 28, 2007

July 28, 2007

Author: facundo.batista Date: Sat Jul 28 16:21:22 2007 New Revision: 56604 Modified: python/trunk/Lib/test/test_asyncore.py Log: Moved all of the capture_server socket setup code into the try block so that the event gets set if a failure occurs during server setup (otherwise the test will block forever). Changed to let the OS assign the server port number, and client side of test waits for port number assignment before proceeding. The test data in DispatcherWithSendTests is also sent in multiple send() calls instead of one to make sure this works properly. [GSoC - Alan McIntyre] Modified: python/trunk/Lib/test/test_asyncore.py ============================================================================== --- python/trunk/Lib/test/test_asyncore.py (original) +++ python/trunk/Lib/test/test_asyncore.py Sat Jul 28 16:21:22 2007 @@ -12,7 +12,7 @@ from StringIO import StringIO HOST = "127.0.0.1" -PORT = 54329 +PORT = None class dummysocket: def __init__(self): @@ -53,12 +53,14 @@ # used when testing senders; just collects what it gets until newline is sent def capture_server(evt, buf): - serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - serv.settimeout(3) - serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - serv.bind(("", PORT)) - serv.listen(5) try: + serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + serv.settimeout(3) + serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + serv.bind(("", 0)) + global PORT + PORT = serv.getsockname()[1] + serv.listen(5) conn, addr = serv.accept() except socket.timeout: pass @@ -78,6 +80,7 @@ conn.close() finally: serv.close() + PORT = None evt.set() @@ -338,12 +341,26 @@ self.evt = threading.Event() cap = StringIO() threading.Thread(target=capture_server, args=(self.evt,cap)).start() - time.sleep(1) # Give server time to initialize - data = "Suppose there isn't a 16-ton weight?"*5 + # wait until server thread has assigned a port number + n = 1000 + while PORT is None and n > 0: + time.sleep(0.01) + n -= 1 + + # wait a little longer for the server to initialize (it sometimes + # refuses connections on slow machines without this wait) + time.sleep(0.2) + + data = "Suppose there isn't a 16-ton weight?" d = dispatcherwithsend_noread() d.create_socket(socket.AF_INET, socket.SOCK_STREAM) d.connect((HOST, PORT)) + + # give time for socket to connect + time.sleep(0.1) + + d.send(data) d.send(data) d.send('\n') @@ -354,7 +371,7 @@ self.evt.wait() - self.assertEqual(cap.getvalue(), data) + self.assertEqual(cap.getvalue(), data*2) class DispatcherWithSendTests_UsePoll(DispatcherWithSendTests):

1 0

r56602 - tracker/importer/fixsfmojibake.py
by martin.v.loewis July 28, 2007

July 28, 2007

Author: martin.v.loewis Date: Sat Jul 28 12:22:29 2007 New Revision: 56602 Added: tracker/importer/fixsfmojibake.py (contents, props changed) Log: Add SF xml_export2 encoding fixing script. Added: tracker/importer/fixsfmojibake.py ============================================================================== --- (empty file) +++ tracker/importer/fixsfmojibake.py Sat Jul 28 12:22:29 2007 @@ -0,0 +1,49 @@ +#!/usr/bin/python +# The data exported from SF often are incorrectly +# encoded - two subsequent Unicode character have to +# be interpreted as the two bytes of a single UTF-8 +# character; it looks like the have UTF-8 in the database +# but encode it as if it was Latin-1. +# Unfortunately, this is not consistently so: for some +# data, the intended encoding is really Latin-1. +# This scripts tries to fix it, by recoding everything +# that looks like UTF-8 into the then-proper character +# references. + +# The script assumes that the file encoding is actually +# ASCII, and that non-ASCII characters are always encoded +# as decimal character references. + +import sys, re + +expr = re.compile('(&#[0-9]+;)+') + +def recode(group): + assert group[:2] == '&#' and group[-1] == ';' + chars = group[2:-1].split(';&#') + chars = [unichr(int(c)) for c in chars] + chars = u''.join(chars) + try: + chars = chars.encode('latin-1').decode('utf-8') + except UnicodeError: + return group + chars = ['&#%d;' % ord(c) for c in chars] + return ''.join(chars) + +print >>sys.stderr, len(indata) + +# Make sure that there are only &#decimal; references, +# and that all &# occurrences are markup +assert indata.find('&#x') == -1 +assert indata.find('<![CDATA[') == -1 + +pos = 0 +while True: + m = expr.search(indata, pos) + if m is None: + sys.stdout.write(indata[pos:]) + break + sys.stdout.write(indata[pos:m.start()]) + sys.stdout.write(recode(m.group())) + pos = m.end() +

1 0

r56601 - in python/trunk: Lib/test/test_unicodedata.py Misc/NEWS Modules/unicodedata.c
by martin.v.loewis July 28, 2007

July 28, 2007

Author: martin.v.loewis Date: Sat Jul 28 09:03:05 2007 New Revision: 56601 Modified: python/trunk/Lib/test/test_unicodedata.py python/trunk/Misc/NEWS python/trunk/Modules/unicodedata.c Log: Bug #1704793: Return UTF-16 pair if unicodedata.lookup cannot represent the result in a single character. Modified: python/trunk/Lib/test/test_unicodedata.py ============================================================================== --- python/trunk/Lib/test/test_unicodedata.py (original) +++ python/trunk/Lib/test/test_unicodedata.py Sat Jul 28 09:03:05 2007 @@ -214,6 +214,9 @@ count += 1 self.assert_(count >= 10) # should have tested at least the ASCII digits + def test_bug_1704793(self): + self.assertEquals(self.db.lookup("GOTHIC LETTER FAIHU"), u'\U00010346') + def test_main(): test.test_support.run_unittest( UnicodeMiscTest, Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sat Jul 28 09:03:05 2007 @@ -238,6 +238,9 @@ Library ------- +- Bug #1704793: Return UTF-16 pair if unicodedata.lookup cannot + represent the result in a single character. + - Bug #978833: Close https sockets by releasing the _ssl object. - Change location of the package index to pypi.python.org/pypi Modified: python/trunk/Modules/unicodedata.c ============================================================================== --- python/trunk/Modules/unicodedata.c (original) +++ python/trunk/Modules/unicodedata.c Sat Jul 28 09:03:05 2007 @@ -1077,8 +1077,7 @@ unicodedata_lookup(PyObject* self, PyObject* args) { Py_UCS4 code; - Py_UNICODE str[1]; - char errbuf[256]; + Py_UNICODE str[2]; char* name; int namelen; @@ -1086,24 +1085,20 @@ return NULL; if (!_getcode(self, name, namelen, &code)) { - /* XXX(nnorwitz): why are we allocating for the error msg? - Why not always use snprintf? */ - char fmt[] = "undefined character name '%s'"; - char *buf = PyMem_MALLOC(sizeof(fmt) + namelen); - if (buf) - sprintf(buf, fmt, name); - else { - buf = errbuf; - PyOS_snprintf(buf, sizeof(errbuf), fmt, name); - } - PyErr_SetString(PyExc_KeyError, buf); - if (buf != errbuf) - PyMem_FREE(buf); + PyErr_Format(PyExc_KeyError, "undefined character name '%s'", + name); return NULL; } +#ifndef Py_UNICODE_WIDE + if (code >= 0x10000) { + str[0] = 0xd800 + ((code - 0x10000) >> 10); + str[1] = 0xdc00 + ((code - 0x10000) & 0x3ff); + return PyUnicode_FromUnicode(str, 2); + } +#endif str[0] = (Py_UNICODE) code; - return PyUnicode_FromUnicode(str, 1); + return PyUnicode_FromUnicode(str, 1); } /* XXX Add doc strings. */

1 0

r56600 - in python/branches/release25-maint: Lib/test/test_unicodedata.py Misc/NEWS Modules/unicodedata.c
by martin.v.loewis July 28, 2007

July 28, 2007

Author: martin.v.loewis Date: Sat Jul 28 09:01:43 2007 New Revision: 56600 Modified: python/branches/release25-maint/Lib/test/test_unicodedata.py python/branches/release25-maint/Misc/NEWS python/branches/release25-maint/Modules/unicodedata.c Log: Bug #1704793: Raise KeyError if unicodedata.lookup cannot represent the result in a single character. Modified: python/branches/release25-maint/Lib/test/test_unicodedata.py ============================================================================== --- python/branches/release25-maint/Lib/test/test_unicodedata.py (original) +++ python/branches/release25-maint/Lib/test/test_unicodedata.py Sat Jul 28 09:01:43 2007 @@ -6,7 +6,7 @@ """#" import unittest, test.test_support -import hashlib +import hashlib, sys encoding = 'utf-8' @@ -214,6 +214,10 @@ count += 1 self.assert_(count >= 10) # should have tested at least the ASCII digits + def test_bug_1704793(self): + if sys.maxunicode == 65535: + self.assertRaises(KeyError, self.db.lookup, "GOTHIC LETTER FAIHU") + def test_main(): test.test_support.run_unittest( UnicodeMiscTest, Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Sat Jul 28 09:01:43 2007 @@ -26,6 +26,9 @@ Library ------- +- Bug #1704793: Raise KeyError if unicodedata.lookup cannot + represent the result in a single character. + - Change location of the package index to pypi.python.org/pypi - Bug #1701409: Fix a segfault in printing ctypes.c_char_p and Modified: python/branches/release25-maint/Modules/unicodedata.c ============================================================================== --- python/branches/release25-maint/Modules/unicodedata.c (original) +++ python/branches/release25-maint/Modules/unicodedata.c Sat Jul 28 09:01:43 2007 @@ -1102,8 +1102,18 @@ return NULL; } +#ifndef Py_UNICODE_WIDE + if (code >= 0x10000) { + /* Raise KeyError for compatibility; the possibly more + correct ValueError was not documented as a possible + exception for 2.5.x and earlier. */ + PyErr_Format(PyExc_KeyError, "result %d larger than sys.maxunicode", + code); + return NULL; + } +#endif str[0] = (Py_UNICODE) code; - return PyUnicode_FromUnicode(str, 1); + return PyUnicode_FromUnicode(str, 1); } /* XXX Add doc strings. */

1 0

r56599 - peps/trunk/pep-3100.txt
by brett.cannon July 27, 2007

July 27, 2007

Author: brett.cannon Date: Sat Jul 28 01:35:34 2007 New Revision: 56599 Modified: peps/trunk/pep-3100.txt Log: Fix a misspelling and clarify what indirection entries in sys.modules are. Modified: peps/trunk/pep-3100.txt ============================================================================== --- peps/trunk/pep-3100.txt (original) +++ peps/trunk/pep-3100.txt Sat Jul 28 01:35:34 2007 @@ -85,7 +85,8 @@ * Imports [#pep328]_ + Imports will be absolute by default. [done] + Relative imports must be explicitly specified. [done] - + Indirection entires in sys.modules will not be supported. (what's this???) + + Indirection entries in sys.modules (i.e., a value of None for + A.string means to use the top-level sring module) will not be supported. * __init__.py might become optional in sub-packages? __init__.py will still be required for top-level packages. * Cleanup the Py_InitModule() variants {,3,4} (also import and parser APIs)

1 0

r56598 - tracker/instances/python-dev/detectors/changes_xml_writer.py
by erik.forsberg July 27, 2007

July 27, 2007

Author: erik.forsberg Date: Sat Jul 28 01:17:57 2007 New Revision: 56598 Removed: tracker/instances/python-dev/detectors/changes_xml_writer.py Log: Need a python 2.4 compatible variant Deleted: /tracker/instances/python-dev/detectors/changes_xml_writer.py ============================================================================== --- /tracker/instances/python-dev/detectors/changes_xml_writer.py Sat Jul 28 01:17:57 2007 +++ (empty file) @@ -1,191 +0,0 @@ -# -# changes.xml writer detector. -# -# Copyright (c) 2007 Michal Kwiatkowski <constant.beta(a)gmail.com> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of the author nor the names of his contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -"""changes.xml writer detector -- save each database change to an XML file. - -Root element is called `changes` and it has at most `ChangesXml.max_items` -children, each called a `change`. Each `change` has the following attributes: - -:date: date in RFC2822 format when the change was made -:id: unique identifier of this change (note: not an integer) -:type: type of this change (see below) - -A structure of a `change` depends on its `type`. Currently implemented -change types and their formats are listed below. - -* type = `file-added` - - Describes a new file attached to an existing issue. Child elements: - - :file-id: unique integer identifier of the file - :file-name: name of the uploaded file - :file-type: MIME type of the file content - :file-url: permanent URL of the file - :issue-id: unique integer identifier of an issue this file is attached to -""" - -import os -import urllib -from xml.dom import minidom -from xml.parsers.expat import ExpatError -from time import gmtime, strftime - -# Relative to tracker home directory. -FILENAME = os.path.join('%(TEMPLATES)s', 'recent-changes.xml') - - -def tracker_url(db): - return str(db.config.options[('tracker', 'web')]) - -def changes_xml_path(db): - return os.path.join(db.config.HOME, FILENAME % db.config.options) - -def rfc2822_date(): - return strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime()) - -class File(object): - def __init__(self, db, id, issue_id): - self.db = db - self.id = id - self.issue_id = issue_id - - self.name = db.file.get(id, 'name') - self.type = db.file.get(id, 'type') - # Based on roundup.cgi.templating._HTMLItem.download_url(). - self.download_url = tracker_url(self.db) +\ - urllib.quote('%s%s/%s' % ('file', self.id, self.name)) - -class ChangesXml(object): - # Maximum number of changes stored in a file. - max_items = 20 - - def __init__(self, filename): - self.filename = filename - self._read_document() - self.modified = False - - def save(self): - if not self.modified: - return - - self._trim_to_max_items() - - fd = open(self.filename, 'w') - self.document.writexml(fd, encoding="UTF-8") - fd.close() - - def add_file(self, file): - change = self._change("file%s-added-to-issue%s" % (file.id, file.issue_id), - "file-added") - - change.appendChild(self._element_with_text("file-id", file.id)) - change.appendChild(self._element_with_text("file-name", file.name)) - change.appendChild(self._element_with_text("file-type", file.type)) - change.appendChild(self._element_with_text("file-url", file.download_url)) - change.appendChild(self._element_with_text("issue-id", file.issue_id)) - - self.root.appendChild(change) - self.modified = True - - def add_files(self, files): - for file in files: - self.add_file(file) - - def _change(self, id, type): - """Return new 'change' element of a given type. - <change id='id' date='now' type='type'></change> - """ - change = self.document.createElement("change") - change.setAttribute("id", id) - change.setAttribute("type", type) - change.setAttribute("date", rfc2822_date()) - return change - - def _element_with_text(self, name, value): - """Return new element with given name and text node as a value. - <name>value</name> - """ - element = self.document.createElement(name) - text = self.document.createTextNode(str(value)) - element.appendChild(text) - return element - - def _trim_to_max_items(self): - """Remove changes exceeding self.max_items. - """ - # Assumes that changes are stored sequentially from oldest to newest. - # Will do for now. - for change in self.root.getElementsByTagName("change")[0:-self.max_items]: - self.root.removeChild(change) - - def _read_document(self): - try: - self.document = minidom.parse(self.filename) - self.root = self.document.firstChild - except IOError, e: - # File not found, create a new one then. - if e.errno != 2: - raise - self._create_new_document() - except ExpatError: - # File has been damaged, forget about it and create a new one. - self._create_new_document() - - def _create_new_document(self): - self.document = minidom.Document() - self.root = self.document.createElement("changes") - self.document.appendChild(self.root) - -def get_new_files_ids(issue_now, issue_then): - """Return ids of files added between `now` and `then`. - """ - files_now = set(issue_now['files']) - files_then = set(issue_then['files']) if issue_then else set() - return map(int, files_now - files_then) - -def file_added_to_issue(db, cl, issue_id, olddata): - try: - changes = ChangesXml(changes_xml_path(db)) - issue = db.issue.getnode(issue_id) - new_files = [ File(db, id, issue_id) for id in get_new_files_ids(issue, olddata) ] - - changes.add_files(new_files) - changes.save() - except: - # We can't mess up with a database commit. - pass - - -def init(db): - db.issue.react('create', file_added_to_issue) - db.issue.react('set', file_added_to_issue)

1 0

r56597 - tracker/instances/python-dev/detectors/changes_xml_writer.py
by erik.forsberg July 27, 2007

July 27, 2007

Author: erik.forsberg Date: Sat Jul 28 01:13:59 2007 New Revision: 56597 Added: tracker/instances/python-dev/detectors/changes_xml_writer.py Log: Adding recent_changes write as requested in http://psf.upfronthosting.co.za/roundup/meta/issue118 Added: tracker/instances/python-dev/detectors/changes_xml_writer.py ============================================================================== --- (empty file) +++ tracker/instances/python-dev/detectors/changes_xml_writer.py Sat Jul 28 01:13:59 2007 @@ -0,0 +1,191 @@ +# +# changes.xml writer detector. +# +# Copyright (c) 2007 Michal Kwiatkowski <constant.beta(a)gmail.com> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the name of the author nor the names of his contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +"""changes.xml writer detector -- save each database change to an XML file. + +Root element is called `changes` and it has at most `ChangesXml.max_items` +children, each called a `change`. Each `change` has the following attributes: + +:date: date in RFC2822 format when the change was made +:id: unique identifier of this change (note: not an integer) +:type: type of this change (see below) + +A structure of a `change` depends on its `type`. Currently implemented +change types and their formats are listed below. + +* type = `file-added` + + Describes a new file attached to an existing issue. Child elements: + + :file-id: unique integer identifier of the file + :file-name: name of the uploaded file + :file-type: MIME type of the file content + :file-url: permanent URL of the file + :issue-id: unique integer identifier of an issue this file is attached to +""" + +import os +import urllib +from xml.dom import minidom +from xml.parsers.expat import ExpatError +from time import gmtime, strftime + +# Relative to tracker home directory. +FILENAME = os.path.join('%(TEMPLATES)s', 'recent-changes.xml') + + +def tracker_url(db): + return str(db.config.options[('tracker', 'web')]) + +def changes_xml_path(db): + return os.path.join(db.config.HOME, FILENAME % db.config.options) + +def rfc2822_date(): + return strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime()) + +class File(object): + def __init__(self, db, id, issue_id): + self.db = db + self.id = id + self.issue_id = issue_id + + self.name = db.file.get(id, 'name') + self.type = db.file.get(id, 'type') + # Based on roundup.cgi.templating._HTMLItem.download_url(). + self.download_url = tracker_url(self.db) +\ + urllib.quote('%s%s/%s' % ('file', self.id, self.name)) + +class ChangesXml(object): + # Maximum number of changes stored in a file. + max_items = 20 + + def __init__(self, filename): + self.filename = filename + self._read_document() + self.modified = False + + def save(self): + if not self.modified: + return + + self._trim_to_max_items() + + fd = open(self.filename, 'w') + self.document.writexml(fd, encoding="UTF-8") + fd.close() + + def add_file(self, file): + change = self._change("file%s-added-to-issue%s" % (file.id, file.issue_id), + "file-added") + + change.appendChild(self._element_with_text("file-id", file.id)) + change.appendChild(self._element_with_text("file-name", file.name)) + change.appendChild(self._element_with_text("file-type", file.type)) + change.appendChild(self._element_with_text("file-url", file.download_url)) + change.appendChild(self._element_with_text("issue-id", file.issue_id)) + + self.root.appendChild(change) + self.modified = True + + def add_files(self, files): + for file in files: + self.add_file(file) + + def _change(self, id, type): + """Return new 'change' element of a given type. + <change id='id' date='now' type='type'></change> + """ + change = self.document.createElement("change") + change.setAttribute("id", id) + change.setAttribute("type", type) + change.setAttribute("date", rfc2822_date()) + return change + + def _element_with_text(self, name, value): + """Return new element with given name and text node as a value. + <name>value</name> + """ + element = self.document.createElement(name) + text = self.document.createTextNode(str(value)) + element.appendChild(text) + return element + + def _trim_to_max_items(self): + """Remove changes exceeding self.max_items. + """ + # Assumes that changes are stored sequentially from oldest to newest. + # Will do for now. + for change in self.root.getElementsByTagName("change")[0:-self.max_items]: + self.root.removeChild(change) + + def _read_document(self): + try: + self.document = minidom.parse(self.filename) + self.root = self.document.firstChild + except IOError, e: + # File not found, create a new one then. + if e.errno != 2: + raise + self._create_new_document() + except ExpatError: + # File has been damaged, forget about it and create a new one. + self._create_new_document() + + def _create_new_document(self): + self.document = minidom.Document() + self.root = self.document.createElement("changes") + self.document.appendChild(self.root) + +def get_new_files_ids(issue_now, issue_then): + """Return ids of files added between `now` and `then`. + """ + files_now = set(issue_now['files']) + files_then = set(issue_then['files']) if issue_then else set() + return map(int, files_now - files_then) + +def file_added_to_issue(db, cl, issue_id, olddata): + try: + changes = ChangesXml(changes_xml_path(db)) + issue = db.issue.getnode(issue_id) + new_files = [ File(db, id, issue_id) for id in get_new_files_ids(issue, olddata) ] + + changes.add_files(new_files) + changes.save() + except: + # We can't mess up with a database commit. + pass + + +def init(db): + db.issue.react('create', file_added_to_issue) + db.issue.react('set', file_added_to_issue)

1 0

r56596 - tracker/instances/meta/schema.py
by erik.forsberg July 27, 2007

July 27, 2007

Author: erik.forsberg Date: Sat Jul 28 00:05:35 2007 New Revision: 56596 Modified: tracker/instances/meta/schema.py Log: Simplify security settings for 'file' and 'msg'. Modified: tracker/instances/meta/schema.py ============================================================================== --- tracker/instances/meta/schema.py (original) +++ tracker/instances/meta/schema.py Sat Jul 28 00:05:35 2007 @@ -201,13 +201,6 @@ )) db.security.addPermissionToRole('Anonymous', p) - db.security.addPermissionToRole('User', p) - - p = db.security.addPermission(name='View', klass=cl, - description="Allowed to see content of object regardless of spam status", - properties = ('content', 'summary')) - - db.security.addPermissionToRole('User', p) spamcheck = db.security.addPermission(name='View', klass=cl, description="allowed to see metadata of file object regardless of spam status",

1 0

r56595 - in tracker/instances/meta: html/file.item.html html/issue.item.html html/msg.item.html schema.py
by erik.forsberg July 27, 2007

July 27, 2007

Author: erik.forsberg Date: Fri Jul 27 22:48:26 2007 New Revision: 56595 Modified: tracker/instances/meta/html/file.item.html tracker/instances/meta/html/issue.item.html tracker/instances/meta/html/msg.item.html tracker/instances/meta/schema.py Log: Use roundup's security system for spambayes integration security. Modified: tracker/instances/meta/html/file.item.html ============================================================================== --- tracker/instances/meta/html/file.item.html (original) +++ tracker/instances/meta/html/file.item.html Fri Jul 27 22:48:26 2007 @@ -55,11 +55,11 @@ <p tal:condition="python:utils.sb_is_spam(context)" class="error-message"> File has been classified as spam.</p> -<a tal:condition="python:context.id and utils.sb_is_view_ok(context)" +<a tal:condition="python:context.id and context.content.is_view_ok()" tal:attributes="href string:file${context/id}/${context/name}" i18n:translate="">download</a> -<p tal:condition="python:context.id and not utils.sb_is_view_ok(context)"> +<p tal:condition="python:context.id and not context.content.is_view_ok()"> Files classified as spam are not available for download by unathorized users. If you think the file has been misclassified, please login and click on the button for reclassification. @@ -69,7 +69,7 @@ <form method="POST" onSubmit="return submit_once()" enctype="multipart/form-data" tal:attributes="action context/designator" - tal:condition="python:utils.sb_may_classify(context)"> + tal:condition="python:request.user.hasPermission('SB: May Classify')"> <input type="hidden" name="@action" value="spambayes_classify"> <input type="submit" name="trainspam" value="Mark as SPAM" i18n:attributes="value"> Modified: tracker/instances/meta/html/issue.item.html ============================================================================== --- tracker/instances/meta/html/issue.item.html (original) +++ tracker/instances/meta/html/issue.item.html Fri Jul 27 22:48:26 2007 @@ -186,7 +186,7 @@ tal:condition="python:utils.sb_is_spam(msg)"> Message has been classified as spam. </p> - <pre tal:condition="python:utils.sb_is_view_ok(msg)" + <pre tal:condition="python:msg.content.is_view_ok()" tal:content="structure msg/content/hyperlinked">content</pre> </td> </tr> Modified: tracker/instances/meta/html/msg.item.html ============================================================================== --- tracker/instances/meta/html/msg.item.html (original) +++ tracker/instances/meta/html/msg.item.html Fri Jul 27 22:48:26 2007 @@ -66,7 +66,7 @@ <table class="messages"> <tr><th colspan=2 class="header" i18n:translate="">Content</th></tr> - <th class="header" tal:condition="python:utils.sb_may_classify(context)"> + <th class="header" tal:condition="python:request.user.hasPermission('SB: May Classify')"> <form method="POST" onSubmit="return submit_once()" enctype="multipart/form-data" tal:attributes="action context/designator"> @@ -78,10 +78,10 @@ </th> <tr> <td class="content" colspan=2 - tal:condition="python:utils.sb_is_view_ok(context)"><pre + tal:condition="python:context.content.is_view_ok()"><pre tal:content="structure context/content/hyperlinked"></pre></td> <td class="content" colspan=2 - tal:condition="python:not utils.sb_is_view_ok(context)"> + tal:condition="python:not context.content.is_view_ok()"> Message has been classified as spam and is therefore not available to unathorized users. If you think this is incorrect, please login and report the message as being Modified: tracker/instances/meta/schema.py ============================================================================== --- tracker/instances/meta/schema.py (original) +++ tracker/instances/meta/schema.py Fri Jul 27 22:48:26 2007 @@ -87,6 +87,11 @@ db.security.addRole(name='Coordinator', description='A coordinator') +db.security.addPermission(name="SB: May Classify") +db.security.addPermission(name="SB: May Report Misclassified") + +db.security.addPermissionToRole('Coordinator', 'SB: May Classify') + # # REGULAR USERS # @@ -178,9 +183,7 @@ return True if score > cutoff_score: - roles = set(db.user.get(userid, "roles").lower().split(",")) - allowed = set(db.config.detectors['SPAMBAYES_MAY_VIEW_SPAM'].lower().split(",")) - return bool(roles.intersection(allowed)) + return False return True @@ -198,6 +201,13 @@ )) db.security.addPermissionToRole('Anonymous', p) + db.security.addPermissionToRole('User', p) + + p = db.security.addPermission(name='View', klass=cl, + description="Allowed to see content of object regardless of spam status", + properties = ('content', 'summary')) + + db.security.addPermissionToRole('User', p) spamcheck = db.security.addPermission(name='View', klass=cl, description="allowed to see metadata of file object regardless of spam status",

1 0