Mailman 3 August 2005 - Python-checkins

python/dist/src/Doc/whatsnew whatsnew25.tex, 1.15, 1.16
by akuchling＠users.sourceforge.net 02 Aug '05

02 Aug '05

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23280 Modified Files: whatsnew25.tex Log Message: Add example Index: whatsnew25.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew25.tex,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- whatsnew25.tex 2 Aug 2005 17:13:21 -0000 1.15 +++ whatsnew25.tex 2 Aug 2005 17:20:36 -0000 1.16 @@ -60,9 +60,21 @@ server_log = functional.partial(log, subsystem='server') \end{verbatim} -Here's another example, from a program that uses PyGTk. +Here's another example, from a program that uses PyGTk. Here a +context-sensitive pop-up menu is being constructed dynamically. The +callback provided for the menu option is a partially applied version +of the \method{open_item()} method, where the first argument has been +provided. -% XXX add example from my GTk programming +\begin{verbatim} +... +class Application: + def open_item(self, path): + ... + def init (self): + open_func = functional.partial(self.open_item, item_path) + popup_menu.append( ("Open", open_func, 1) ) +\end{verbatim} \begin{seealso}

1 0

python/dist/src/Doc/whatsnew whatsnew25.tex, 1.14, 1.15
by akuchling＠users.sourceforge.net 02 Aug '05

02 Aug '05

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21649 Modified Files: whatsnew25.tex Log Message: Add note Index: whatsnew25.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew25.tex,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- whatsnew25.tex 22 Jul 2005 18:39:19 -0000 1.14 +++ whatsnew25.tex 2 Aug 2005 17:13:21 -0000 1.15 @@ -100,6 +100,20 @@ %====================================================================== +\section{PEP 342: New Generator Features} + +XXX write this section + +\begin{seealso} + +\seepep{342}{Coroutines via Enhanced Generators}{PEP written by +Guido van Rossum and Phillip J. Eby; +implemented by Phillip J. Eby.} + +\end{seealso} + + +%====================================================================== \section{Other Language Changes} Here are all of the changes that Python 2.5 makes to the core Python

1 0

python/nondist/sandbox/path path.py,1.8,1.9
by birkenfeld＠users.sourceforge.net 02 Aug '05

02 Aug '05

Update of /cvsroot/python/python/nondist/sandbox/path In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3627 Modified Files: path.py Log Message: Use self.__class__ instead of hardcoded Path. Index: path.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/path/path.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- path.py 30 Jul 2005 12:14:14 -0000 1.8 +++ path.py 2 Aug 2005 13:59:58 -0000 1.9 @@ -59,21 +59,21 @@ The argument can be either a string or an existing Path object. """ if not args: - return Path(os.curdir) + return typ(os.curdir) for arg in args: if not isinstance(arg, basestring): - raise ValueError("Path() arguments must be Path, str or unicode") + raise ValueError("%s() arguments must be Path, str or unicode" % typ.__name__) if len(args) == 1: return _base.__new__(typ, *args) else: - return Path(os.path.join(*args)) + return typ(os.path.join(*args)) # Iterating over a string yields its parts def __iter__(self): return iter(self.parts()) def __repr__(self): - return 'Path(%s)' % repr(_base(self)) + return '%s(%r)' % (self.__class__.__name__, _base(self)) def base(self): return _base(self) @@ -82,12 +82,12 @@ # Caution: this is not a join! def __add__(self, other): if isinstance(other, basestring): - return Path(_base(self) + other) + return self.__class__(_base(self) + other) return NotImplemented def __radd__(self, other): if isinstance(other, basestring): - return Path(other + _base(self)) + return self.__class__(other + _base(self)) return NotImplemented # The / joins paths @@ -98,13 +98,13 @@ # Alternative constructor. - @staticmethod - def cwd(): + @classmethod + def cwd(cls): """ Return the current working directory as a path object. """ if os.path.supports_unicode_filenames: - return Path(os.getcwdu()) + return cls(os.getcwdu()) else: - return Path(os.getcwd()) + return cls(os.getcwd()) # --- Operations which return strings @@ -113,7 +113,7 @@ os.path.basename, None, None, """ The name of this file or directory without the full path. - For example, path('/usr/local/lib/libpython.so').basename == 'libpython.so' + For example, Path('/usr/local/lib/libpython.so').basename == 'libpython.so' """) def _get_namebase(self): @@ -132,8 +132,8 @@ _get_namebase, None, None, """ The same as Path.basename, but with one file extension stripped off. - For example, path('/home/guido/python.tar.gz').basename == 'python.tar.gz', - but path('/home/guido/python.tar.gz').namebase == 'python.tar' + For example, Path('/home/guido/python.tar.gz').basename == 'python.tar.gz', + but Path('/home/guido/python.tar.gz').namebase == 'python.tar' """) ext = property( @@ -149,22 +149,22 @@ # --- Operations which return Path objects def abspath(self): - return Path(os.path.abspath(self)) + return self.__class__(os.path.abspath(self)) def normcase(self): - return Path(os.path.normcase(self)) + return self.__class__(os.path.normcase(self)) def normpath(self): - return Path(os.path.normpath(self)) + return self.__class__(os.path.normpath(self)) def realpath(self): - return Path(os.path.realpath(self)) + return self.__class__(os.path.realpath(self)) def expanduser(self): - return Path(os.path.expanduser(self)) + return self.__class__(os.path.expanduser(self)) def expandvars(self): - return Path(os.path.expandvars(self)) + return self.__class__(os.path.expandvars(self)) def expand(self): """ Clean up a filename by calling expandvars(), @@ -176,7 +176,7 @@ return self.expandvars().expanduser().normpath() def _get_directory(self): - return Path(os.path.dirname(self)) + return self.__class__(os.path.dirname(self)) directory = property( _get_directory, None, None, @@ -198,7 +198,7 @@ def splitpath(self): """ p.splitpath() -> Return (p.directory, p.basename). """ parent, child = os.path.split(self) - return Path(parent), child + return self.__class__(parent), child def splitdrive(self): """ p.splitdrive() -> Return (Path(p.drive), <the rest of p>). @@ -208,7 +208,7 @@ is simply (Path(''), p). This is always the case on Unix. """ drive, rel = os.path.splitdrive(self) - return Path(drive), rel + return self.__class__(drive), rel def splitext(self): """ p.splitext() -> Return (p.stripext(), p.ext). @@ -220,16 +220,16 @@ last path segment. """ filename, ext = os.path.splitext(self) - return Path(filename), ext + return self.__class__(filename), ext if hasattr(os.path, 'splitunc'): def splitunc(self): unc, rest = os.path.splitunc(self) - return Path(unc), rest + return self.__class__(unc), rest def _get_uncshare(self): unc, r = os.path.splitunc(self) - return Path(unc) + return self.__class__(unc) uncshare = property( _get_uncshare, None, None, @@ -241,7 +241,7 @@ character (os.sep) if needed. Returns a new path object. """ - return Path(os.path.join(self, *args)) + return self.__class__(os.path.join(self, *args)) joinpath = joinwith @@ -271,7 +271,7 @@ """ Return this path as a relative path, based from the current working directory. """ - return Path.cwd().relpathto(self) + return self.__class__.cwd().relpathto(self) def relpathto(self, dest): """ Return a relative path from self to dest. @@ -281,7 +281,7 @@ dest.abspath(). """ origin = self.abspath() - dest = Path(dest).abspath() + dest = self.__class__(dest).abspath() orig_list = origin.normcase().parts() # Don't normcase dest! We want to preserve the case. @@ -306,15 +306,15 @@ segments += dest_list[i:] if len(segments) == 0: # If they happen to be identical, use os.curdir. - return Path(os.curdir) + return self.__class__(os.curdir) else: - return Path(os.path.join(*segments)) + return self.__class__(os.path.join(*segments)) # --- Listing, searching, walking, and matching def listdir(self): - return [Path(p) for p in os.listdir(self)] + return [self.__class__(p) for p in os.listdir(self)] def children(self, pattern=None): """ D.children() -> List of items in this directory, @@ -422,7 +422,7 @@ For example, path('/users').glob('*/bin/*') returns a list of all the files users have in their bin directories. """ - return map(Path, glob.glob(self / pattern)) + return map(self.__class__, glob.glob(self / pattern)) # --- Reading or writing an entire file at once. @@ -799,7 +799,7 @@ The result may be an absolute or a relative path. """ - return Path(os.readlink(self)) + return self.__class__(os.readlink(self)) def readlinkabs(self): """ Return the path to which this symbolic link points. @@ -833,4 +833,7 @@ if hasattr(os, 'startfile'): def startfile(self): os.startfile(self) - + + if hasattr(os, 'chdir'): + def chdir(self): + os.chdir(self)

1 0

python/dist/src/Doc/lib libre.tex, 1.112.2.1, 1.112.2.2
by birkenfeld＠users.sourceforge.net 02 Aug '05

02 Aug '05

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31952/Doc/lib Modified Files: Tag: release24-maint libre.tex Log Message: backport [ 1243192 ] Incorrect documentation of re.UNICODE Index: libre.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libre.tex,v retrieving revision 1.112.2.1 retrieving revision 1.112.2.2 diff -u -d -r1.112.2.1 -r1.112.2.2 --- libre.tex 1 Jan 2005 00:34:53 -0000 1.112.2.1 +++ libre.tex 2 Aug 2005 10:30:08 -0000 1.112.2.2 @@ -342,17 +342,33 @@ at the beginning or end of a word. This is just the opposite of {}\code{\e b}, so is also subject to the settings of \code{LOCALE} and \code{UNICODE}. -\item[\code{\e d}]Matches any decimal digit; this is -equivalent to the set \regexp{[0-9]}. +\item[\code{\e d}]When the \constant{UNICODE} flag is not specified, matches +any decimal digit; this is equivalent to the set \regexp{[0-9]}. +With \constant{UNICODE}, it will match whatever is classified as a digit +in the Unicode character properties database. -\item[\code{\e D}]Matches any non-digit character; this is -equivalent to the set \regexp{[{\textasciicircum}0-9]}. +\item[\code{\e D}]When the \constant{UNICODE} flag is not specified, matches +any non-digit character; this is equivalent to the set +\regexp{[{\textasciicircum}0-9]}. With \constant{UNICODE}, it will match +anything other than character marked as digits in the Unicode character +properties database. -\item[\code{\e s}]Matches any whitespace character; this is +\item[\code{\e s}]When the \constant{LOCALE} and \constant{UNICODE} +flags are not specified, matches any whitespace character; this is equivalent to the set \regexp{[ \e t\e n\e r\e f\e v]}. +With \constant{LOCALE}, it will match this set plus whatever characters +are defined as space for the current locale. If \constant{UNICODE} is set, +this will match the characters \regexp{[ \e t\e n\e r\e f\e v]} plus +whatever is classified as space in the Unicode character properties +database. -\item[\code{\e S}]Matches any non-whitespace character; this is -equivalent to the set \regexp{[\textasciicircum\ \e t\e n\e r\e f\e v]}. +\item[\code{\e S}]When the \constant{LOCALE} and \constant{UNICODE} +flags are not specified, matches any non-whitespace character; this is +equivalent to the set \regexp{[\textasciicircum\ \e t\e n\e r\e f\e v]} +With \constant{LOCALE}, it will match any character not in this set, +and not defined as space in the current locale. If \constant{UNICODE} +is set, this will match anything other than \regexp{[ \e t\e n\e r\e f\e v]} +and characters marked as space in the Unicode character properties database. \item[\code{\e w}]When the \constant{LOCALE} and \constant{UNICODE} flags are not specified, matches any alphanumeric character and the @@ -468,8 +484,8 @@ \begin{datadesc}{L} \dataline{LOCALE} -Make \regexp{\e w}, \regexp{\e W}, \regexp{\e b}, and -\regexp{\e B} dependent on the current locale. +Make \regexp{\e w}, \regexp{\e W}, \regexp{\e b}, \regexp{\e B}, +\regexp{\e s} and \regexp{\e S} dependent on the current locale. \end{datadesc} \begin{datadesc}{M} @@ -493,8 +509,9 @@ \begin{datadesc}{U} \dataline{UNICODE} -Make \regexp{\e w}, \regexp{\e W}, \regexp{\e b}, and -\regexp{\e B} dependent on the Unicode character properties database. +Make \regexp{\e w}, \regexp{\e W}, \regexp{\e b}, \regexp{\e B}, +\regexp{\e d}, \regexp{\e D}, \regexp{\e s} and \regexp{\e S} +dependent on the Unicode character properties database. \versionadded{2.0} \end{datadesc}

1 0

python/dist/src/Misc NEWS, 1.1193.2.67, 1.1193.2.68
by birkenfeld＠users.sourceforge.net 02 Aug '05

02 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31952/Misc Modified Files: Tag: release24-maint NEWS Log Message: backport [ 1243192 ] Incorrect documentation of re.UNICODE Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.67 retrieving revision 1.1193.2.68 diff -u -d -r1.1193.2.67 -r1.1193.2.68 --- NEWS 26 Jul 2005 23:59:58 -0000 1.1193.2.67 +++ NEWS 2 Aug 2005 10:30:08 -0000 1.1193.2.68 @@ -98,6 +98,8 @@ Documentation ------------- +- Bug #1243192: re.UNICODE and re.LOCALE affect \d, \D, \s and \S. + - Bug #755617: Document the effects of os.chown() on Windows. - Patch #1180012: The documentation for modulefinder is now in the library reference.

1 0

python/dist/src/Misc NEWS,1.1327,1.1328
by birkenfeld＠users.sourceforge.net 02 Aug '05

02 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31597/Misc Modified Files: NEWS Log Message: [ 1243192 ] Incorrect documentation of re.UNICODE Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1327 retrieving revision 1.1328 diff -u -d -r1.1327 -r1.1328 --- NEWS 31 Jul 2005 01:16:35 -0000 1.1327 +++ NEWS 2 Aug 2005 10:28:04 -0000 1.1328 @@ -433,6 +433,8 @@ Documentation ------------- +- Bug #1243192: re.UNICODE and re.LOCALE affect \d, \D, \s and \S. + - Bug #755617: Document the effects of os.chown() on Windows. - Patch #1180012: The documentation for modulefinder is now in the library reference.

1 0

python/dist/src/Doc/lib libre.tex,1.113,1.114
by birkenfeld＠users.sourceforge.net 02 Aug '05

02 Aug '05

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31597/Doc/lib Modified Files: libre.tex Log Message: [ 1243192 ] Incorrect documentation of re.UNICODE Index: libre.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libre.tex,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- libre.tex 1 Jan 2005 00:28:37 -0000 1.113 +++ libre.tex 2 Aug 2005 10:28:08 -0000 1.114 @@ -342,17 +342,33 @@ at the beginning or end of a word. This is just the opposite of {}\code{\e b}, so is also subject to the settings of \code{LOCALE} and \code{UNICODE}. -\item[\code{\e d}]Matches any decimal digit; this is -equivalent to the set \regexp{[0-9]}. +\item[\code{\e d}]When the \constant{UNICODE} flag is not specified, matches +any decimal digit; this is equivalent to the set \regexp{[0-9]}. +With \constant{UNICODE}, it will match whatever is classified as a digit +in the Unicode character properties database. -\item[\code{\e D}]Matches any non-digit character; this is -equivalent to the set \regexp{[{\textasciicircum}0-9]}. +\item[\code{\e D}]When the \constant{UNICODE} flag is not specified, matches +any non-digit character; this is equivalent to the set +\regexp{[{\textasciicircum}0-9]}. With \constant{UNICODE}, it will match +anything other than character marked as digits in the Unicode character +properties database. -\item[\code{\e s}]Matches any whitespace character; this is +\item[\code{\e s}]When the \constant{LOCALE} and \constant{UNICODE} +flags are not specified, matches any whitespace character; this is equivalent to the set \regexp{[ \e t\e n\e r\e f\e v]}. +With \constant{LOCALE}, it will match this set plus whatever characters +are defined as space for the current locale. If \constant{UNICODE} is set, +this will match the characters \regexp{[ \e t\e n\e r\e f\e v]} plus +whatever is classified as space in the Unicode character properties +database. -\item[\code{\e S}]Matches any non-whitespace character; this is -equivalent to the set \regexp{[\textasciicircum\ \e t\e n\e r\e f\e v]}. +\item[\code{\e S}]When the \constant{LOCALE} and \constant{UNICODE} +flags are not specified, matches any non-whitespace character; this is +equivalent to the set \regexp{[\textasciicircum\ \e t\e n\e r\e f\e v]} +With \constant{LOCALE}, it will match any character not in this set, +and not defined as space in the current locale. If \constant{UNICODE} +is set, this will match anything other than \regexp{[ \e t\e n\e r\e f\e v]} +and characters marked as space in the Unicode character properties database. \item[\code{\e w}]When the \constant{LOCALE} and \constant{UNICODE} flags are not specified, matches any alphanumeric character and the @@ -468,8 +484,8 @@ \begin{datadesc}{L} \dataline{LOCALE} -Make \regexp{\e w}, \regexp{\e W}, \regexp{\e b}, and -\regexp{\e B} dependent on the current locale. +Make \regexp{\e w}, \regexp{\e W}, \regexp{\e b}, \regexp{\e B}, +\regexp{\e s} and \regexp{\e S} dependent on the current locale. \end{datadesc} \begin{datadesc}{M} @@ -493,8 +509,9 @@ \begin{datadesc}{U} \dataline{UNICODE} -Make \regexp{\e w}, \regexp{\e W}, \regexp{\e b}, and -\regexp{\e B} dependent on the Unicode character properties database. +Make \regexp{\e w}, \regexp{\e W}, \regexp{\e b}, \regexp{\e B}, +\regexp{\e d}, \regexp{\e D}, \regexp{\e s} and \regexp{\e S} +dependent on the Unicode character properties database. \versionadded{2.0} \end{datadesc}

1 0

python/nondist/sandbox/mailbox mailbox.py, 1.2, 1.3 test_mailbox.py, 1.2, 1.3 libmailbox.tex, 1.3, 1.4
by gregorykjohnson＠users.sourceforge.net 01 Aug '05

01 Aug '05

Update of /cvsroot/python/python/nondist/sandbox/mailbox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6902 Modified Files: mailbox.py test_mailbox.py libmailbox.tex Log Message: * Implement mbox (needs more tests). * Implement mailbox locking. * Replace flush() on mailboxes with close(). Use close() in tests. * Fix numerous non-portable format assumptions by using os.linesep. * Refactor much test code. Index: mailbox.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/mailbox/mailbox.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mailbox.py 30 Jul 2005 22:49:08 -0000 1.2 +++ mailbox.py 2 Aug 2005 03:49:01 -0000 1.3 @@ -12,6 +12,10 @@ import email.Message import email.Generator import rfc822 +try: + import fnctl +except ImportError: + pass __all__ = [ 'open', 'Mailbox', 'Maildir', 'mbox', 'MH', 'Babyl', 'MMDF', 'Message', 'MaildirMessage', 'mboxMessage', 'MHMessage', @@ -162,8 +166,8 @@ if bad_key: raise KeyError, "No message with key(s)" - def flush(self): - """Write any pending changes to disk.""" + def close(self): + """Close mailbox and write any pending changes to disk.""" raise NotImplementedError, "Method must be implemented by subclass" def _dump_message(self, message, target): @@ -301,8 +305,8 @@ self._refresh() return len(self._toc) - def flush(self): - """Write any pending changes to disk.""" + def close(self): + """Close mailbox and write any pending changes to disk.""" return # Maildir changes are always written immediately. def list_folders(self): @@ -396,6 +400,181 @@ raise KeyError, "No message with key '%s'" % key +class mbox(Mailbox): + """A classic mbox mailbox.""" + + def __init__(self, path, factory=None): + """Initialize an mbox instance.""" + Mailbox.__init__(self, path, factory) + try: + f = file(self._path, 'r+') + except IOError, e: + if e.errno == errno.ENOENT: + f = file(self._path, 'w+') + elif e.errno == errno.EACCES: + f = file(self._path, 'r') + else: + raise + try: + _lock_file(f) + except: + f.close() + raise + self._file = f + self._toc = None + self._next_key = 0 + + def add(self, message): + """Add message and return assigned key.""" + self._lookup() + self._toc[self._next_key] = self._append_message(message) + self._next_key += 1 + return self._next_key - 1 + + def remove(self, key): + """Remove the keyed message; raise KeyError if it doesn't exist.""" + del self._toc[key] + + def __setitem__(self, key, message): + """Replace the keyed message; raise KeyError if it doesn't exist.""" + self._lookup(key) + start, stop = self._append_message(message) + self._toc[key] = (start, stop) + + def get_message(self, key): + start, stop = self._lookup(key) + self._file.seek(start) + from_line = self._file.readline() + msg = mboxMessage(self._file.read(stop - self._file.tell())) + msg.set_from(from_line[5:-1]) + return msg + + def get_string(self, key, from_=False): + """Return a string representation or raise a KeyError.""" + start, stop = self._lookup(key) + self._file.seek(start) + if not from_: + self._file.readline() + return self._file.read(stop - self._file.tell()) + + def get_file(self, key, from_=False): + """Return a file-like representation or raise a KeyError.""" + start, stop = self._lookup(key) + self._file.seek(start) + if not from_: + self._file.readline() + return _PartialFile(self._file, self._file.tell(), stop) + + def iterkeys(self): + """Return an iterator over keys.""" + self._lookup() + for key in self._toc.keys(): + yield key + + def has_key(self, key): + """Return True if the keyed message exists, False otherwise.""" + self._lookup() + return key in self._toc + + def __len__(self): + """Return a count of messages in the mailbox.""" + self._lookup() + return len(self._toc) + + def close(self): + """Close mailbox and write any pending changes to disk.""" + self._lookup() + f = file(self._path + '.tmp', 'w') + try: + new_toc = {} + for key in sorted(self._toc.keys()): + start, stop = self._toc[key] + self._file.seek(start) + if f.tell() != 0: + f.write(os.linesep) + new_start = f.tell() + while True: + buffer = self._file.read(min(4096, + stop - self._file.tell())) + if buffer == '': + break + f.write(buffer) + new_toc[key] = (new_start, f.tell()) + finally: + f.close() + try: + os.rename(self._path + '.tmp', self._path) + except oserror, e: + if e.errno == errno.eexist: + # xxx: is this is the exception Windows raises? + os.remove(self._path) + os.rename(self._path + '.tmp', self._path) + else: + raise + self._file.close() + if os.path.exists(self._path + '.lock'): + os.remove(self._path + '.lock') + + def _generate_toc(self): + """Generate key-to-(start, stop) table of contents.""" + starts, stops = [], [] + self._file.seek(0) + prev_line = '' + while True: + pos = self._file.tell() + line = self._file.readline() + if line[:5] == 'From ': + starts.append(pos) + # The preceeding newline is part of the separator, e.g., + # "\nFrom .*\n", not part of the previous message. Ignore it. + if prev_line != '': + stops.append(pos - len(os.linesep)) + elif line == '': + stops.append(pos) + break + prev_line = line + self._toc = dict(enumerate(zip(starts, stops))) + self._next_key = len(self._toc) + + def _lookup(self, key=None): + """Return (start, stop) for given key, or raise a KeyError.""" + if self._toc is None: + self._generate_toc() + if key is not None: + try: + return self._toc[key] + except IndexError: + raise KeyError, "No message with key '%s'" % key + + def _append_message(self, message): + """Append message to mailbox and return (start, stop) offset.""" + from_line = None + if isinstance(message, str) and message[:5] == 'From ': + newline = message.find(os.linesep) + if newline != -1: + from_line = message[:newline] + message = message[newline + len(os.linesep):] + else: + from_line = message + message = '' + elif isinstance(message, _mboxMMDFMessage): + from_line = 'From ' + message.get_from() + elif isinstance(message, email.Message.Message): + from_line = message.get_unixfrom() + if from_line is None: + from_line = 'From MAILER-DAEMON %s' % \ + time.strftime('%a %b %d %H:%M:%S %Y', time.gmtime()) + self._file.seek(0, 2) + if self._file.tell() == 0: + start = self._file.tell() + self._file.write('%s%s' % (from_line, os.linesep)) + else: + start = self._file.tell() + 1 + self._file.write('%s%s%s' % (os.linesep, from_line, os.linesep)) + self._dump_message(message, self._file) + return (start, self._file.tell()) + + class Message(email.Message.Message): """Message with mailbox-format-specific properties.""" @@ -533,6 +712,7 @@ elif 'Return-Path' in message: # XXX: generate "From " line from Return-Path: and Received: pass + Message.__init__(self, message) def get_from(self): @@ -876,3 +1056,53 @@ class Error(Exception): """Raised for module-specific errors.""" + + +def _lock_file(f): + """Use various means to lock f (f.name should be absolute).""" + if 'fcntl' in globals(): + try: + fcntl.lockf(f, fcntl.LOCK_EX | fcntl.LOCK_NB) + except IOError, e: + if e.errno == errno.EAGAIN: + raise Error, 'Failed to acquire exclusive lock ' \ + 'using lockf: %s' % f.name + elif e.errno == errno.EBADF: + try: + fcntl.lockf(f, fcntl.LOCK_SH | fntl.LOCK_NB) + except IOError, e: + if e.errno == errno.EAGAIN: + raise Error, 'Failed to acquire shared lock ' \ + 'using lockf: %s' % f.name + else: + raise + else: + raise + try: + fcntl.flock(f, fcntl.LOCK_EX | fcntl.LOCK_NB) + except IOError, e: + if e.errno == errno.EWOULDBLOCK: + raise Error, 'Failed to aquire exclusive lock ' \ + 'using flock: %s' % f.name + else: + raise + tmp_name = f.name + '.%s.%s' % (socket.gethostname(), os.getpid()) + try: + file(tmp_name, 'w').close() + except IOError, e: + if e.errno == errno.EACCESS: + pass + else: + raise + else: + try: + if hasattr(os, 'link'): + os.link(tmp_name, f.name + '.lock') + os.unlink(tmp_name) + else: + os.rename(tmp_name, f.name + '.lock') + except OSError, e: + if e.errno == errno.EEXIST: + raise Error, 'Failed to acquire dot lock: %s' % f.name + else: + raise Index: test_mailbox.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/mailbox/test_mailbox.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- test_mailbox.py 30 Jul 2005 22:49:08 -0000 1.2 +++ test_mailbox.py 2 Aug 2005 03:49:01 -0000 1.3 @@ -10,6 +10,7 @@ from test import test_support import unittest import mailbox +import glob class TestBase(unittest.TestCase): @@ -44,191 +45,172 @@ class TestMailbox(TestBase): _factory = None # Overridden by subclasses to reuse tests [...1009 lines suppressed...] +-- +Gregory K. Johnson +""", +"""H4sICM2D1UIAA3RleHQAC8nILFYAokSFktSKEoW0zJxUPa7wzJIMhZLyfIWczLzUYj0uAHTs +3FYlAAAA +""") def test_main(): - test_support.run_unittest(TestMaildir, TestMessage, TestMaildirMessage, - TestMboxMessage, TestMHMessage, TestBabylMessage, - TestMMDFMessage, TestMessageConversion, - TestProxyFile, TestPartialFile) + tests = (TestMaildir, TestMbox, TestMessage, TestMaildirMessage, + TestMboxMessage, TestMHMessage, TestBabylMessage, TestMMDFMessage, + TestMessageConversion, TestProxyFile, TestPartialFile) + test_support.run_unittest(*tests) if __name__ == '__main__': Index: libmailbox.tex =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/mailbox/libmailbox.tex,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- libmailbox.tex 30 Jul 2005 22:49:08 -0000 1.3 +++ libmailbox.tex 2 Aug 2005 03:49:01 -0000 1.4 @@ -242,10 +242,10 @@ are not supported.} \end{methoddesc} -\begin{methoddesc}{flush}{} -Write any pending changes to the filesystem. For some \class{Mailbox} -subclasses, this is done automatically and calling \method{flush()} has no -effect. More specific documentation is provided by each subclass. +\begin{methoddesc}{close}{} +Close the mailbox and write any pending changes to the filesystem. For some +\class{Mailbox} subclasses, changes are written immediately even without +calling this method. \end{methoddesc} @@ -316,9 +316,9 @@ these methods to manipulate the same mailbox simultaneously.} \end{methoddesc} -\begin{methoddesc}{flush}{} -All changes to Maildir mailboxes are immediately applied. This method does -nothing. +\begin{methoddesc}{close}{} +All changes to Maildir mailboxes are immediately applied even without calling +this method. \end{methoddesc} \begin{methoddesc}{get_file}{key} @@ -368,6 +368,9 @@ \begin{seealso} \seelink{http://www.qmail.org/man/man5/mbox.html}{mbox man page from qmail}{A specification of the format and its variations.} + \seelink{http://www.tin.org/bin/man.cgi?section=5\&topic=mbox}{mbox man + page from tin}{Another specification of the format, with details on + locking.} \seelink{http://home.netscape.com/eng/mozilla/2.0/relnotes/demo/content-length.html} {Configuring Netscape Mail on \UNIX{}: Why The Content-Length Format is Bad}{An argument for using the original mbox format rather than a @@ -451,8 +454,9 @@ XXX \end{methoddesc} -\begin{methoddesc}{flush}{} -All changes to MH mailboxes are immediately applied. This method does nothing. +\begin{methoddesc}{close}{} +All changes to MH mailboxes are immediately applied even without calling this +method. \end{methoddesc} \begin{classdesc}{MH}{path\optional{, factory}}

1 0

python/dist/src/Include setobject.h,2.7,2.8
by rhettinger＠users.sourceforge.net 01 Aug '05

01 Aug '05

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6483/Include Modified Files: setobject.h Log Message: Model set.pop() after dict.popitem(). Index: setobject.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/setobject.h,v retrieving revision 2.7 retrieving revision 2.8 diff -u -d -r2.7 -r2.8 --- setobject.h 1 Aug 2005 21:39:27 -0000 2.7 +++ setobject.h 2 Aug 2005 03:45:16 -0000 2.8 @@ -13,6 +13,10 @@ 1. Unused: key == NULL 2. Active: key != NULL and key != dummy 3. Dummy: key == dummy + +Note: .pop() abuses the hash field of an Unused or Dummy slot to +hold a search finger. The hash field of Unused or Dummy slots has +no meaning otherwise. */ #define PySet_MINSIZE 8

1 0

python/dist/src/Objects setobject.c,1.38,1.39
by rhettinger＠users.sourceforge.net 01 Aug '05

01 Aug '05

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6483/Objects Modified Files: setobject.c Log Message: Model set.pop() after dict.popitem(). Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/setobject.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- setobject.c 1 Aug 2005 21:39:28 -0000 1.38 +++ setobject.c 2 Aug 2005 03:45:14 -0000 1.39 @@ -1508,24 +1508,42 @@ set_pop(PySetObject *so) { PyObject *key; - int pos = 0; - int rv; + register setentry *entry; + register int i = 0; - if (!set_next_internal(so, &pos, &key)) { + assert (PyAnySet_Check(so)); + if (so->used == 0) { PyErr_SetString(PyExc_KeyError, "pop from an empty set"); return NULL; } - Py_INCREF(key); - rv = set_discard_internal(so, key); - if (rv == -1) { - Py_DECREF(key); - return NULL; - } else if (rv == DISCARD_NOTFOUND) { - Py_DECREF(key); - PyErr_SetObject(PyExc_KeyError, key); - return NULL; + /* Set entry to "the first" unused or dummy set entry. We abuse + * the hash field of slot 0 to hold a search finger: + * If slot 0 has a value, use slot 0. + * Else slot 0 is being used to hold a search finger, + * and we use its hash value as the first index to look. + */ + entry = &so->table[0]; + if (entry->key == NULL || entry->key == dummy) { + i = (int)entry->hash; + /* The hash field may be a real hash value, or it may be a + * legit search finger, or it may be a once-legit search + * finger that's out of bounds now because it wrapped around + * or the table shrunk -- simply make sure it's in bounds now. + */ + if (i > so->mask || i < 1) + i = 1; /* skip slot 0 */ + while ((entry = &so->table[i])->key == NULL || entry->key==dummy) { + i++; + if (i > so->mask) + i = 1; + } } + key = entry->key; + Py_INCREF(dummy); + entry->key = dummy; + so->used--; + so->table[0].hash = i + 1; /* next place to start */ return key; }

1 0