[svn] commit: r3167 - in /branches/trac352/src: bin/cmdctl/cmdctl.py.in lib/python/isc/utils/serve_mixin.py
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Oct 11 02:27:09 UTC 2010
Author: jinmei
Date: Mon Oct 11 02:27:09 2010
New Revision: 3167
Log:
cosmetic: removed redundant white spaces after EOL
Modified:
branches/trac352/src/bin/cmdctl/cmdctl.py.in (contents, props changed)
branches/trac352/src/lib/python/isc/utils/serve_mixin.py
Modified: branches/trac352/src/bin/cmdctl/cmdctl.py.in
==============================================================================
--- branches/trac352/src/bin/cmdctl/cmdctl.py.in (original)
+++ branches/trac352/src/bin/cmdctl/cmdctl.py.in Mon Oct 11 02:27:09 2010
@@ -441,8 +441,8 @@
return (keyfile, certfile, accountsfile)
-class SecureHTTPServer(serve_mixin.ServeMixIn,
- socketserver.ThreadingMixIn,
+class SecureHTTPServer(serve_mixin.ServeMixIn,
+ socketserver.ThreadingMixIn,
http.server.HTTPServer):
'''Make the server address can be reused.'''
allow_reuse_address = True
Modified: branches/trac352/src/lib/python/isc/utils/serve_mixin.py
==============================================================================
--- branches/trac352/src/lib/python/isc/utils/serve_mixin.py (original)
+++ branches/trac352/src/lib/python/isc/utils/serve_mixin.py Mon Oct 11 02:27:09 2010
@@ -20,10 +20,10 @@
SOCK_DATA = b'somedata'
class ServeMixIn:
'''Mix-In class to override the function serve_forever()
- and shutdown() in class socketserver.TCPServer.
+ and shutdown() in class socketserver.TCPServer.
ServeMixIn should be used together with socketserver.TCPServer
- or some derived classes of it, and ServeMixIn must be the first
- base class in multiple inheritance, eg. MyClass(ServeMixIn,
+ or some derived classes of it, and ServeMixIn must be the first
+ base class in multiple inheritance, eg. MyClass(ServeMixIn,
socketserver.TCPServer). ServeMixIn.__init__() should be called
explicitely in derived class.
'''
@@ -33,8 +33,8 @@
self.__read_sock, self.__write_sock = socket.socketpair()
def serve_forever(self, poll_interval=0.5):
- ''' Override the serve_forever([poll_interval]) in class
- socketserver.TCPServer. use one socket pair to wake up
+ ''' Override the serve_forever([poll_interval]) in class
+ socketserver.TCPServer. use one socket pair to wake up
the select when shutdown() is called in anther thread.
Note, parameter 'poll_interval' is just used to keep the
interface, it's never used in this function.
@@ -42,7 +42,7 @@
self.__serving = True
self.__is_shut_down.clear()
while self.__serving:
- # block until the self.socket or self.__read_sock is readable
+ # block until the self.socket or self.__read_sock is readable
try:
r, w, e = select.select([self, self.__read_sock], [], [])
except select.error as err:
More information about the bind10-changes
mailing list