wmii

commit ea0e1bbe5d1236aba828d79b31a647bff00c698f
parent 26db14166bb490db97437bc6c48702e6951b4f33
Author: Kris Maglione <jg@suckless.org>
Date:   Sat, 17 Oct 2009 19:38:31 -0400

Work around seeming subprocess/threading bug in python 2.6.3.

Diffstat:
alternative_wmiircs/python/pygmi/menu.py
 | 
5
++---
alternative_wmiircs/python/pygmi/util.py
 | 
2
+-
alternative_wmiircs/python/wmiirc.py
 | 
4
++--

3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/alternative_wmiircs/python/pygmi/menu.py b/alternative_wmiircs/python/pygmi/menu.py
@@ -1,5 +1,4 @@
 from pygmi.util import call
-from threading import Thread
 
 __all__ = 'Menu', 'ClickMenu'
 
@@ -9,8 +8,8 @@ def inthread(fn, action):
         if action:
             return action(res)
         return res
-    if not action:
-        return run()
+    return run()
+    # Bug.
     t = Thread(target=run)
     t.daemon = True
     t.start()
diff --git a/alternative_wmiircs/python/pygmi/util.py b/alternative_wmiircs/python/pygmi/util.py
@@ -13,7 +13,7 @@ def call(*args, **kwargs):
     input = kwargs.pop('input', None)
     p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE, cwd=os.environ['HOME'],
-                         **kwargs)
+                         close_fds=True, **kwargs)
     if not background:
         return p.communicate(input)[0].rstrip('\n')
 
diff --git a/alternative_wmiircs/python/wmiirc.py b/alternative_wmiircs/python/wmiirc.py
@@ -1,3 +1,4 @@
+import datetime
 import operator
 import os
 import re
@@ -52,8 +53,7 @@ def load(self):
     return re.sub(r'^.*: ', '', call('uptime')).replace(', ', ' ')
 @defmonitor
 def time(self):
-    from datetime import datetime
-    return datetime.now().strftime('%c')
+    return datetime.datetime.now().strftime('%c')
 
 wmii.colrules = (
     ('gimp', '17+83+41'),