Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ce26195

Browse files
avassalottiavassalotti
committed
Renamed the SocketServer module to 'socketserver'.
Merged revisions 63132 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r63132 | alexandre.vassalotti | 2008-05-11 22:11:22 -0400 (Sun, 11 May 2008) | 4 lines Updated all import statements to use the new socketserver module name. Renamed socketserver module in its own documentation. Renamed documentation references. ........
1 parent 6f1e619 commit ce26195

16 files changed

Lines changed: 63 additions & 64 deletions

‎Doc/library/basehttpserver.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Usually, this module isn't used directly, but is used as a basis for building
2121
functioning Web servers. See the :mod:`SimpleHTTPServer` and
2222
:mod:`CGIHTTPServer` modules.
2323

24-
The first class, :class:`HTTPServer`, is a :class:`SocketServer.TCPServer`
24+
The first class, :class:`HTTPServer`, is a :class:`socketserver.TCPServer`
2525
subclass. It creates and listens at the HTTP socket, dispatching the requests
2626
to a handler. Code to create and run the server looks like this::
2727

‎Doc/library/logging.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,17 +1274,17 @@ the receiving end. A simple way of doing this is attaching a
12741274
logger2.warning('Jail zesty vixen who grabbed pay from quack.')
12751275
logger2.error('The five boxing wizards jump quickly.')
12761276

1277-
At the receiving end, you can set up a receiver using the :mod:`SocketServer`
1277+
At the receiving end, you can set up a receiver using the :mod:`socketserver`
12781278
module. Here is a basic working example::
12791279

12801280
import cPickle
12811281
import logging
12821282
import logging.handlers
1283-
import SocketServer
1283+
import socketserver
12841284
import struct
12851285

12861286

1287-
class LogRecordStreamHandler(SocketServer.StreamRequestHandler):
1287+
class LogRecordStreamHandler(socketserver.StreamRequestHandler):
12881288
"""Handler for a streaming logging request.
12891289

12901290
This basically logs the record using whatever logging policy is
@@ -1326,7 +1326,7 @@ module. Here is a basic working example::
13261326
# cycles and network bandwidth!
13271327
logger.handle(record)
13281328

1329-
class LogRecordSocketReceiver(SocketServer.ThreadingTCPServer):
1329+
class LogRecordSocketReceiver(socketserver.ThreadingTCPServer):
13301330
"""simple TCP socket-based logging receiver suitable for testing.
13311331
"""
13321332

@@ -1335,7 +1335,7 @@ module. Here is a basic working example::
13351335
def __init__(self, host='localhost',
13361336
port=logging.handlers.DEFAULT_TCP_LOGGING_PORT,
13371337
handler=LogRecordStreamHandler):
1338-
SocketServer.ThreadingTCPServer.__init__(self, (host, port), handler)
1338+
socketserver.ThreadingTCPServer.__init__(self, (host, port), handler)
13391339
self.abort = 0
13401340
self.timeout = 1
13411341
self.logname = None

‎Doc/library/simplexmlrpcserver.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ XML-RPC servers written in Python. Servers can either be free standing, using
2020
functions that can be called by the XML-RPC protocol. The *requestHandler*
2121
parameter should be a factory for request handler instances; it defaults to
2222
:class:`SimpleXMLRPCRequestHandler`. The *addr* and *requestHandler* parameters
23-
are passed to the :class:`SocketServer.TCPServer` constructor. If *logRequests*
23+
are passed to the :class:`socketserver.TCPServer` constructor. If *logRequests*
2424
is true (the default), requests will be logged; setting this parameter to false
2525
will turn off logging. The *allow_none* and *encoding* parameters are passed
2626
on to :mod:`xmlrpclib` and control the XML-RPC responses that will be returned
@@ -50,7 +50,7 @@ SimpleXMLRPCServer Objects
5050
--------------------------
5151

5252
The :class:`SimpleXMLRPCServer` class is based on
53-
:class:`SocketServer.TCPServer` and provides a means of creating simple, stand
53+
:class:`socketserver.TCPServer` and provides a means of creating simple, stand
5454
alone XML-RPC servers.
5555

5656

‎Doc/library/socket.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ The module :mod:`socket` exports the following constants and functions:
453453

454454
.. seealso::
455455

456-
Module :mod:`SocketServer`
456+
Module :mod:`socketserver`
457457
Classes that simplify writing network servers.
458458

459459

‎Doc/library/socketserver.rst‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11

2-
:mod:`SocketServer` --- A framework for network servers
2+
:mod:`socketserver` --- A framework for network servers
33
=======================================================
44

5-
.. module:: SocketServer
5+
.. module:: socketserver
66
:synopsis: A framework for network servers.
77

8-
9-
The :mod:`SocketServer` module simplifies the task of writing network servers.
8+
The :mod:`socketserver` module simplifies the task of writing network servers.
109

1110
There are four basic server classes: :class:`TCPServer` uses the Internet TCP
1211
protocol, which provides for continuous streams of data between the client and
@@ -213,7 +212,7 @@ server classes like :class:`TCPServer`; these methods aren't useful to external
213212
users of the server object.
214213

215214
.. XXX should the default implementations of these be documented, or should
216-
it be assumed that the user will look at SocketServer.py?
215+
it be assumed that the user will look at socketserver.py?
217216
218217
219218
.. function:: finish_request()

‎Lib/BaseHTTPServer.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
import time
7676
import socket # For gethostbyaddr()
7777
import mimetools
78-
import SocketServer
78+
import socketserver
7979

8080
# Default error message template
8181
DEFAULT_ERROR_MESSAGE = """\
@@ -95,19 +95,19 @@
9595
def _quote_html(html):
9696
return html.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
9797

98-
class HTTPServer(SocketServer.TCPServer):
98+
class HTTPServer(socketserver.TCPServer):
9999

100100
allow_reuse_address = 1 # Seems to make sense in testing environment
101101

102102
def server_bind(self):
103103
"""Override server_bind to store the server name."""
104-
SocketServer.TCPServer.server_bind(self)
104+
socketserver.TCPServer.server_bind(self)
105105
host, port = self.socket.getsockname()[:2]
106106
self.server_name = socket.getfqdn(host)
107107
self.server_port = port
108108

109109

110-
class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
110+
class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
111111

112112
"""HTTP request handler base class.
113113

‎Lib/SimpleXMLRPCServer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def export_add(self, x, y):
100100

101101
import xmlrpclib
102102
from xmlrpclib import Fault
103-
import SocketServer
103+
import socketserver
104104
import BaseHTTPServer
105105
import sys
106106
import os
@@ -494,7 +494,7 @@ def log_request(self, code='-', size='-'):
494494
if self.server.logRequests:
495495
BaseHTTPServer.BaseHTTPRequestHandler.log_request(self, code, size)
496496

497-
class SimpleXMLRPCServer(SocketServer.TCPServer,
497+
class SimpleXMLRPCServer(socketserver.TCPServer,
498498
SimpleXMLRPCDispatcher):
499499
"""Simple XML-RPC server.
500500
@@ -518,7 +518,7 @@ def __init__(self, addr, requestHandler=SimpleXMLRPCRequestHandler,
518518
self.logRequests = logRequests
519519

520520
SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding)
521-
SocketServer.TCPServer.__init__(self, addr, requestHandler, bind_and_activate)
521+
socketserver.TCPServer.__init__(self, addr, requestHandler, bind_and_activate)
522522

523523
# [Bug #1222790] If possible, set close-on-exec flag; if a
524524
# method spawns a subprocess, the subprocess shouldn't have

‎Lib/idlelib/rpc.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
has only one client per server, this was not a limitation.
66
77
+---------------------------------+ +-------------+
8-
| SocketServer.BaseRequestHandler | | SocketIO |
8+
| socketserver.BaseRequestHandler | | SocketIO |
99
+---------------------------------+ +-------------+
1010
^ | register() |
1111
| | unregister()|
@@ -31,7 +31,7 @@
3131
import os
3232
import socket
3333
import select
34-
import SocketServer
34+
import socketserver
3535
import struct
3636
import pickle
3737
import threading
@@ -66,12 +66,12 @@ def pickle_code(co):
6666
BUFSIZE = 8*1024
6767
LOCALHOST = '127.0.0.1'
6868

69-
class RPCServer(SocketServer.TCPServer):
69+
class RPCServer(socketserver.TCPServer):
7070

7171
def __init__(self, addr, handlerclass=None):
7272
if handlerclass is None:
7373
handlerclass = RPCHandler
74-
SocketServer.TCPServer.__init__(self, addr, handlerclass)
74+
socketserver.TCPServer.__init__(self, addr, handlerclass)
7575

7676
def server_bind(self):
7777
"Override TCPServer method, no bind() phase for connecting entity"
@@ -492,18 +492,18 @@ class RemoteProxy(object):
492492
def __init__(self, oid):
493493
self.oid = oid
494494

495-
class RPCHandler(SocketServer.BaseRequestHandler, SocketIO):
495+
class RPCHandler(socketserver.BaseRequestHandler, SocketIO):
496496

497497
debugging = False
498498
location = "#S" # Server
499499

500500
def __init__(self, sock, addr, svr):
501501
svr.current_handler = self ## cgt xxx
502502
SocketIO.__init__(self, sock)
503-
SocketServer.BaseRequestHandler.__init__(self, sock, addr, svr)
503+
socketserver.BaseRequestHandler.__init__(self, sock, addr, svr)
504504

505505
def handle(self):
506-
"handle() method required by SocketServer"
506+
"handle() method required by socketserver"
507507
self.mainloop()
508508

509509
def get_remote_proxy(self, oid):

‎Lib/logging/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
except ImportError:
3333
thread = None
3434

35-
from SocketServer import ThreadingTCPServer, StreamRequestHandler
35+
from socketserver import ThreadingTCPServer, StreamRequestHandler
3636

3737

3838
DEFAULT_LOGGING_CONFIG_PORT = 9030

Lib/SocketServer.py renamed to Lib/socketserver.py

File renamed without changes.

0 commit comments

Comments
 (0)