diff options
| author | Michi Henning <michi@zeroc.com> | 2007-06-27 13:11:23 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-06-27 13:11:23 +1000 |
| commit | 11c9552bd13ae9f569dddad69939931349f7ee53 (patch) | |
| tree | 9952dd7deddf483c616c1116971ebb3e983c0035 /java/config/TestUtil.py | |
| parent | Remove obsolete feature from Windows installers. (diff) | |
| download | ice-11c9552bd13ae9f569dddad69939931349f7ee53.tar.bz2 ice-11c9552bd13ae9f569dddad69939931349f7ee53.tar.xz ice-11c9552bd13ae9f569dddad69939931349f7ee53.zip | |
Bug 2270.
Diffstat (limited to 'java/config/TestUtil.py')
| -rw-r--r-- | java/config/TestUtil.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index 280d29507b8..5150c5b8eaa 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -83,24 +83,16 @@ def isCygwin(): # The substring on sys.platform is required because some cygwin # versions return variations like "cygwin_nt-4.01". - if sys.platform[:6] == "cygwin": - return 1 - else: - return 0 + return sys.platform[:6] == "cygwin" def isWin32(): - if sys.platform == "win32" or isCygwin(): - return 1 - else: - return 0 + return sys.platform == "win32" or isCygwin() def isWin9x(): if isWin32(): - if os.environ.has_key("OS") and os.environ["OS"] == "Windows_NT": - return 0 - return 1 + return not (os.environ.has_key("OS") and os.environ["OS"] == "Windows_NT") else: return 0 |