Changeset 4159 for trunk/umit

Timestamp:

02/21/09 21:13:06 (4 years ago)

Author:

gpolo

Message:

Make it work under Windows too (os.uname is not available there).

Files:

• trunk/umit (modified) (4 diffs)

trunk/umit

@@ -26 +26 @@
 import sys
 import signal
+import platform
 
 # used by exception hook
@@ -35 +36 @@
 #########################
 
-UMIT_DEVELOPMENT = os.environ.get("UMIT_DEVELOPMENT", True)
+UMIT_DEVELOPMENT = os.environ.get("UMIT_DEVELOPMENT", False)
 
 class UmitExceptionHook(object):
@@ -60 +61 @@
         python_version = sys.version
         nmap_version = os.popen2("nmap -V")[1].read().strip("\n")
-        osuname = " ".join(os.uname())
+        try:
+            osuname = " ".join(os.uname())
+        except AttributeError:
+            # os.uname is not available under Windows, and other unlikely
+            # systems
+            try:
+                osuname = " ".join(platform.win32_ver())
+            except AttributeError:
+                osuname = "UNKNOWN"
+
         umit_version = VERSION
         umitCore_version = getattr(umitCore, "__version__", "< 0.9.5")
@@ -148 +158 @@
 
 if not UMIT_DEVELOPMENT:
-    from tempfile import mktemp
+    #from tempfile import mktemp
     # Generating temporary files names
-    stdout_output = mktemp()
-    stderr_output = mktemp()
+    #stdout_output = mktemp()
+    #stderr_output = mktemp()
 
-    old_stdout = sys.stdout
-    old_stderr = sys.stderr
+    #old_stdout = sys.stdout
+    #old_stderr = sys.stderr
 
-    _stdout = open(stdout_output, "w")
-    _stderr = open(stderr_output, "w")
+    #_stdout = open(stdout_output, "w")
+    #_stderr = open(stderr_output, "w")
 
-    sys.stdout = _stdout
-    sys.stderr = _stderr
+    #sys.stdout = _stdout
+    #sys.stderr = _stderr