SF patch #834015: Remove imports of unused modules
(Contributed by George Yoshida.)
diff --git a/Lib/SimpleXMLRPCServer.py b/Lib/SimpleXMLRPCServer.py
index 8ffa244..fdde60c 100644
--- a/Lib/SimpleXMLRPCServer.py
+++ b/Lib/SimpleXMLRPCServer.py
@@ -104,7 +104,6 @@
import SocketServer
import BaseHTTPServer
import sys
-import types
import os
def resolve_dotted_attribute(obj, attr):
diff --git a/Lib/platform.py b/Lib/platform.py
index 1547e12..31c47b4 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1082,7 +1082,6 @@
"""
global _sys_version_cache
- import time
if _sys_version_cache is not None:
return _sys_version_cache
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 58e8eed..7f907ef 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -10,7 +10,6 @@
for manipulation of the pathname component of URLs.
"""
-import sys
import os
import stat
diff --git a/Lib/trace.py b/Lib/trace.py
index 7f41263..b694c15 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -46,7 +46,6 @@
"""
import linecache
-import marshal
import os
import re
import sys
diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py
index f06cfd7..2466e25 100644
--- a/Lib/xmlrpclib.py
+++ b/Lib/xmlrpclib.py
@@ -109,7 +109,7 @@
ServerProxy Represents a logical connection to an XML-RPC server
- MultiCall Executor of boxcared xmlrpc requests
+ MultiCall Executor of boxcared xmlrpc requests
Boolean boolean wrapper to generate a "boolean" XML-RPC value
DateTime dateTime wrapper for an ISO 8601 string or time tuple or
localtime integer value to generate a "dateTime.iso8601"
@@ -894,7 +894,7 @@
def MultiCallIterator(results):
"""Iterates over the results of a multicall. Exceptions are
thrown in response to xmlrpc faults."""
-
+
for i in results:
if type(i) == type({}):
raise Fault(i['faultCode'], i['faultString'])
@@ -903,7 +903,7 @@
else:
raise ValueError,\
"unexpected type in multicall result"
-
+
class MultiCall:
"""server -> a object used to boxcar method calls
@@ -920,14 +920,14 @@
add_result, address = multicall()
"""
-
+
def __init__(self, server):
self.__server = server
self.__call_list = []
-
+
def __repr__(self):
return "<MultiCall at %x>" % id(self)
-
+
__str__ = __repr__
def __getattr__(self, name):
@@ -939,7 +939,7 @@
marshalled_list.append({'methodName' : name, 'params' : args})
return MultiCallIterator(self.__server.system.multicall(marshalled_list))
-
+
# --------------------------------------------------------------------
# convenience functions
@@ -1071,7 +1071,6 @@
If the XML-RPC packet represents a fault condition, this function
raises a Fault exception.
"""
- import sys
p, u = getparser()
p.feed(data)
p.close()
@@ -1392,7 +1391,7 @@
)
__str__ = __repr__
-
+
def __getattr__(self, name):
# magic method dispatcher
return _Method(self.__request, name)