ConflictResolvingTransUndoStorage to ensure that the Full storage
passes the application level conflict resolution tests.  It does!

ConflictResolution helper module.  Specifically,

class Full: add ConflictResolvingStorage to the base classes, so we
magically grow self.tryToResolveConflict().

store(): Keep a flag indicating whether we calculated the object's
pickle data via conflict resolution.  If so, we return the special
marker ResolvedSerial instead of the next available serial number.

Also, in the serial <> oserial clause, try to resolve the conflict
using ConflictResolvingStorage.tryToResolveConflict() and raise a
ConflictError only if that fails (i.e. returns a false value).
Otherwise, the resolution succeeded providing us with the data pickle
to use as the stored object's state.

transactionalUndo(): We need to keep an additional list of actions to
perform on a successful undo.  The first list keeps track of existing
revisions to point the new transaction at, but conflict resolution
provides us with a brand new pickle (or at least, a pickle for which
we've no idea what the lrevid pointer should be).  For those
situations we need to do a CommitLog.write_object() instead of a
CommitLog.write_object_undo() so as to get the new pickle into the
commit log.  Thus, newstates is a list keeping track of conflict
resolved object states, while (the existing) newrevs keeps track of
undo records where we already have the pickle in the database.

Also, in the clause where we raise an UndoError, first
tryToResolveConflict() and only if that fails do we raise the
UndoError.  Should it succeed, we append the record to newstates for
later.

Finally, in the clause were we're replaying the changes into the
commit log (because we now know that all undos will succeed), we first
replay the newrevs entries, then we replay the newstates entries,
making sure we return all the affected oids.

Note: these changes impose no regressions and pass all tests in
ConflictResolvingStorage and ConflictResolvingTransUndoStorage.

This is a module used for backwards-compatibility aliasing.  It potentially makes PythonMethods work with the current trunk, as well as solving some community issues with the import of the Eval class.

define "test" name, used by external code for import.  This potentially makes existing revisions of PythonMethods work ok with the current trunk.

Import the html_quote function from the html_quote module so that modules that depend on the html_quote function being importable from this one don't fail.

New module that has an html_quote function that is imported into both DT_Var and DT_Utils to support older code that depends on the function to be in either place.

parameter string broke the ZScriptHTML_tryParams function.

override the default syslog facility "user"

The color_paragraphs method of DocumentClass attempts to iterate through all the defined paragraph_type methods for each paragraph.  If a paragraph_type method returns anything but None, the colorization has been completed by the paragraph_type method, and we move on.  However, when a paragraph_type cannot be found to colorize a paragraph, we make a copy of the paragraph, and attempt to colorize its children with the color_paragraphs function.  In this case, the DOM-style attributes attached to the original paragraph were lost.  I modified the color_paragraphs method to retain the original paragraph's DOM-style attributes when a colorizer for the paragraph was not found.

be ignored.  This simplifies the logic a bit.

Be more careful about importing setpath.

expressionCompiler is passed in.  Import it when needed.

us any more, but we may need it).

Don't import Products.ParsedXML.

Removed assignment to wordMap that called lexicon.items() in getEntryForObject.  It was a nonsensical call that must have been detritus from the various overhauls done over time.  Also changed two comments to two methods so they properly say what they're doing.  Thanks to Erik Enge for the bugreports.

StructuredTextNG's HTMLClass ordered and unordered list output (for numbered and bulleted items respectively) differed unnecessarily from ClassicStructuredText's HTML output by not inserting a surrounding the list text with a paragraph tag. Both now do surround list text with a paragraph tag.

Specifically,

_loadSerialEx(): New method which is similar to the API method
loadSerial() except that it returns both the pickle and the version
string for the specified oid+serial pair.  This is not a public
method.

loadSerial(): Reimplement in terms of _loadSerialEx() to reduce code
duplication.

iterator(): Public method to return a "transactions iterator".

_nexttxn(): Helper method to return the transaction metadata for the
transaction following the given in the argument.  Raises IndexError if
there is no next transaction.

_alltxnoids(): Helper method to return a list of all the oids modified
in the given transaction.  Note that the Full Berkeley storage has the
implied semantics that if an object is modified more than once in a
transaction, only the last such modification is retained.

Classes _TransactionsIterator, _RecordsIterator, _Record are private
helper classes to support the iterator interface.