mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Merged revisions 73995,74002,74005,74007-74008,74011,74019-74023 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73995 | vinay.sajip | 2009-07-13 07:21:05 -0400 (Mon, 13 Jul 2009) | 1 line Issue #6314: logging: Extra checks on the "level" argument in more places. ........ r74002 | marc-andre.lemburg | 2009-07-13 16:23:49 -0400 (Mon, 13 Jul 2009) | 6 lines Use a new global DEV_NULL instead of hard-coding /dev/null into the system command helper functions. See #6479 for some motivation. ........ r74005 | marc-andre.lemburg | 2009-07-13 17:28:33 -0400 (Mon, 13 Jul 2009) | 6 lines Use a different VER command output parser to address the localization issues mentioned in #3410. Prepare for Windows 7 (still commented out). ........ r74007 | michael.foord | 2009-07-14 13:58:12 -0400 (Tue, 14 Jul 2009) | 1 line Move TestRunner initialisation into unittest.TestProgram.runTests. Fixes issue 6418. ........ r74008 | benjamin.peterson | 2009-07-14 20:46:42 -0400 (Tue, 14 Jul 2009) | 1 line update year ........ r74011 | ezio.melotti | 2009-07-15 13:07:04 -0400 (Wed, 15 Jul 2009) | 1 line methods' names pep8ification ........ r74019 | amaury.forgeotdarc | 2009-07-15 17:29:27 -0400 (Wed, 15 Jul 2009) | 2 lines #6076 Add a title to the IDLE Preferences window. ........ r74020 | georg.brandl | 2009-07-16 03:18:07 -0400 (Thu, 16 Jul 2009) | 1 line #5910: fix kqueue for calls with more than one event. ........ r74021 | georg.brandl | 2009-07-16 03:33:04 -0400 (Thu, 16 Jul 2009) | 1 line #6486: start with built in functions rather than "built in objects". ........ r74022 | georg.brandl | 2009-07-16 03:38:35 -0400 (Thu, 16 Jul 2009) | 1 line #6481: fix typo in os.system() replacement. ........ r74023 | jesse.noller | 2009-07-16 10:23:04 -0400 (Thu, 16 Jul 2009) | 1 line Issue 6433: multiprocessing.pool.map hangs on empty list ........
This commit is contained in:
Alexandre Vassalotti
parent
cf7128ccbc
commit
e52e3786c6
13 changed files with 84 additions and 23 deletions
|
|
@ -32,6 +32,7 @@
|
|||
#
|
||||
# <see CVS and SVN checkin messages for history>
|
||||
#
|
||||
# 1.0.7 - added DEV_NULL
|
||||
# 1.0.6 - added linux_distribution()
|
||||
# 1.0.5 - fixed Java support to allow running the module on Jython
|
||||
# 1.0.4 - added IronPython support
|
||||
|
|
@ -89,7 +90,7 @@
|
|||
|
||||
__copyright__ = """
|
||||
Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:mal@lemburg.com
|
||||
Copyright (c) 2000-2008, eGenix.com Software GmbH; mailto:info@egenix.com
|
||||
Copyright (c) 2000-2009, eGenix.com Software GmbH; mailto:info@egenix.com
|
||||
|
||||
Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose and without fee or royalty is hereby granted,
|
||||
|
|
@ -108,10 +109,25 @@ __copyright__ = """
|
|||
|
||||
"""
|
||||
|
||||
__version__ = '1.0.6'
|
||||
__version__ = '1.0.7'
|
||||
|
||||
import sys, os, re
|
||||
|
||||
### Globals & Constants
|
||||
|
||||
# Determine the platform's /dev/null device
|
||||
try:
|
||||
DEV_NULL = os.devnull
|
||||
except AttributeError:
|
||||
# os.devnull was added in Python 2.4, so emulate it for earlier
|
||||
# Python versions
|
||||
if sys.platform in ('dos','win32','win16','os2'):
|
||||
# Use the old CP/M NUL as device name
|
||||
DEV_NULL = 'NUL'
|
||||
else:
|
||||
# Standard Unix uses /dev/null
|
||||
DEV_NULL = '/dev/null'
|
||||
|
||||
### Platform specific APIs
|
||||
|
||||
_libc_search = re.compile(r'(__libc_init)'
|
||||
|
|
@ -446,7 +462,16 @@ def _norm_version(version, build=''):
|
|||
|
||||
_ver_output = re.compile(r'(?:([\w ]+) ([\w.]+) '
|
||||
'.*'
|
||||
'Version ([\d.]+))', re.ASCII)
|
||||
'\[.* ([\d.]+)\])')
|
||||
|
||||
# Examples of VER command output:
|
||||
#
|
||||
# Windows 2000: Microsoft Windows 2000 [Version 5.00.2195]
|
||||
# Windows XP: Microsoft Windows XP [Version 5.1.2600]
|
||||
# Windows Vista: Microsoft Windows [Version 6.0.6002]
|
||||
#
|
||||
# Note that the "Version" string gets localized on different
|
||||
# Windows versions.
|
||||
|
||||
def _syscmd_ver(system='', release='', version='',
|
||||
|
||||
|
|
@ -578,6 +603,7 @@ def win32_ver(release='',version='',csd='',ptype=''):
|
|||
version = '%i.%i.%i' % (maj,min,buildno & 0xFFFF)
|
||||
if csd[:13] == 'Service Pack ':
|
||||
csd = 'SP' + csd[13:]
|
||||
|
||||
if plat == VER_PLATFORM_WIN32_WINDOWS:
|
||||
regkey = 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion'
|
||||
# Try to guess the release name
|
||||
|
|
@ -592,6 +618,7 @@ def win32_ver(release='',version='',csd='',ptype=''):
|
|||
release = 'postMe'
|
||||
elif maj == 5:
|
||||
release = '2000'
|
||||
|
||||
elif plat == VER_PLATFORM_WIN32_NT:
|
||||
regkey = 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion'
|
||||
if maj <= 4:
|
||||
|
|
@ -620,8 +647,12 @@ def win32_ver(release='',version='',csd='',ptype=''):
|
|||
release = 'Vista'
|
||||
else:
|
||||
release = '2008Server'
|
||||
#elif min == 1:
|
||||
# # Windows 7 release candidate uses version 6.1.7100
|
||||
# release = '7RC'
|
||||
else:
|
||||
release = 'post2008Server'
|
||||
|
||||
else:
|
||||
if not release:
|
||||
# E.g. Win3.1 with win32s
|
||||
|
|
@ -902,7 +933,7 @@ def _syscmd_uname(option,default=''):
|
|||
# XXX Others too ?
|
||||
return default
|
||||
try:
|
||||
f = os.popen('uname %s 2> /dev/null' % option)
|
||||
f = os.popen('uname %s 2> %s' % (option, DEV_NULL))
|
||||
except (AttributeError,os.error):
|
||||
return default
|
||||
output = f.read().strip()
|
||||
|
|
@ -927,7 +958,7 @@ def _syscmd_file(target,default=''):
|
|||
return default
|
||||
target = _follow_symlinks(target)
|
||||
try:
|
||||
f = os.popen('file "%s" 2> /dev/null' % target)
|
||||
f = os.popen('file "%s" 2> %s' % (target, DEV_NULL))
|
||||
except (AttributeError,os.error):
|
||||
return default
|
||||
output = f.read().strip()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue