Mailman 3 March 2006 - Python-checkins

r43505 - python/branches/release24-maint/Modules/posixmodule.c
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 22:27:27 2006 New Revision: 43505 Modified: python/branches/release24-maint/Modules/posixmodule.c Log: Add guards against fcntl() not being available on Windows. (backport from rev. 43504) Modified: python/branches/release24-maint/Modules/posixmodule.c ============================================================================== --- python/branches/release24-maint/Modules/posixmodule.c (original) +++ python/branches/release24-maint/Modules/posixmodule.c Fri Mar 31 22:27:27 2006 @@ -5459,6 +5459,7 @@ return NULL; } Py_BEGIN_ALLOW_THREADS +#if !defined(MS_WINDOWS) && defined(HAVE_FCNTL_H) if (mode[0] == 'a') { /* try to make sure the O_APPEND flag is set */ int flags; @@ -5472,6 +5473,9 @@ } else { fp = fdopen(fd, mode); } +#else + fp = fdopen(fd, mode); +#endif Py_END_ALLOW_THREADS if (fp == NULL) return posix_error();

1 0

r43504 - python/trunk/Modules/posixmodule.c
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 22:27:22 2006 New Revision: 43504 Modified: python/trunk/Modules/posixmodule.c Log: Add guards against fcntl() not being available on Windows. Modified: python/trunk/Modules/posixmodule.c ============================================================================== --- python/trunk/Modules/posixmodule.c (original) +++ python/trunk/Modules/posixmodule.c Fri Mar 31 22:27:22 2006 @@ -5769,6 +5769,7 @@ return NULL; } Py_BEGIN_ALLOW_THREADS +#if !defined(MS_WINDOWS) && defined(HAVE_FCNTL_H) if (mode[0] == 'a') { /* try to make sure the O_APPEND flag is set */ int flags; @@ -5782,6 +5783,9 @@ } else { fp = fdopen(fd, mode); } +#else + fp = fdopen(fd, mode); +#endif Py_END_ALLOW_THREADS if (fp == NULL) return posix_error();

1 0

buildbot failure in x86 XP-2 trunk
by buildbot＠python.org March 31, 2006

March 31, 2006

The Buildbot has detected a new failure of x86 XP-2 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP-2%20trunk/builds/152 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl BUILD FAILED: failed compile sincerely, -The Buildbot

1 0

buildbot failure in x86 W2k trunk
by buildbot＠python.org March 31, 2006

March 31, 2006

The Buildbot has detected a new failure of x86 W2k trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20W2k%20trunk/builds/225 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl BUILD FAILED: failed compile sincerely, -The Buildbot

1 0

r43503 - python/trunk/Lib/urllib2.py
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 22:02:40 2006 New Revision: 43503 Modified: python/trunk/Lib/urllib2.py Log: Update version number to 2.5 Modified: python/trunk/Lib/urllib2.py ============================================================================== --- python/trunk/Lib/urllib2.py (original) +++ python/trunk/Lib/urllib2.py Fri Mar 31 22:02:40 2006 @@ -119,7 +119,7 @@ # support for FileHandler, proxies via environment variables from urllib import localhost, url2pathname, getproxies -__version__ = "2.4" +__version__ = "2.5" _opener = None def urlopen(url, data=None):

1 0

r43502 - python/branches/release24-maint/Modules/posixmodule.c
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 22:00:15 2006 New Revision: 43502 Modified: python/branches/release24-maint/Modules/posixmodule.c Log: bug #1461855: make os.fdopen() add the O_APPEND flag if using "a" mode. glibc, for example, does this already on its own, but it seems that the solaris libc doesn't. This leads to Python code being able to over- write file contents even though having specified "a" mode. (backport from rev. 43501) Modified: python/branches/release24-maint/Modules/posixmodule.c ============================================================================== --- python/branches/release24-maint/Modules/posixmodule.c (original) +++ python/branches/release24-maint/Modules/posixmodule.c Fri Mar 31 22:00:15 2006 @@ -5458,9 +5458,20 @@ "invalid file mode '%s'", mode); return NULL; } - Py_BEGIN_ALLOW_THREADS - fp = fdopen(fd, mode); + if (mode[0] == 'a') { + /* try to make sure the O_APPEND flag is set */ + int flags; + flags = fcntl(fd, F_GETFL); + if (flags != -1) + fcntl(fd, F_SETFL, flags | O_APPEND); + fp = fdopen(fd, mode); + if (fp == NULL) + /* restore old mode if fdopen failed */ + fcntl(fd, F_SETFL, flags); + } else { + fp = fdopen(fd, mode); + } Py_END_ALLOW_THREADS if (fp == NULL) return posix_error();

1 0

r43501 - python/trunk/Modules/posixmodule.c
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 22:00:11 2006 New Revision: 43501 Modified: python/trunk/Modules/posixmodule.c Log: bug #1461855: make os.fdopen() add the O_APPEND flag if using "a" mode. glibc, for example, does this already on its own, but it seems that the solaris libc doesn't. This leads to Python code being able to over- write file contents even though having specified "a" mode. Modified: python/trunk/Modules/posixmodule.c ============================================================================== --- python/trunk/Modules/posixmodule.c (original) +++ python/trunk/Modules/posixmodule.c Fri Mar 31 22:00:11 2006 @@ -5768,9 +5768,20 @@ "invalid file mode '%s'", mode); return NULL; } - Py_BEGIN_ALLOW_THREADS - fp = fdopen(fd, mode); + if (mode[0] == 'a') { + /* try to make sure the O_APPEND flag is set */ + int flags; + flags = fcntl(fd, F_GETFL); + if (flags != -1) + fcntl(fd, F_SETFL, flags | O_APPEND); + fp = fdopen(fd, mode); + if (fp == NULL) + /* restore old mode if fdopen failed */ + fcntl(fd, F_SETFL, flags); + } else { + fp = fdopen(fd, mode); + } Py_END_ALLOW_THREADS if (fp == NULL) return posix_error();

1 0

buildbot warnings in alpha Tru64 5.1 2.4
by buildbot＠python.org March 31, 2006

March 31, 2006

The Buildbot has detected a new failure of alpha Tru64 5.1 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/alpha%20Tru64%205.1%202.4/builds/6 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: georg.brandl Build Had Warnings: warnings test sincerely, -The Buildbot

1 0

r43500 - python/branches/release24-maint/Lib/smtplib.py
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 21:34:17 2006 New Revision: 43500 Modified: python/branches/release24-maint/Lib/smtplib.py Log: bug #1257988: don't bail out on gethostbyname(gethostname()) failure (backport from rev. 43499) Modified: python/branches/release24-maint/Lib/smtplib.py ============================================================================== --- python/branches/release24-maint/Lib/smtplib.py (original) +++ python/branches/release24-maint/Lib/smtplib.py Fri Mar 31 21:34:17 2006 @@ -255,7 +255,11 @@ self.local_hostname = fqdn else: # We can't find an fqdn hostname, so use a domain literal - addr = socket.gethostbyname(socket.gethostname()) + addr = '127.0.0.1' + try: + addr = socket.gethostbyname(socket.gethostname()) + except socket.gaierror: + pass self.local_hostname = '[%s]' % addr def set_debuglevel(self, debuglevel):

1 0

r43499 - python/trunk/Lib/smtplib.py
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 21:34:13 2006 New Revision: 43499 Modified: python/trunk/Lib/smtplib.py Log: bug #1257988: don't bail out on gethostbyname(gethostname()) failure Modified: python/trunk/Lib/smtplib.py ============================================================================== --- python/trunk/Lib/smtplib.py (original) +++ python/trunk/Lib/smtplib.py Fri Mar 31 21:34:13 2006 @@ -255,7 +255,11 @@ self.local_hostname = fqdn else: # We can't find an fqdn hostname, so use a domain literal - addr = socket.gethostbyname(socket.gethostname()) + addr = '127.0.0.1' + try: + addr = socket.gethostbyname(socket.gethostname()) + except socket.gaierror: + pass self.local_hostname = '[%s]' % addr def set_debuglevel(self, debuglevel):

1 0