Use more string methods, remove import string
diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py
index 085f0eb..cb2c4d2 100644
--- a/Lib/xml/dom/minidom.py
+++ b/Lib/xml/dom/minidom.py
@@ -14,10 +14,6 @@
* SAX 2 namespaces
"""
-import string
-_string = string
-del string
-
from xml.dom import HierarchyRequestErr, EMPTY_NAMESPACE
# localize the types, and allow support for Unicode values if available:
@@ -284,11 +280,10 @@
def _write_data(writer, data):
"Writes datachars to writer."
- replace = _string.replace
- data = replace(data, "&", "&")
- data = replace(data, "<", "<")
- data = replace(data, "\"", """)
- data = replace(data, ">", ">")
+ data = data.replace("&", "&")
+ data = data.replace("<", "<")
+ data = data.replace("\"", """)
+ data = data.replace(">", ">")
writer.write(data)
def _getElementsByTagNameHelper(parent, name, rc):
@@ -758,7 +753,7 @@
def _nssplit(qualifiedName):
- fields = _string.split(qualifiedName, ':', 1)
+ fields = qualifiedName.split(':', 1)
if len(fields) == 2:
return fields
elif len(fields) == 1:
@@ -787,7 +782,7 @@
def hasFeature(self, feature, version):
if version not in ("1.0", "2.0"):
return 0
- feature = _string.lower(feature)
+ feature = feature.lower()
return feature == "core"
def createDocument(self, namespaceURI, qualifiedName, doctype):
diff --git a/Lib/xml/sax/__init__.py b/Lib/xml/sax/__init__.py
index f119d84..6b1b1ba 100644
--- a/Lib/xml/sax/__init__.py
+++ b/Lib/xml/sax/__init__.py
@@ -58,14 +58,14 @@
if _false:
import xml.sax.expatreader
-import os, string, sys
+import os, sys
if os.environ.has_key("PY_SAX_PARSER"):
- default_parser_list = string.split(os.environ["PY_SAX_PARSER"], ",")
+ default_parser_list = os.environ["PY_SAX_PARSER"].split(",")
del os
_key = "python.xml.sax.parser"
if sys.platform[:4] == "java" and sys.registry.containsKey(_key):
- default_parser_list = string.split(sys.registry.getProperty(_key), ",")
+ default_parser_list = sys.registry.getProperty(_key).split(",")
def make_parser(parser_list = []):
diff --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py
index d641c19..e541824 100644
--- a/Lib/xml/sax/expatreader.py
+++ b/Lib/xml/sax/expatreader.py
@@ -25,7 +25,6 @@
AttributesImpl = xmlreader.AttributesImpl
AttributesNSImpl = xmlreader.AttributesNSImpl
-import string
import weakref
# --- ExpatLocator
@@ -220,7 +219,7 @@
self._cont_handler.endElement(name)
def start_element_ns(self, name, attrs):
- pair = string.split(name)
+ pair = name.split()
if len(pair) == 1:
pair = (None, name)
else:
@@ -228,7 +227,7 @@
newattrs = {}
for (aname, value) in attrs.items():
- apair = string.split(aname)
+ apair = aname.split()
if len(apair) == 1:
apair = (None, aname)
else:
@@ -240,7 +239,7 @@
AttributesNSImpl(newattrs, {}))
def end_element_ns(self, name):
- pair = string.split(name)
+ pair = name.split()
if len(pair) == 1:
pair = (None, name)
else: