Kaydet (Commit) e29002cc authored tarafından Anthony Baxter's avatar Anthony Baxter

Bug #1469163: SimpleXMLRPCServer unconditionally attempted to import fcntl.

Wrapped in a try/except.
üst 2db15505
......@@ -104,7 +104,11 @@ from xmlrpclib import Fault
import SocketServer
import BaseHTTPServer
import sys
import os, fcntl
import os
try:
import fcntl
except ImportError:
fcntl = None
def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
"""resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
......@@ -493,7 +497,7 @@ class SimpleXMLRPCServer(SocketServer.TCPServer,
# [Bug #1222790] If possible, set close-on-exec flag; if a
# method spawns a subprocess, the subprocess shouldn't have
# the listening socket open.
if hasattr(fcntl, 'FD_CLOEXEC'):
if fcntl is not None and hasattr(fcntl, 'FD_CLOEXEC'):
flags = fcntl.fcntl(self.fileno(), fcntl.F_GETFD)
flags |= fcntl.FD_CLOEXEC
fcntl.fcntl(self.fileno(), fcntl.F_SETFD, flags)
......
......@@ -49,6 +49,9 @@ Extension Modules
Library
-------
- SimpleXMLRPCServer relied on the fcntl module, which is unavailable on
Windows. Bug #1469163.
- The warnings, linecache, inspect, traceback, site, and doctest modules
were updated to work correctly with modules imported from zipfiles or
via other PEP 302 __loader__ objects.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment