← Back to branch summary

~pythonregexp2.7/python/issue2636-12

« back to all changes in this revision

Viewing changes to Lib/BaseHTTPServer.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/BaseHTTPServer.py
74
74
import time
75
75
import socket # For gethostbyaddr()
76
76
import mimetools
77
 
import socketserver
 
77
import SocketServer
78
78
 
79
79
# Default error message template
80
80
DEFAULT_ERROR_MESSAGE = """\
94
94
def _quote_html(html):
95
95
    return html.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
96
96
 
97
 
class HTTPServer(socketserver.TCPServer):
 
97
class HTTPServer(SocketServer.TCPServer):
98
98
 
99
99
    allow_reuse_address = 1    # Seems to make sense in testing environment
100
100
 
101
101
    def server_bind(self):
102
102
        """Override server_bind to store the server name."""
103
 
        socketserver.TCPServer.server_bind(self)
 
103
        SocketServer.TCPServer.server_bind(self)
104
104
        host, port = self.socket.getsockname()[:2]
105
105
        self.server_name = socket.getfqdn(host)
106
106
        self.server_port = port
107
107
 
108
108
 
109
 
class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
 
109
class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
110
110
 
111
111
    """HTTP request handler base class.
112
112