← Back to branch summary

~pythonregexp2.7/python/issue2636-12

« back to all changes in this revision

Viewing changes to Lib/SimpleXMLRPCServer.py

  • Committer: Jeffrey C. "The TimeHorse" Jacobs
  • Date: 2008-06-09 14:52:42 UTC
  • mfrom: (39033.1.3 Regexp-2.6)
  • Revision ID: darklord@timehorse.com-20080609145242-9m268zc6u87rp1vp
Merged in changes from the core Regexp branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/SimpleXMLRPCServer.py
101
101
 
102
102
import xmlrpclib
103
103
from xmlrpclib import Fault
104
 
import socketserver
 
104
import SocketServer
105
105
import BaseHTTPServer
106
106
import sys
107
107
import os
512
512
        if self.server.logRequests:
513
513
            BaseHTTPServer.BaseHTTPRequestHandler.log_request(self, code, size)
514
514
 
515
 
class SimpleXMLRPCServer(socketserver.TCPServer,
 
515
class SimpleXMLRPCServer(SocketServer.TCPServer,
516
516
                         SimpleXMLRPCDispatcher):
517
517
    """Simple XML-RPC server.
518
518
 
536
536
        self.logRequests = logRequests
537
537
 
538
538
        SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding)
539
 
        socketserver.TCPServer.__init__(self, addr, requestHandler, bind_and_activate)
 
539
        SocketServer.TCPServer.__init__(self, addr, requestHandler, bind_and_activate)
540
540
 
541
541
        # [Bug #1222790] If possible, set close-on-exec flag; if a
542
542
        # method spawns a subprocess, the subprocess shouldn't have