[Python-checkins] r45305 - in python/trunk: Lib/SimpleXMLRPCServer.py Misc/NEWS (original) (raw)
anthony.baxter python-checkins at python.org
Wed Apr 12 14:07:32 CEST 2006
- Previous message: [Python-checkins] r45304 - python/branches/release24-maint/Modules/socketmodule.c
- Next message: [Python-checkins] buildbot failure in x86 cygwin trunk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: anthony.baxter Date: Wed Apr 12 14:07:31 2006 New Revision: 45305
Modified: python/trunk/Lib/SimpleXMLRPCServer.py python/trunk/Misc/NEWS Log: Bug #1469163: SimpleXMLRPCServer unconditionally attempted to import fcntl. Wrapped in a try/except.
Modified: python/trunk/Lib/SimpleXMLRPCServer.py
--- python/trunk/Lib/SimpleXMLRPCServer.py (original) +++ python/trunk/Lib/SimpleXMLRPCServer.py Wed Apr 12 14:07:31 2006 @@ -104,7 +104,11 @@ 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 @@ # [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)
Modified: python/trunk/Misc/NEWS
--- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Wed Apr 12 14:07:31 2006 @@ -49,6 +49,9 @@ 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.
- Previous message: [Python-checkins] r45304 - python/branches/release24-maint/Modules/socketmodule.c
- Next message: [Python-checkins] buildbot failure in x86 cygwin trunk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]