Index: Lib/xmlrpclib.py =================================================================== --- Lib/xmlrpclib.py (revision 57004) +++ Lib/xmlrpclib.py (working copy) @@ -458,20 +458,6 @@ # -------------------------------------------------------------------- # XML parsers -try: - # optional xmlrpclib accelerator - import _xmlrpclib - FastParser = _xmlrpclib.Parser - FastUnmarshaller = _xmlrpclib.Unmarshaller -except (AttributeError, ImportError): - FastParser = FastUnmarshaller = None - -try: - import _xmlrpclib - FastMarshaller = _xmlrpclib.Marshaller -except (AttributeError, ImportError): - FastMarshaller = None - # # the SGMLOP parser is about 15x faster than Python's builtin # XML parser. SGMLOP sources can be downloaded from: @@ -1016,23 +1002,15 @@ """ if use_datetime and not datetime: raise ValueError, "the datetime module is not available" - if FastParser and FastUnmarshaller: - if use_datetime: - mkdatetime = _datetime_type - else: - mkdatetime = _datetime - target = FastUnmarshaller(True, False, _binary, mkdatetime, Fault) - parser = FastParser(target) + + target = Unmarshaller(use_datetime=use_datetime) + if SgmlopParser: + parser = SgmlopParser(target) + elif ExpatParser: + parser = ExpatParser(target) else: - target = Unmarshaller(use_datetime=use_datetime) - if FastParser: - parser = FastParser(target) - elif SgmlopParser: - parser = SgmlopParser(target) - elif ExpatParser: - parser = ExpatParser(target) - else: - parser = SlowParser(target) + parser = SlowParser(target) + return parser, target ## @@ -1082,11 +1060,7 @@ if not encoding: encoding = "utf-8" - if FastMarshaller: - m = FastMarshaller(encoding) - else: - m = Marshaller(encoding, allow_none) - + m = Marshaller(encoding, allow_none) data = m.dumps(params) if encoding != "utf-8":