Merge p3yk branch with the trunk up to revision 45595. This breaks a fair

number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html

Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:

test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec

This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.

1 files changed, 7 insertions, 7 deletions

diff --git a/Lib/xmlcore/dom/expatbuilder.py b/Lib/xmlcore/dom/expatbuilder.py
index 81d9c2b..32ffa41 100644
--- a/Lib/xmlcore/dom/expatbuilder.py
+++ b/Lib/xmlcore/dom/expatbuilder.py
@@ -59,7 +59,7 @@ _typeinfo_map = {
     "NMTOKENS": minidom.TypeInfo(None, "nmtokens"),
     }
 
-class ElementInfo(NewStyle):
+class ElementInfo(object):
     __slots__ = '_attr_info', '_model', 'tagName'
 
     def __init__(self, tagName, model=None):
@@ -460,7 +460,7 @@ class ExpatBuilder:
 # where allowed.
 _ALLOWED_FILTER_RETURNS = (FILTER_ACCEPT, FILTER_REJECT, FILTER_SKIP)
 
-class FilterVisibilityController(NewStyle):
+class FilterVisibilityController(object):
     """Wrapper around a DOMBuilderFilter which implements the checks
     to make the whatToShow filter attribute work."""
 
@@ -518,7 +518,7 @@ class FilterVisibilityController(NewStyle):
         }
 
 
-class FilterCrutch(NewStyle):
+class FilterCrutch(object):
     __slots__ = '_builder', '_level', '_old_start', '_old_end'
 
     def __init__(self, builder):
@@ -908,7 +908,7 @@ class InternalSubsetExtractor(ExpatBuilder):
         raise ParseEscape()
 
 
-def parse(file, namespaces=1):
+def parse(file, namespaces=True):
     """Parse a document, returning the resulting Document node.
 
     'file' may be either a file name or an open file object.
@@ -929,7 +929,7 @@ def parse(file, namespaces=1):
     return result
 
 
-def parseString(string, namespaces=1):
+def parseString(string, namespaces=True):
     """Parse a document from a string, returning the resulting
     Document node.
     """
@@ -940,7 +940,7 @@ def parseString(string, namespaces=1):
     return builder.parseString(string)
 
 
-def parseFragment(file, context, namespaces=1):
+def parseFragment(file, context, namespaces=True):
     """Parse a fragment of a document, given the context from which it
     was originally extracted.  context should be the parent of the
     node(s) which are in the fragment.
@@ -963,7 +963,7 @@ def parseFragment(file, context, namespaces=1):
     return result
 
 
-def parseFragmentString(string, context, namespaces=1):
+def parseFragmentString(string, context, namespaces=True):
     """Parse a fragment of a document from a string, given the context
     from which it was originally extracted.  context should be the
     parent of the node(s) which are in the fragment.