Changeset 943 in tailor

Timestamp:

10/20/05 02:30:41 (8 years ago)

Author:

lele@…

Hash name:

20051020003041-97f81-c5f28be1d46fddd957202e3edaf15b2a306095ae

Message:

Nicer log for the shell command

File:

• vcpx/shwrap.py (modified) (4 diffs)

vcpx/shwrap.py

@@ -76 +76 @@
 
     def __str__(self):
+        r = '$'+repr(self)
+        if self.cwd:
+            r = self.cwd + ' ' + r
+        return r
+
+    def __repr__(self):
         result = []
-        if self.cwd:
-            result.append(self.cwd)
-            result.append(' ')
-        result.append('$')
         needquote = False
         for arg in self._last_command or self.command:
@@ -123 +125 @@
         from sys import stderr
         from locale import getpreferredencoding
-        import os
+        from os import environ, getcwd
         from cStringIO import StringIO
 
@@ -142 +144 @@
             kwargs['cwd'] = self.cwd
 
+        self.log.debug("Executing %r (%r)", self, kwargs.get('cwd', getcwd()))
+
         if not kwargs.has_key('env'):
             env = kwargs['env'] = {}
-            env.update(os.environ)
+            env.update(environ)
 
             for v in ['LANG', 'TZ', 'PATH']:
@@ -157 +161 @@
         # when the caller didn't ask for them.
         if not self.DEBUG:
-            devnull = getattr(os, 'devnull', '/dev/null')
+            try:
+                from os import devnull
+            except ImportError:
+                devnull = '/dev/null'
             if output is None:
                 output = open(devnull, 'w')