[Pymoul-svn] SF.net SVN: pymoul: [125] pymoul/trunk/src/moul

[<ti...@us...>]

Revision: 125
          http://pymoul.svn.sourceforge.net/pymoul/?rev=125&view=rev
Author:   tiran
Date:     2007-02-02 09:59:04 -0800 (Fri, 02 Feb 2007)

Log Message:
-----------
Fixes for windows issues

Modified Paths:
--------------
    pymoul/trunk/src/moul/osdependent/__init__.py
    pymoul/trunk/src/moul/osdependent/processinfo.py
    pymoul/trunk/src/moul/qt/mainwindow.py

Modified: pymoul/trunk/src/moul/osdependent/__init__.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/__init__.py	2007-02-02 17:45:42 UTC (rev 124)
+++ pymoul/trunk/src/moul/osdependent/__init__.py	2007-02-02 17:59:04 UTC (rev 125)
@@ -33,11 +33,11 @@
 __version__ = "$Id$"
 __revision__ = "$Revision$"
 
+from logging import getLogger
 import os
 import sys
 from types import ModuleType
 
-from moul.log import getLogger
 from moul.osdependent.processinfo import getPidNames
 from moul.osdependent.processinfo import getPids
 

Modified: pymoul/trunk/src/moul/osdependent/processinfo.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/processinfo.py	2007-02-02 17:45:42 UTC (rev 124)
+++ pymoul/trunk/src/moul/osdependent/processinfo.py	2007-02-02 17:59:04 UTC (rev 125)
@@ -51,7 +51,11 @@
 
 import os
 import sys
+from logging import getLogger
 
+
+LOG = getLogger("processinfo")
+
 _plat = sys.platform.startswith
 if _plat('linux'):
     PLAT = 'linux'
@@ -195,7 +199,10 @@
                                          sizeof(hModule), byref(count))
                 PSAPI.GetModuleBaseNameA(hProcess, hModule.value, modname,
                                          sizeof(modname))
-                name = u"".join([c for c in modname if c != NULL])
+                try:
+                    name = u"".join([c for c in modname if c != NULL])
+                except UnicodeError, msg:
+                    LOG.exception("Can't decode name of pid %i" % pid)
                 modname[:] = sizeof(modname) * NULL
                 KERNEL.CloseHandle(hProcess)
                 mapping[pid] = name

Modified: pymoul/trunk/src/moul/qt/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/mainwindow.py	2007-02-02 17:45:42 UTC (rev 124)
+++ pymoul/trunk/src/moul/qt/mainwindow.py	2007-02-02 17:59:04 UTC (rev 125)
@@ -626,7 +626,7 @@
             ping = server.portping()
             if isSocketError(ping):
                 self.emit(SIGNAL("pingerror(const QString&, int, const QString&)"),
-                          name, ping[0], ping[1])
+                          name, ping[0], (len(ping) == 2) and ping[1] or "unknown")
                 continue
             self.emit(SIGNAL("ping(const QString&, float)"), name, ping)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.